Skip to content

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

模块归类添加级联

上级 fd14c0bd
隐藏空白字符变更
内嵌 并排
正在显示 包含 82 行增加 和 37 行删除
package-lock.json
浏览文件 @ 814d2c95
...@@ -637,8 +637,8 @@ ...@@ -637,8 +637,8 @@
}, },
"async-validator": { "async-validator": {
"version": "1.8.5", "version": "1.8.5",
"resolved": "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz", "resolved": "http://192.168.110.93:4873/async-validator/-/async-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=", "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
"requires": { "requires": {
"babel-runtime": "6.x" "babel-runtime": "6.x"
} }
...@@ -896,8 +896,8 @@ ...@@ -896,8 +896,8 @@
}, },
"babel-helper-vue-jsx-merge-props": { "babel-helper-vue-jsx-merge-props": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "http://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", "resolved": "http://192.168.110.93:4873/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=" "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
}, },
"babel-helpers": { "babel-helpers": {
"version": "6.24.1", "version": "6.24.1",
...@@ -2759,8 +2759,8 @@ ...@@ -2759,8 +2759,8 @@
}, },
"deepmerge": { "deepmerge": {
"version": "1.5.2", "version": "1.5.2",
"resolved": "http://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz", "resolved": "http://192.168.110.93:4873/deepmerge/-/deepmerge-1.5.2.tgz",
"integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
}, },
"define-property": { "define-property": {
"version": "2.0.2", "version": "2.0.2",
...@@ -3023,9 +3023,9 @@ ...@@ -3023,9 +3023,9 @@
"dev": true "dev": true
}, },
"element-ui": { "element-ui": {
"version": "2.7.2", "version": "2.15.1",
"resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.7.2.tgz", "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.15.1.tgz",
"integrity": "sha1-i8W+9cPFOiFwQiUWtDJOcAacI9E=", "integrity": "sha1-raAKpuMsAndKLndWPdhGaPgTzf8=",
"requires": { "requires": {
"async-validator": "~1.8.1", "async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0", "babel-helper-vue-jsx-merge-props": "^2.0.0",
...@@ -5954,7 +5954,7 @@ ...@@ -5954,7 +5954,7 @@
}, },
"normalize-wheel": { "normalize-wheel": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", "resolved": "http://192.168.110.93:4873/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
}, },
"npm-bundled": { "npm-bundled": {
...@@ -7638,8 +7638,8 @@ ...@@ -7638,8 +7638,8 @@
}, },
"resize-observer-polyfill": { "resize-observer-polyfill": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", "resolved": "http://192.168.110.93:4873/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
}, },
"resolve": { "resolve": {
"version": "1.5.0", "version": "1.5.0",
...@@ -8488,8 +8488,8 @@ ...@@ -8488,8 +8488,8 @@
}, },
"throttle-debounce": { "throttle-debounce": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz", "resolved": "http://192.168.110.93:4873/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
"integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=" "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
}, },
"time-stamp": { "time-stamp": {
"version": "2.0.0", "version": "2.0.0",
......
src/views/strack-data/create-point.vue
浏览文件 @ 814d2c95
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
<div v-for="(item, index) in form.actionTagResqs" :key="index" style="width: 400px;"> <div v-for="(item, index) in form.actionTagResqs" :key="index" style="width: 400px;">
<el-form-item :label="'额外投递' + parseInt(index + 1)"> <el-form-item :label="'额外投递' + parseInt(index + 1)">
<el-select <el-select
v-model="item.tagName" v-model="item.tagCode"
clearable clearable
placeholder="请选择额外投递" placeholder="请选择额外投递"
style="width:200px; margin-bottom: 10px;"> style="width:200px; margin-bottom: 10px;">
...@@ -560,7 +560,13 @@ export default { ...@@ -560,7 +560,13 @@ export default {
let req = {}; let req = {};
req = JSON.parse(JSON.stringify(this.form)); req = JSON.parse(JSON.stringify(this.form));
req.releaseTime = new Date(req.releaseTime).getTime(); req.releaseTime = new Date(req.releaseTime).getTime();
console.log("=============",req) for(let i = 0;i < this.tagSelect.length;i++) {
req.actionTagResqs.forEach((item, index) => {
if(this.tagSelect[i].tagCode == item.tagCode) {
item.tagName = this.tagSelect[i].tagName;
}
})
}
this.getData( this.getData(
"post", `/basic-data/bi/pageAction/update`, req, "post", `/basic-data/bi/pageAction/update`, req,
res => { res => {
......
src/views/strack-data/strack-list.vue
浏览文件 @ 814d2c95
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9" style="padding:0;text-align:right;padding-right:15px;"> <el-col :span="9" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="createAndEditPage(1)">新建页面</el-button> <el-button type="primary" size="small" @click="createAndEditPage('create')">新建页面</el-button>
</el-col> </el-col>
</el-row> </el-row>
<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;">
...@@ -53,14 +53,22 @@ ...@@ -53,14 +53,22 @@
</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-select v-model="searchParam.moduleId2" clearable @change="searchList(1)" placeholder="请选择所属模块" style="width:200px">
<el-option <el-option
v-for="(eItem,eIndex) in moduleSelect" v-for="(eItem,eIndex) in moduleSelect"
:key="eIndex" :key="eIndex"
:label="eItem.name" :label="eItem.name"
:value="eItem.id"> :value="eItem.id">
</el-option> </el-option>
</el-select> </el-select> -->
<el-cascader
v-model="searchParam.moduleIdArr"
:options="moduleSelect"
:props="{ checkStrictly: true }"
clearable
@change="searchList(1, 'module')"
placeholder="请选择所属模块"
style="width:200px"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="当前处理人"> <el-form-item label="当前处理人">
<el-select v-model="searchParam.handlerId" clearable @change="searchList(1)" placeholder="请选择当前处理人" style="width:200px"> <el-select v-model="searchParam.handlerId" clearable @change="searchList(1)" placeholder="请选择当前处理人" style="width:200px">
...@@ -119,7 +127,7 @@ ...@@ -119,7 +127,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>
...@@ -154,17 +162,24 @@ ...@@ -154,17 +162,24 @@
size="mini"> size="mini">
<el-col :span="20"> <el-col :span="20">
<el-form-item label="页面名" prop="name"> <el-form-item label="页面名" prop="name">
<el-input v-model="pageForm.name" placeholder="请输入页面名" 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="moduleId"> <el-form-item label="归属模块" prop="moduleIdArr">
<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"
:key="eIndex" :key="eIndex"
:label="eItem.name" :label="eItem.name"
:value="eItem.id"> :value="eItem.id">
</el-option> </el-option>
</el-select> </el-select> -->
<el-cascader
v-model="pageForm.moduleIdArr"
:options="moduleSelect"
clearable
@change="searchList(1, 'module')"
placeholder="请选择归属模块"
style="width:200px"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="实现方式" prop="implementMethodId"> <el-form-item label="实现方式" prop="implementMethodId">
<el-select v-model="pageForm.implementMethodId" clearable placeholder="请选择实现方式" style="width:200px"> <el-select v-model="pageForm.implementMethodId" clearable placeholder="请选择实现方式" style="width:200px">
...@@ -277,10 +292,10 @@ ...@@ -277,10 +292,10 @@
<img v-if="form.actionPath" class="bg-img" :src="form.actionPath"> <img v-if="form.actionPath" class="bg-img" :src="form.actionPath">
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<div v-for="(item, index) in form.tagCodeList" :key="index" style="width: 400px;"> <div v-for="(item, index) in form.actionTagResqs" :key="index" style="width: 400px;">
<el-form-item :label="'额外投递' + parseInt(index + 1)" prop="tagCodeList"> <el-form-item :label="'额外投递' + parseInt(index + 1)" prop="actionTagResqs">
<el-select <el-select
v-model="item.name" v-model="item.tagCode"
clearable clearable
placeholder="请选择额外投递" placeholder="请选择额外投递"
style="width:200px; margin-bottom: 10px;"> style="width:200px; margin-bottom: 10px;">
...@@ -418,6 +433,7 @@ export default { ...@@ -418,6 +433,7 @@ export default {
searchContent: '', searchContent: '',
handlerId: '', handlerId: '',
moduleId2: '', moduleId2: '',
moduleIdArr: [],
implementMethodId: '', implementMethodId: '',
releaseTimeStart: 0, releaseTimeStart: 0,
releaseTimeEnd: 0, releaseTimeEnd: 0,
...@@ -448,7 +464,7 @@ export default { ...@@ -448,7 +464,7 @@ export default {
pageId: '', pageId: '',
pageCode: '', pageCode: '',
pageName: '', pageName: '',
tagCodeList: [{name: ''}] actionTagResqs: [{tagName: ''}, {tagCode: ''}, {tagDesc: ''}]
}, },
pageForm: { // 新建（编辑）页面 pageForm: { // 新建（编辑）页面
imageUrl: '', imageUrl: '',
...@@ -494,7 +510,7 @@ export default { ...@@ -494,7 +510,7 @@ export default {
name: [ name: [
{ required: true, message: '请输入页面名称', trigger: 'blur' } { required: true, message: '请输入页面名称', trigger: 'blur' }
], ],
moduleId: [ moduleIdArr: [
{ required: true, message: '请选择模块归类', trigger: 'change' } { required: true, message: '请选择模块归类', trigger: 'change' }
], ],
implementMethodId: [ implementMethodId: [
...@@ -539,10 +555,10 @@ export default { ...@@ -539,10 +555,10 @@ export default {
}) })
}, },
addTag(index) { addTag(index) {
this.form.tagCodeList.push({name: ''}); this.form.actionTagResqs.push({tagName: '', tagCode: '', tagDesc: ''});
}, },
deleteTag(index) { deleteTag(index) {
this.form.tagCodeList.splice(index, 1); this.form.actionTagResqs.splice(index, 1);
}, },
// 获取投递列表 // 获取投递列表
getTagList() { getTagList() {
...@@ -621,8 +637,11 @@ export default { ...@@ -621,8 +637,11 @@ export default {
this.$router.push({path: 'create-point', query: {id: row.pageId}}) this.$router.push({path: 'create-point', query: {id: row.pageId}})
}, },
// 搜索 // 搜索
searchList(param) { searchList(param, param2) {
if(param) this.searchParam.pageNo = 1; if(param) this.searchParam.pageNo = 1;
if(param2 == 'module') {
this.searchParam.moduleId2 = this.searchParam.moduleIdArr[this.searchParam.moduleIdArr.length-1];
}
this.searchParam.releaseTimeStart = new Date(this.startTime).getTime(); this.searchParam.releaseTimeStart = new Date(this.startTime).getTime();
this.searchParam.releaseTimeEnd = new Date(this.endTime).getTime(); this.searchParam.releaseTimeEnd = new Date(this.endTime).getTime();
let req = this.searchParam; let req = this.searchParam;
...@@ -639,19 +658,34 @@ export default { ...@@ -639,19 +658,34 @@ export default {
}, },
// 新建(编辑)页面 // 新建(编辑)页面
createAndEditPage(row) { createAndEditPage(row) {
if(row == 1) { if(row == 'create') {
this.pageTitle = "新建页面"; this.pageTitle = "新建页面";
this.pageForm.name = '';
this.pageForm.implementMethodId = '';
this.pageForm.imageUrl = '';
this.pageForm.releaseTime = '';
this.pageForm.moduleIdArr = '';
if(this.$refs.creatPageForm) { if(this.$refs.creatPageForm) {
this.$refs.creatPageForm.resetFields(); this.$refs.creatPageForm.resetFields();
} }
}else { }else {
this.pageTitle = "编辑页面"; this.pageTitle = "编辑页面";
this.rowId = row.pageId; this.rowId = row.pageId;
this.pageForm.name = row.pageName;
this.pageForm.implementMethodId = row.implementMethodId;
this.pageForm.imageUrl = row.imageUrl;
this.pageForm.releaseTime = row.releaseTime;
this.pageForm.moduleIdArr = row.moduleIdArr;this.pageForm.name = row.pageName;
this.pageForm.implementMethodId = row.implementMethodId;
this.pageForm.imageUrl = row.imageUrl;
this.pageForm.releaseTime = row.releaseTime;
this.pageForm.moduleIdArr = row.moduleIdArr;
} }
this.creatPageVisible = true; this.creatPageVisible = true;
}, },
// 保存新建编辑页面 // 保存新建编辑页面
saveCreatePageMenu() { saveCreatePageMenu() {
this.pageForm.moduleId = this.pageForm.moduleIdArr[this.pageForm.moduleIdArr.length - 1];
let url, req; let url, req;
this.$refs.creatPageForm.validate((valid) => { this.$refs.creatPageForm.validate((valid) => {
if(valid) { if(valid) {
...@@ -706,15 +740,20 @@ export default { ...@@ -706,15 +740,20 @@ export default {
this.form.pageCode = row.pageCode; this.form.pageCode = row.pageCode;
this.form.pageType = row.implementMethodId; this.form.pageType = row.implementMethodId;
this.form.implementMethodId = row.implementMethodId; this.form.implementMethodId = row.implementMethodId;
this.form.actionTagResqs = [{tagName: '', tagCode: '', tagDesc: ''}];
}, },
// 保存新建埋点 // 保存新建埋点
saveCreateAndEditMenu() { saveCreateAndEditMenu() {
this.$refs.menuForm.validate((valid) => { this.$refs.menuForm.validate((valid) => {
if (valid) { if (valid) {
let req = Object.assign({}, this.form); let req = Object.assign({}, this.form);
req.tagCodeList.forEach((item,index) => { for(let i = 0;i < this.tagSelect.length;i++) {
req.tagCodeList[index] = item.name; req.actionTagResqs.forEach((item, index) => {
}) if(this.tagSelect[i].tagCode == item.tagCode) {
item.tagName = this.tagSelect[i].tagName;
}
})
}
this.getData( this.getData(
"post", `/basic-data/bi/pageAction/insert`, req, "post", `/basic-data/bi/pageAction/insert`, req,
res => { res => {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或