diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index 518f1b0..ebe8b3a 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -336,12 +336,18 @@ export const asyncRoutes = [ name: 'environmetManage', component: () => import('@/views/safeEnviro/environmetManage'), meta: { title: '环境管理', icon: 'equipment', perms: ['employee_manage'] } - } , + }, { - path: 'intelligentAlarm', - name: 'intelligentAlarm', - component: () => import('@/views/safeEnviro/intelligentAlarm'), - meta: { title: '智能报警', icon: 'equipment', perms: ['employee_manage'] } + path: 'emergencyDrill', + name: 'emergencyDrill', + component: () => import('@/views/safeEnviro/emergencyDrill'), + meta: { title: '应急演练', icon: 'equipment' } + }, + { + path: 'emergencyPlan', + name: 'emergencyPlan', + component: () => import('@/views/safeEnviro/emergencyPlan'), + meta: { title: '应急预案', icon: 'equipment' } } ] }, diff --git a/hb_client/src/views/customerManage/feedback.vue b/hb_client/src/views/customerManage/feedback.vue index 4ab8fd9..7e3753a 100644 --- a/hb_client/src/views/customerManage/feedback.vue +++ b/hb_client/src/views/customerManage/feedback.vue @@ -71,8 +71,9 @@ fixed="right" > diff --git a/hb_client/src/views/energyManage/energy.vue b/hb_client/src/views/energyManage/energy.vue index 2420fff..a094ca1 100644 --- a/hb_client/src/views/energyManage/energy.vue +++ b/hb_client/src/views/energyManage/energy.vue @@ -109,25 +109,51 @@
分项明细
- - - - - - - -
- {{ item }}
{{ itemtd }}
+ + + + + + + + + + + + + + + + + + + - - - - - - - -
- {{ item }}
{{ itemtd }}
+ + + + + + + + + + + + + @@ -171,24 +197,22 @@ }, startTime:'', endTime:'', - thLists:['名称','2022-07','2022-08','2022-09','2022-10','2022-11','2022-12','2023-01'], - trList:[ - ['办公用电','736','235','260','402','401','424','431'], - ['照明','387','192','180','340','377','345','270'], - ['空调','10362','3430','706','468','589','2920','3031'], - ['动力','1573','360','919','189','410','187','741'], + tableData:[ + {name:'办公用电',July:'736',August:'235',September:'260',October:'402',November:'401',December:'424',January:'431'}, + {name:'照明',July:'387',August:'192',September:'180',October:'340',November:'377',December:'345',January:'270'}, + {name:'空调',July:'10362',August:'3430',September:'706',October:'468',November:'589',December:'2920',January:'3031'}, + {name:'动力',July:'1573',August:'360',September:'919',October:'189',November:'410',December:'187',January:'741'}, ], - thLists1:['工序','电耗','消耗单位','产量','单位消耗'], - trList1:[ - ['冷加工','589','kwh','260','2.27'], - ['热弯','736','kwh','260','2.83'], - ['化学钢化','706','kwh','100','7.06'], - ['物理钢化','10362','kwh','160','64.76'], - ['镀膜','736','kwh','260','2.83'], - ['夹层','340','kwh','130','2.62'], - ['包边','360','kwh','120','3.00'], - ['装框','235','kwh','100','2.35'], + tableData1:[ + {name:'冷加工',number:'589',unit:'kwh',output:'260',unitNumber:'2.27'}, + {name:'热弯',number:'736',unit:'kwh',output:'260',unitNumber:'2.83'}, + {name:'化学钢化',number:'706',unit:'kwh',output:'100',unitNumber:'7.06'}, + {name:'物理钢化',number:'10362',unit:'kwh',output:'160',unitNumber:'64.76'}, + {name:'镀膜',number:'736',unit:'kwh',output:'260',unitNumber:'2.83'}, + {name:'夹层',number:'340',unit:'kwh',output:'130',unitNumber:'2.62'}, + {name:'包边',number:'360',unit:'kwh',output:'120',unitNumber:'3.00'}, + {name:'装框',number:'255',unit:'kwh',output:'100',unitNumber:'2.35'}, ], cdata: { xData: ["办公用电", "照明", "空调", "动力"], diff --git a/hb_client/src/views/inm/logistics.vue b/hb_client/src/views/inm/logistics.vue index 2a6653c..74e7c2e 100644 --- a/hb_client/src/views/inm/logistics.vue +++ b/hb_client/src/views/inm/logistics.vue @@ -36,42 +36,42 @@ v-el-height-adaptive-table="{bottomOffset: 50}" > - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/hb_client/src/views/safeEnviro/emergencyDrill.vue b/hb_client/src/views/safeEnviro/emergencyDrill.vue new file mode 100644 index 0000000..d7c4471 --- /dev/null +++ b/hb_client/src/views/safeEnviro/emergencyDrill.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/hb_client/src/views/safeEnviro/emergencyPlan.vue b/hb_client/src/views/safeEnviro/emergencyPlan.vue new file mode 100644 index 0000000..daf87f0 --- /dev/null +++ b/hb_client/src/views/safeEnviro/emergencyPlan.vue @@ -0,0 +1,274 @@ + + + + + + \ No newline at end of file diff --git a/hb_client/src/views/safeEnviro/environmetManage.vue b/hb_client/src/views/safeEnviro/environmetManage.vue index 5adfb05..9943ad2 100644 --- a/hb_client/src/views/safeEnviro/environmetManage.vue +++ b/hb_client/src/views/safeEnviro/environmetManage.vue @@ -15,7 +15,7 @@ - - - + + - - + - - + - - + - - + - - + - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取消 - 确认 -
- +