Skip to content

P
pica-sensitive-admin
提交 66c59dc1 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

页面联调

上级 814d2c95
隐藏空白字符变更
内嵌 并排
正在显示 包含 182 行增加 和 35 行删除
package-lock.json
浏览文件 @ 66c59dc1
...@@ -8956,6 +8956,22 @@ ...@@ -8956,6 +8956,22 @@
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
"optional": true "optional": true
}, },
"v-viewer": {
"version": "1.5.1",
"resolved": "http://192.168.110.93:4873/v-viewer/-/v-viewer-1.5.1.tgz",
"integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==",
"requires": {
"throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0"
},
"dependencies": {
"throttle-debounce": {
"version": "2.3.0",
"resolved": "http://192.168.110.93:4873/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
"integrity": "sha1-/TGGXmZQIHHkEYF+JBRls+nDcuI="
}
}
},
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.3", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
...@@ -8989,6 +9005,11 @@ ...@@ -8989,6 +9005,11 @@
"extsprintf": "^1.2.0" "extsprintf": "^1.2.0"
} }
}, },
"viewerjs": {
"version": "1.9.0",
"resolved": "http://192.168.110.93:4873/viewerjs/-/viewerjs-1.9.0.tgz",
"integrity": "sha1-bfr1REDDsvdpG4Vma6bSdwjtlZI="
},
"vm-browserify": { "vm-browserify": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
......
src/main.js
浏览文件 @ 66c59dc1
...@@ -8,7 +8,7 @@ import ElementUI from 'element-ui'; ...@@ -8,7 +8,7 @@ import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; // 默认主题 import 'element-ui/lib/theme-chalk/index.css'; // 默认主题
import {getAddress, loadCommonFilter} from './common/env' import {getAddress, loadCommonFilter} from './common/env'
import vueFilter from './common/filter'; import vueFilter from './common/filter';
import vViewer from 'v-viewer';
//加载环境变量 //加载环境变量
...@@ -16,6 +16,9 @@ getAddress(); ...@@ -16,6 +16,9 @@ getAddress();
loadCommonFilter(); loadCommonFilter();
//加载elementUi //加载elementUi
Vue.use(ElementUI); Vue.use(ElementUI);
Vue.use(vViewer, {
button: false
});
// Vue.use(vueXlsxTable, {rABS: false}) // Vue.use(vueXlsxTable, {rABS: false})
if (localStorage.getItem("token")) { if (localStorage.getItem("token")) {
......
src/views/strack-data/create-point.vue
浏览文件 @ 66c59dc1
...@@ -5,7 +5,12 @@ ...@@ -5,7 +5,12 @@
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;"> <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-col :span="15"> <el-col :span="15">
<el-form-item label=""> <el-form-item label="">
<el-input v-model="searchParam.action" clearable placeholder="请输入要查找的埋点编码或名称" style="width:400px;margin-left: -74px;"></el-input> <el-input
v-model="searchParam.action"
clearable
placeholder="请输入要查找的埋点编码或名称"
style="width:400px;margin-left: -74px;"
@change="search(1)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -103,7 +108,7 @@ ...@@ -103,7 +108,7 @@
<el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column> <el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column>
<el-table-column prop="img" label="图例" min-width="100" align="left"> <el-table-column prop="img" label="图例" min-width="100" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="scope.row.actionPath" style="width: 80px;"/> <img :src="scope.row.actionPath" style="width: 80px;" v-viewer/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="handlerName" label="当前处理人" min-width="100" align="left"></el-table-column> <el-table-column prop="handlerName" label="当前处理人" min-width="100" align="left"></el-table-column>
...@@ -112,7 +117,7 @@ ...@@ -112,7 +117,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.assignBtnStatus == 2" type="primary" size="small" @click="assignDialog(scope.row)">指派</el-button> <el-button :disabled="scope.row.assignBtnStatus == 2" type="primary" size="small" @click="assignDialog(scope.row)">指派</el-button>
<el-button :disabled="scope.row.editBtnStatus == 2" type="primary" size="small" @click="editColumn(scope.row)">编辑</el-button> <el-button :disabled="scope.row.editBtnStatus == 2" type="primary" size="small" @click="editColumn(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.offLineBtnStatus != 2" type="primary" size="small" @click="downPage(scope.row)">下线</el-button> <el-button :disabled="scope.row.offLineBtnStatus == 2" type="primary" size="small" @click="downPage(scope.row)">下线</el-button>
<el-button type="primary" size="small" @click="detail(scope.row)">查看</el-button> <el-button type="primary" size="small" @click="detail(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -239,6 +244,7 @@ ...@@ -239,6 +244,7 @@
v-model="item.tagCode" v-model="item.tagCode"
clearable clearable
placeholder="请选择额外投递" placeholder="请选择额外投递"
@change="changeTag"
style="width:200px; margin-bottom: 10px;"> style="width:200px; margin-bottom: 10px;">
<el-option <el-option
v-for="(eItem,eIndex) in tagSelect" v-for="(eItem,eIndex) in tagSelect"
...@@ -336,15 +342,42 @@ ...@@ -336,15 +342,42 @@
</el-form-item> </el-form-item>
<div v-for="(item, index) in detailForm.actionTagResqs" :key="index" style="width: 400px;"> <div v-for="(item, index) in detailForm.actionTagResqs" :key="index" style="width: 400px;">
<el-form-item :label="'额外投递' + parseInt(index + 1)"> <el-form-item :label="'额外投递' + parseInt(index + 1)">
<span>投递名称：{{item.name}}</span> <div>投递名称：{{item.tagName}}</div>
<span>投递编码：{{item.code}}</span> <div>投递编码：{{item.tagCode}}</div>
<span>内容定义：{{item.desc}}</span> <div>内容定义：{{item.tagDesc}}</div>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>
</el-dialog> </el-dialog>
<!-- 新增投递对象 -->
<el-dialog
title="新建投递对象"
:visible.sync="tagVisible"
width="30%">
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-form ref="tagForm"
:model="tagForm"
label-width="150px"
label-suffix=":"
label-position="right"
size="mini">
<el-col :span="20">
<el-form-item label="投递对象名" prop="">
<el-input v-model="tagForm.tagName"></el-input>
</el-form-item>
<el-form-item label="投递方法定义" prop="member">
<el-input v-model="tagForm.tagDesc"></el-input>
</el-form-item>
</el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="tagVisible = false">取 消</el-button>
<el-button type="primary" @click="confirmAddTag">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -352,6 +385,7 @@ import { isEmptyUtils, openLoading, closeLoading } from '../../common/utils'; ...@@ -352,6 +385,7 @@ import { isEmptyUtils, openLoading, closeLoading } from '../../common/utils';
export default { export default {
data() { data() {
return { return {
tagVisible: false,
startTime: '', startTime: '',
endTime: '', endTime: '',
tableText: '', tableText: '',
...@@ -368,6 +402,11 @@ export default { ...@@ -368,6 +402,11 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 15 pageSize: 15
}, },
tagForm: {
tagName: '',
tagCode: '',
tagDesc: ''
},
totalRows: 0, totalRows: 0,
dialogVisible: false, dialogVisible: false,
downPageVisible: false, downPageVisible: false,
...@@ -461,6 +500,24 @@ export default { ...@@ -461,6 +500,24 @@ export default {
"get", `/basic-data/bi/actionTag/list`, {}, "get", `/basic-data/bi/actionTag/list`, {},
res => { res => {
this.tagSelect = res.data; this.tagSelect = res.data;
this.tagSelect.unshift({
tagName: '新建额外投递对象+',
tagCode: '000000'
})
}
);
},
changeTag(val, index) {
if(val == '000000') {
this.tagVisible = true;
this.dialogVisible = false;
}
},
confirmAddTag() {
this.getData(
"post", `/basic-data/bi/actionTag/insert`, this.tagForm,
res => {
this.tagVisible = false;
} }
); );
}, },
......
src/views/strack-data/strack-list.vue
浏览文件 @ 66c59dc1
...@@ -53,14 +53,6 @@ ...@@ -53,14 +53,6 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所属模块"> <el-form-item label="所属模块">
<!-- <el-select v-model="searchParam.moduleId2" clearable @change="searchList(1)" placeholder="请选择所属模块" style="width:200px">
<el-option
v-for="(eItem,eIndex) in moduleSelect"
:key="eIndex"
:label="eItem.name"
:value="eItem.id">
</el-option>
</el-select> -->
<el-cascader <el-cascader
v-model="searchParam.moduleIdArr" v-model="searchParam.moduleIdArr"
:options="moduleSelect" :options="moduleSelect"
...@@ -119,7 +111,7 @@ ...@@ -119,7 +111,7 @@
<el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column> <el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column>
<el-table-column prop="releaseVersion" label="发布版本" min-width="80" align="left"></el-table-column> <el-table-column prop="releaseVersion" label="发布版本" min-width="80" align="left"></el-table-column>
<el-table-column label="图例" min-width="120" align="left"> <el-table-column label="图例" min-width="120" align="left">
<template slot-scope="scope"> <template slot-scope="scope" v-viewer>
<img :src="scope.row.imageUrl" style="width: 80px;"/> <img :src="scope.row.imageUrl" style="width: 80px;"/>
</template> </template>
</el-table-column> </el-table-column>
...@@ -127,7 +119,7 @@ ...@@ -127,7 +119,7 @@
<el-table-column prop="statusDesc" label="状态" min-width="80" align="left"></el-table-column> <el-table-column prop="statusDesc" label="状态" min-width="80" align="left"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="200"> <el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.editBtnStatus != 2" type="primary" size="small" @click.stop="createAndEditPage(scope.row)">编辑</el-button> <el-button :disabled="scope.row.editBtnStatus == 2" type="primary" size="small" @click.stop="createAndEditPage(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.offLineBtnStatus == 2" type="primary" size="small" @click.stop="downPage(scope.row)">下线</el-button> <el-button :disabled="scope.row.offLineBtnStatus == 2" type="primary" size="small" @click.stop="downPage(scope.row)">下线</el-button>
<el-button :disabled="scope.row.createActionBtnStatus == 2" type="primary" size="small" @click.stop="createPoing(scope.row)">新建埋点</el-button> <el-button :disabled="scope.row.createActionBtnStatus == 2" type="primary" size="small" @click.stop="createPoing(scope.row)">新建埋点</el-button>
<el-button :disabled="scope.row.assignBtnStatus == 2" type="primary" size="small" @click.stop="assignDialog(scope.row)">指派</el-button> <el-button :disabled="scope.row.assignBtnStatus == 2" type="primary" size="small" @click.stop="assignDialog(scope.row)">指派</el-button>
...@@ -164,7 +156,7 @@ ...@@ -164,7 +156,7 @@
<el-form-item label="页面名" prop="name"> <el-form-item label="页面名" prop="name">
<el-input v-model="pageForm.name" placeholder="请输入页面名" maxlength="15" style="width:200px"></el-input> <el-input v-model="pageForm.name" placeholder="请输入页面名" maxlength="15" style="width:200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="归属模块" prop="moduleIdArr"> <el-form-item label="归属模块" required>
<!-- <el-select v-model="pageForm.moduleId" clearable placeholder="请选择归属模块" style="width:200px"> <!-- <el-select v-model="pageForm.moduleId" clearable placeholder="请选择归属模块" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in moduleSelect" v-for="(eItem,eIndex) in moduleSelect"
...@@ -176,8 +168,7 @@ ...@@ -176,8 +168,7 @@
<el-cascader <el-cascader
v-model="pageForm.moduleIdArr" v-model="pageForm.moduleIdArr"
:options="moduleSelect" :options="moduleSelect"
clearable clearable
@change="searchList(1, 'module')"
placeholder="请选择归属模块" placeholder="请选择归属模块"
style="width:200px"></el-cascader> style="width:200px"></el-cascader>
</el-form-item> </el-form-item>
...@@ -194,6 +185,7 @@ ...@@ -194,6 +185,7 @@
<el-form-item label="上传图例" prop="imageUrl"> <el-form-item label="上传图例" prop="imageUrl">
<el-upload <el-upload
v-model="pageForm.imageUrl" v-model="pageForm.imageUrl"
accept="image/jpeg,image/jpg,image/png"
class="avatar-uploader" class="avatar-uploader"
action="#" action="#"
:show-file-list="false" :show-file-list="false"
...@@ -286,6 +278,7 @@ ...@@ -286,6 +278,7 @@
v-model="form.actionPath" v-model="form.actionPath"
class="avatar-uploader" class="avatar-uploader"
action="#" action="#"
accept="image/jpeg,image/jpg,image/png"
:show-file-list="false" :show-file-list="false"
:before-upload="uploadActionPath"> :before-upload="uploadActionPath">
<img v-if="!form.actionPath" class="bg-img" src="../../../static/img/default.png"> <img v-if="!form.actionPath" class="bg-img" src="../../../static/img/default.png">
...@@ -298,6 +291,7 @@ ...@@ -298,6 +291,7 @@
v-model="item.tagCode" v-model="item.tagCode"
clearable clearable
placeholder="请选择额外投递" placeholder="请选择额外投递"
@change="changeTag"
style="width:200px; margin-bottom: 10px;"> style="width:200px; margin-bottom: 10px;">
<el-option <el-option
v-for="(eItem,eIndex) in tagSelect" v-for="(eItem,eIndex) in tagSelect"
...@@ -379,12 +373,13 @@ ...@@ -379,12 +373,13 @@
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;"> <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-form ref="assignForm" <el-form ref="assignForm"
:model="assignForm" :model="assignForm"
:rules="assignRule"
label-width="150px" label-width="150px"
label-suffix=":" label-suffix=":"
label-position="right" label-position="right"
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="任务状态" prop="changeStatus"> <el-form-item label="任务状态" prop="status">
<el-select v-model="assignForm.status" placeholder="请选择任务状态" style="width:200px"> <el-select v-model="assignForm.status" placeholder="请选择任务状态" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in assignstatusSelect" v-for="(eItem,eIndex) in assignstatusSelect"
...@@ -394,7 +389,7 @@ ...@@ -394,7 +389,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="指派人" prop="member"> <el-form-item label="指派人" prop="handlerIds">
<el-select v-model="assignForm.handlerIds" multiple filterable placeholder="请选择指派人" style="width:200px"> <el-select v-model="assignForm.handlerIds" multiple filterable placeholder="请选择指派人" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in assignSelect" v-for="(eItem,eIndex) in assignSelect"
...@@ -412,6 +407,33 @@ ...@@ -412,6 +407,33 @@
<el-button type="primary" @click="confirmAssign">确 定</el-button> <el-button type="primary" @click="confirmAssign">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 新增投递对象 -->
<el-dialog
title="新建投递对象"
:visible.sync="tagVisible"
width="30%">
<el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
<el-form ref="tagForm"
:model="tagForm"
label-width="150px"
label-suffix=":"
label-position="right"
size="mini">
<el-col :span="20">
<el-form-item label="投递对象名" prop="">
<el-input v-model="tagForm.tagName"></el-input>
</el-form-item>
<el-form-item label="投递方法定义" prop="member">
<el-input v-model="tagForm.tagDesc"></el-input>
</el-form-item>
</el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="tagVisible = false">取 消</el-button>
<el-button type="primary" @click="confirmAddTag">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -429,6 +451,7 @@ export default { ...@@ -429,6 +451,7 @@ export default {
creatPageVisible: false, creatPageVisible: false,
downPageVisible: false, downPageVisible: false,
assignVisible: false, assignVisible: false,
tagVisible: false,
searchParam: { searchParam: {
searchContent: '', searchContent: '',
handlerId: '', handlerId: '',
...@@ -489,6 +512,11 @@ export default { ...@@ -489,6 +512,11 @@ export default {
offTime: '', offTime: '',
offVersion: '' offVersion: ''
}, },
tagForm: {
tagName: '',
tagCode: '',
tagDesc: ''
},
rules: { rules: {
actionName: [ actionName: [
{ required: true, message: '请输入事件名', trigger: 'blur' }, { required: true, message: '请输入事件名', trigger: 'blur' },
...@@ -528,6 +556,14 @@ export default { ...@@ -528,6 +556,14 @@ export default {
}, },
downRules: { downRules: {
},
assignRule: {
status: [
{ required: true, message: '请选择任务状态', trigger: 'change' }
],
handlerIds: [
{ required: true, message: '请选择指派人', trigger: 'change' }
],
} }
} }
}, },
...@@ -566,6 +602,24 @@ export default { ...@@ -566,6 +602,24 @@ export default {
"get", `/basic-data/bi/actionTag/list`, {}, "get", `/basic-data/bi/actionTag/list`, {},
res => { res => {
this.tagSelect = res.data; this.tagSelect = res.data;
this.tagSelect.unshift({
tagName: '新建额外投递对象+',
tagCode: '000000'
})
}
);
},
changeTag(val, index) {
if(val == '000000') {
this.tagVisible = true;
this.dialogVisible = false;
}
},
confirmAddTag() {
this.getData(
"post", `/basic-data/bi/actionTag/insert`, this.tagForm,
res => {
this.tagVisible = false;
} }
); );
}, },
...@@ -695,12 +749,16 @@ export default { ...@@ -695,12 +749,16 @@ export default {
url = "/basic-data/bi/page/save"; url = "/basic-data/bi/page/save";
this.pageForm.pageId = this.rowId; this.pageForm.pageId = this.rowId;
} }
if(this.pageForm.moduleIdArr.length == 0) {
this.$message.error("请选择归属模块");
return;
}
req = JSON.parse(JSON.stringify(this.pageForm)); req = JSON.parse(JSON.stringify(this.pageForm));
req.releaseTime = new Date(req.releaseTime).getTime(); req.releaseTime = new Date(req.releaseTime).getTime();
this.getData( this.getData(
"post", url, req, "post", url, req,
res => { res => {
this.$message.success("新建页面成功"); this.$message.success("保存成功");
this.creatPageVisible = false; this.creatPageVisible = false;
this.searchList(); this.searchList();
} }
...@@ -781,20 +839,24 @@ export default { ...@@ -781,20 +839,24 @@ export default {
}, },
// 确定指派 // 确定指派
confirmAssign() { confirmAssign() {
this.assignForm.handlerIds.forEach((item, index) => { this.$refs.assignForm.validate((valid) => {
this.assignForm.handlerIds[index] = { if(valid) {
id: item.split("&")[0], this.assignForm.handlerIds.forEach((item, index) => {
name: item.split("&")[1] this.assignForm.handlerIds[index] = {
id: item.split("&")[0],
name: item.split("&")[1]
}
})
this.getData(
"post", `/basic-data/bi/page/assign`, this.assignForm,
res => {
this.$message.success("指派成功");
this.assignVisible = false;
this.searchList();
}
);
} }
}) })
this.getData(
"post", `/basic-data/bi/page/assign`, this.assignForm,
res => {
this.$message.success("指派成功");
this.assignVisible = false;
this.searchList();
}
);
}, },
// 上传页面图片 // 上传页面图片
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
...@@ -841,6 +903,9 @@ export default { ...@@ -841,6 +903,9 @@ export default {
.time-container .el-form-item{ .time-container .el-form-item{
display: inline-block; display: inline-block;
} }
.bg-img {
width: 120px;
}
// .tui-image-editor-container { // .tui-image-editor-container {
// width: 900px; // width: 900px;
// height: 900px; // height: 900px;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或