diff --git a/epmet-oper-web/package.json b/epmet-oper-web/package.json index 79ab464..0e923ff 100644 --- a/epmet-oper-web/package.json +++ b/epmet-oper-web/package.json @@ -39,6 +39,7 @@ "v-distpicker": "^1.2.2", "vue": "^2.6.11", "vue-i18n": "^8.12.0", + "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.7", "vuex": "^3.1.1" }, diff --git a/epmet-oper-web/src/js/columns/columns.js b/epmet-oper-web/src/js/columns/columns.js index d4ed1f1..10e218e 100644 --- a/epmet-oper-web/src/js/columns/columns.js +++ b/epmet-oper-web/src/js/columns/columns.js @@ -19,6 +19,9 @@ import FootBar from './productConfig/footBar' import partner from './miniPro/partner' import partnerApp from './miniPro/partnerApp' +// pcWork +import GuidanceList from './pcWork/guidanceList' + export default { CustomerList: CustomerList['list'], // 客户管理——客户管理——客户列表 ConfigForm: CustomerList['configForm'], // 客户管理——客户管理——配置 @@ -41,5 +44,8 @@ export default { // 外部客户 partnerApp, // 外部客户 - partner // 外部客户应用 + partner, // 外部客户应用 + + //pcWork + guidanceList:GuidanceList } diff --git a/epmet-oper-web/src/js/columns/pcWork/guidanceList.js b/epmet-oper-web/src/js/columns/pcWork/guidanceList.js new file mode 100644 index 0000000..aa478ff --- /dev/null +++ b/epmet-oper-web/src/js/columns/pcWork/guidanceList.js @@ -0,0 +1,36 @@ +export default [ + { + key: 'categoryName', + title: '分类', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 120 + }, + { + key: 'title', + title: '标题', + type: 'input', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 150 + }, + { + key: 'updatedTime', + title: '更新时间', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 80 + }, + { + key: 'createdName', + title: '创建人', + type: 'input', + display: ['formA', 'formU', 'table', 'model'], + fixed: false, + block: true, + width: 80 + } +] diff --git a/epmet-oper-web/src/views/main.vue b/epmet-oper-web/src/views/main.vue index 65888a5..35636a9 100644 --- a/epmet-oper-web/src/views/main.vue +++ b/epmet-oper-web/src/views/main.vue @@ -129,6 +129,7 @@ export default { this.$store.state.user.realName = data.realName this.$store.state.user.superAdmin = data.superAdmin this.$store.state.user.gender = data.gender + this.$store.state.user.roleList = data.roleList }, (rspMsg, data) => { diff --git a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue index 792e824..05e7651 100644 --- a/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue +++ b/epmet-oper-web/src/views/modules/productConfig/customizeFunction/CustomFun.vue @@ -105,7 +105,7 @@ export default { methodName: 'del', // 回调方法名称 isShow: (row) => { return true - } + } } ], diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue b/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue new file mode 100644 index 0000000..6e50faf --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue @@ -0,0 +1,462 @@ + + + + + + + diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue b/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue new file mode 100644 index 0000000..ed852d9 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue new file mode 100644 index 0000000..5a7f4a8 --- /dev/null +++ b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue @@ -0,0 +1,482 @@ + + + + +