diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/package.json b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/package.json index 8ec1fff3..0f77f664 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/package.json +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/package.json @@ -18,7 +18,7 @@ "bpmn-js": "^9.2.2", "core-js": "^2.6.12", "ejs": "^2.7.4", - "element-ui": "2.13.2", + "element-ui": "^2.15.6", "js-cookie": "2.2.0", "moment": "^2.29.1", "normalize.css": "7.0.0", diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js index c419266e..92298596 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js @@ -64,4 +64,12 @@ export default { data: params }) }, + // 查询分页列表 + listPages: function(params) { + return request({ + url: '/yxtdispatchcenter/v1/dispatchopmalarm/listPage', + method: 'post', + data: params + }) + }, } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue index 0b065626..d01854dc 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue @@ -88,49 +88,13 @@ export default { }, ], }, - { - path: "/dispatchpatrolmodle", - component: "DispatchPatrolModleIndex", - redirect: "/dispatchpatrolmodle/index", - meta: { - icon: "el-icon-menu", - title: "工单管理", - }, - name: "", - children: [ - { - path: "/dispatchpatrolmodle/index", - component: "DispatchPatrolModleIndex", - name: "DispatchPatrolModleIndex", - meta: { title: "巡视工单管理",icon: "el-icon-help" }, - }, - ], - }, - { - path: "/dispatchtemplate", - component: "DispatchTemplateIndex", - redirect: "/dispatchtemplate/index", - meta: { - icon: "el-icon-menu", - title: "运维任务模板", - }, - name: "", - children: [ - { - path: "/dispatchtemplate/index", - component: "DispatchTemplateIndex", - name: "DispatchTemplateIndex", - meta: { title: "运维任务模板" }, - }, - ], - }, { path: "/dispatchworker", component: "DispatchWorkerIndex", redirect: "/dispatchworker/index", meta: { icon: "el-icon-menu", - title: "工单运维人员情况", + title: "告警管理", }, name: "", children: [ @@ -138,7 +102,13 @@ export default { path: "/dispatchworker/index", component: "DispatchWorkerIndex", name: "DispatchWorkerIndex", - meta: { title: "工单运维人员情况" }, + meta: { title: "实时告警",icon: "el-icon-help" }, + }, + { + path: "/dispatchworker/dispatchtemplate", + component: "DispatchTemplate", + name: "DispatchTemplate", + meta: { title: "历史告警",icon: "el-icon-help" }, }, ], }, diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js index 76bae2aa..e3b54d75 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js @@ -83,7 +83,7 @@ export const constantRoutes = [ redirect: '/dispatchorderinfo/index', meta: { title: '巡视工单管理' - }, + }, children: [{ path: '/dispatchorderinfo/index', component: () => import('@/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue'), @@ -125,33 +125,26 @@ export const constantRoutes = [ meta: { title: '(运维任务标准库)' } }] }, - { - path: '/dispatchtemplate', - component: Layout, - redirect: '/dispatchtemplate/index', - meta: { - title: '运维任务模板' - }, - children: [{ - path: '/dispatchtemplate/index', - component: () => import('@/views/yxtdispatchcenter/dispatchtemplate/dispatchtemplate.vue'), - name: 'DispatchTemplateIndex', - meta: { title: '运维任务模板' } - }] - }, { path: '/dispatchworker', component: Layout, redirect: '/dispatchworker/index', meta: { - title: '工单运维人员情况' + title: '告警管理' }, children: [{ path: '/dispatchworker/index', component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue'), name: 'DispatchWorkerIndex', - meta: { title: '工单运维人员情况' } - }] + meta: { title: '实时告警' } + }, + { + path: '/dispatchworker/dispatchtemplate', + component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue'), + name: 'DispatchTemplate', + meta: { title: '历史告警' } + } + ] }, { path: '/404', diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js index d6b2d671..20b1a9ce 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js @@ -80,7 +80,7 @@ const codemenu = [ }, children: [{ path: '/dispatchtemplate/index', - component: () => import('@/views/yxtdispatchcenter/dispatchtemplate/dispatchtemplate.vue'), + component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue'), name: 'DispatchTemplateIndex', meta: { title: '运维任务模板' } }] diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue index 6da005c6..be3a89cb 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue @@ -31,8 +31,12 @@ @@ -237,4 +241,8 @@ export default { } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandards.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandards.vue index ca64b556..61db02eb 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandards.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandards.vue @@ -33,9 +33,15 @@ @@ -251,4 +257,8 @@ export default { } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue index 3de74d8f..e50867c8 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue @@ -51,9 +51,15 @@ @@ -75,12 +81,20 @@ -
-
666
-
+ size="86%"> +
+ + {{ TableList.ordername }} + {{ TableList.orderno }} + {{ TableList.custname }} + {{ TableList.orderdegree }} + {{ TableList.ordercontent }} + {{ TableList.receiveperson }} + {{ TableList.receivetel }} + +
@@ -132,7 +146,7 @@ export default { arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}], multipleSelection: [], btnList: [ - { + { type: 'primary', size: 'small', icon: 'plus', @@ -146,7 +160,9 @@ export default { btnKey: 'doClose', btnLabel: '关闭' } - ] + ], + size:'', + TableList:[] } }, mounted() { @@ -280,11 +296,18 @@ export default { return '' } }, - purchase(row){ + purchase(row){ this.drawer=true + this.TableList=row }, } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue index d76a175e..6f019fc5 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue @@ -151,7 +151,8 @@ export default { ordertype: '', // 描述:1-计划巡视; ordercontent: '', // 工单内容 receiveperson: '', // 现场联系人 - receivetel: '' // 现场联系人电话 + receivetel: '', // 现场联系人电话 + workers:[] }, arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}], arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}], @@ -265,6 +266,7 @@ export default { _this.formobj.ordercontent = vdata.ordercontent // 工单内容 _this.formobj.receiveperson = vdata.receiveperson // 现场联系人 _this.formobj.receivetel = vdata.receivetel // 现场联系人电话 + // _this.formobj.workers = vdata.workers // 现场联系人电话 } else { // 根据resp.code进行异常情况处理 } @@ -299,7 +301,6 @@ export default { }, handleSelectionChange(val) { this.formobj.workers = val; - console.log(this.formobj); }, handleSelection(selection){ if (selection.length > 1){ diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue index a94f8154..2f48171c 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue @@ -35,9 +35,15 @@ @@ -60,12 +66,24 @@ -
-
666
-
+ size="86%"> +
+ + {{ TableList.planname }} + {{ TableList.planno }} + {{ TableList.custname }} + {{ TableList.patroltype }} + {{ TableList.contactperson }} + {{ TableList.contactphone }} + {{ TableList.cycletype }} + {{ TableList.cycle }} + {{ TableList.cyclevalue }} + {{ TableList.startdate }} + {{ TableList.enddate }} + +
@@ -129,7 +147,8 @@ export default { btnKey: 'doClose', btnLabel: '关闭' } - ] + ], + TableList:[] } }, mounted() { @@ -261,9 +280,17 @@ export default { }, purchase(row){ this.drawer=true + this.TableList=row + console.log(row); }, } } - diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue index 28458fb1..7fd8e954 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue @@ -142,7 +142,7 @@ export default { data() { return { submitdisabled: false, - isSearchShow: false, + isSearchShow: true, viewTitle: '', searchxianshitit: '显示添加条件', formobj: { diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchtemplate/dispatchtemplate.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchtemplate/dispatchtemplate.vue deleted file mode 100644 index 9854ca9b..00000000 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchtemplate/dispatchtemplate.vue +++ /dev/null @@ -1,294 +0,0 @@ - - - - diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue new file mode 100644 index 00000000..70cdcc46 --- /dev/null +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue @@ -0,0 +1,305 @@ + + + + diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue index e698c46c..7073ba1d 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue @@ -1,7 +1,7 @@