5 years ago · 9034fc984d
--- a/web/css/chunk-139cf1a1.73cc4659.css
+++ b/web/css/chunk-139cf1a1.73cc4659.css
--- a/web/css/chunk-27550a72.99e14beb.css
+++ b/web/css/chunk-27550a72.99e14beb.css
--- a/web/css/chunk-28ec4e83.5b343405.css
+++ b/web/css/chunk-28ec4e83.5b343405.css
--- a/web/css/chunk-2ef2fac4.6cb2574c.css
+++ b/web/css/chunk-2ef2fac4.6cb2574c.css
--- a/web/css/chunk-3520c2d6.5c857fb5.css
+++ b/web/css/chunk-3520c2d6.5c857fb5.css
--- a/web/css/chunk-476b0587.44f35dd8.css
+++ b/web/css/chunk-476b0587.44f35dd8.css
--- a/web/css/chunk-565b1914.72fe42eb.css
+++ b/web/css/chunk-565b1914.72fe42eb.css
--- a/web/css/chunk-56b2c42d.8b682471.css
+++ b/web/css/chunk-56b2c42d.8b682471.css
--- a/web/css/chunk-5bc26c22.aab30c87.css
+++ b/web/css/chunk-5bc26c22.aab30c87.css
--- a/web/css/chunk-5de518e1.9c953a41.css
+++ b/web/css/chunk-5de518e1.9c953a41.css
--- a/web/css/chunk-6b1d2eca.60dd08d9.css
+++ b/web/css/chunk-6b1d2eca.60dd08d9.css
--- a/web/css/chunk-749ce008.31687a68.css
+++ b/web/css/chunk-749ce008.31687a68.css
--- a/web/css/chunk-87aeea08.05975ca9.css
+++ b/web/css/chunk-87aeea08.05975ca9.css
--- a/web/css/chunk-e4e87226.9745a476.css
+++ b/web/css/chunk-e4e87226.9745a476.css
--- a/web/css/chunk-ef8423b2.2f97166d.css
+++ b/web/css/chunk-ef8423b2.2f97166d.css
--- a/web/index.html
+++ b/web/index.html
--- a/web/js/app.071c5e74.js
+++ b/web/js/app.071c5e74.js
--- a/web/js/app.071c5e74.js.map
+++ b/web/js/app.071c5e74.js.map
--- a/web/js/app.6a6a08ec.js
+++ b/web/js/app.6a6a08ec.js
--- a/web/js/app.6a6a08ec.js.map
+++ b/web/js/app.6a6a08ec.js.map
--- a/web/js/chunk-139cf1a1.aba9c233.js
+++ b/web/js/chunk-139cf1a1.aba9c233.js
--- a/web/js/chunk-139cf1a1.aba9c233.js.map
+++ b/web/js/chunk-139cf1a1.aba9c233.js.map
--- a/web/js/chunk-1d8e8d5c.3f9a019c.js
+++ b/web/js/chunk-1d8e8d5c.3f9a019c.js
--- a/web/js/chunk-1d8e8d5c.3f9a019c.js.map
+++ b/web/js/chunk-1d8e8d5c.3f9a019c.js.map
--- a/web/js/chunk-27550a72.498f1b83.js
+++ b/web/js/chunk-27550a72.498f1b83.js
--- a/web/js/chunk-27550a72.498f1b83.js.map
+++ b/web/js/chunk-27550a72.498f1b83.js.map
--- a/web/js/chunk-28ec4e83.f7cda602.js
+++ b/web/js/chunk-28ec4e83.f7cda602.js
--- a/web/js/chunk-28ec4e83.f7cda602.js.map
+++ b/web/js/chunk-28ec4e83.f7cda602.js.map
--- a/web/js/chunk-2b5ccf4a.33fc70ae.js
+++ b/web/js/chunk-2b5ccf4a.33fc70ae.js
--- a/web/js/chunk-2b5ccf4a.33fc70ae.js.map
+++ b/web/js/chunk-2b5ccf4a.33fc70ae.js.map
--- a/web/js/chunk-2ce8a93e.5333bad3.js
+++ b/web/js/chunk-2ce8a93e.5333bad3.js
--- a/web/js/chunk-2ce8a93e.5333bad3.js.map
+++ b/web/js/chunk-2ce8a93e.5333bad3.js.map
--- a/web/js/chunk-2ef2fac4.63acb687.js
+++ b/web/js/chunk-2ef2fac4.63acb687.js
--- a/web/js/chunk-2ef2fac4.63acb687.js.map
+++ b/web/js/chunk-2ef2fac4.63acb687.js.map
--- a/web/js/chunk-338a4208.1904af9f.js
+++ b/web/js/chunk-338a4208.1904af9f.js
--- a/web/js/chunk-338a4208.1904af9f.js.map
+++ b/web/js/chunk-338a4208.1904af9f.js.map
--- a/web/js/chunk-3520c2d6.c39c83f8.js
+++ b/web/js/chunk-3520c2d6.c39c83f8.js
--- a/web/js/chunk-3520c2d6.c39c83f8.js.map
+++ b/web/js/chunk-3520c2d6.c39c83f8.js.map
--- a/web/js/chunk-37b70864.4cc08cd1.js
+++ b/web/js/chunk-37b70864.4cc08cd1.js
--- a/web/js/chunk-37b70864.4cc08cd1.js.map
+++ b/web/js/chunk-37b70864.4cc08cd1.js.map
--- a/web/js/chunk-476b0587.b46c22a4.js
+++ b/web/js/chunk-476b0587.b46c22a4.js
--- a/web/js/chunk-476b0587.b46c22a4.js.map
+++ b/web/js/chunk-476b0587.b46c22a4.js.map
--- a/web/js/chunk-4da40bf6.1896363f.js
+++ b/web/js/chunk-4da40bf6.1896363f.js
--- a/web/js/chunk-4da40bf6.1896363f.js.map
+++ b/web/js/chunk-4da40bf6.1896363f.js.map
--- a/web/js/chunk-565b1914.39dedb05.js
+++ b/web/js/chunk-565b1914.39dedb05.js
--- a/web/js/chunk-565b1914.39dedb05.js.map
+++ b/web/js/chunk-565b1914.39dedb05.js.map
--- a/web/js/chunk-56b2c42d.8cb39693.js
+++ b/web/js/chunk-56b2c42d.8cb39693.js
--- a/web/js/chunk-56b2c42d.8cb39693.js.map
+++ b/web/js/chunk-56b2c42d.8cb39693.js.map
--- a/web/js/chunk-5bc26c22.cb9c2f4d.js
+++ b/web/js/chunk-5bc26c22.cb9c2f4d.js
--- a/web/js/chunk-5bc26c22.cb9c2f4d.js.map
+++ b/web/js/chunk-5bc26c22.cb9c2f4d.js.map
--- a/web/js/chunk-5de518e1.ef4c3a78.js
+++ b/web/js/chunk-5de518e1.ef4c3a78.js
--- a/web/js/chunk-5de518e1.ef4c3a78.js.map
+++ b/web/js/chunk-5de518e1.ef4c3a78.js.map
--- a/web/js/chunk-ef8423b2.1377e898.js
+++ b/web/js/chunk-ef8423b2.1377e898.js
--- a/web/js/chunk-6b1d2eca.ec7f2c5d.js.map
+++ b/web/js/chunk-6b1d2eca.ec7f2c5d.js.map
--- a/web/js/chunk-6c55f908.9aa01628.js
+++ b/web/js/chunk-6c55f908.9aa01628.js
--- a/web/js/chunk-6c55f908.9aa01628.js.map
+++ b/web/js/chunk-6c55f908.9aa01628.js.map
--- a/web/js/chunk-749ce008.5259658f.js
+++ b/web/js/chunk-749ce008.5259658f.js
--- a/web/js/chunk-749ce008.5259658f.js.map
+++ b/web/js/chunk-749ce008.5259658f.js.map
--- a/web/js/chunk-76707987.d5d29871.js
+++ b/web/js/chunk-76707987.d5d29871.js
--- a/web/js/chunk-76707987.d5d29871.js.map
+++ b/web/js/chunk-76707987.d5d29871.js.map
--- a/web/js/chunk-7a95aa76.fd385be4.js
+++ b/web/js/chunk-7a95aa76.fd385be4.js
--- a/web/js/chunk-7a95aa76.fd385be4.js.map
+++ b/web/js/chunk-7a95aa76.fd385be4.js.map
--- a/web/js/chunk-7bb3a48b.9e2f9bd4.js
+++ b/web/js/chunk-7bb3a48b.9e2f9bd4.js
--- a/web/js/chunk-7bb3a48b.9e2f9bd4.js.map
+++ b/web/js/chunk-7bb3a48b.9e2f9bd4.js.map
--- a/web/js/chunk-87dbe6ea.74ef2f72.js
+++ b/web/js/chunk-87dbe6ea.74ef2f72.js
--- a/web/js/chunk-87dbe6ea.74ef2f72.js.map
+++ b/web/js/chunk-87dbe6ea.74ef2f72.js.map
--- a/web/js/chunk-9efb8bee.b8e721bf.js
+++ b/web/js/chunk-9efb8bee.b8e721bf.js
--- a/web/js/chunk-9efb8bee.b8e721bf.js.map
+++ b/web/js/chunk-9efb8bee.b8e721bf.js.map
--- a/web/js/chunk-e4e87226.c15cafda.js
+++ b/web/js/chunk-e4e87226.c15cafda.js
--- a/web/js/chunk-e4e87226.c15cafda.js.map
+++ b/web/js/chunk-e4e87226.c15cafda.js.map
--- a/web/js/chunk-ef8423b2.1377e898.js.map
+++ b/web/js/chunk-ef8423b2.1377e898.js.map
--- a/web/js/chunk-vendors.4324cab1.js
+++ b/web/js/chunk-vendors.4324cab1.js
--- a/web/js/chunk-vendors.4324cab1.js.map
+++ b/web/js/chunk-vendors.4324cab1.js.map
--- a/web/js/chunk-vendors.96bd5e12.js
+++ b/web/js/chunk-vendors.96bd5e12.js
--- a/web/js/chunk-vendors.96bd5e12.js.map
+++ b/web/js/chunk-vendors.96bd5e12.js.map
--- a/webConfig/public/index.html
+++ b/webConfig/public/index.html
@@ -5,7 +5,7 @@
 
				     <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				     <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				     <link rel="icon" href="<%= BASE_URL %>bitbug_favicon.ico">
			
 
				-    <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_1849275_qqmus7erdvd.css">
			
 
				+    <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_1849275_ovslqk14w6f.css">
			
 
				     <title>IDCOL</title>
			
 
				   </head>
			
 
				   <body>
			
--- a/webConfig/src/api/allUel.js
+++ b/webConfig/src/api/allUel.js
@@ -124,6 +124,12 @@ const urls={
 
				         alarmTypeList:'https://120.77.179.55/api/home/alarm_type_list',/*告警状态下拉列表*/
			
 
				 
			
 
				         patrolPost:'https://120.77.179.55/api/project/patrol',/*巡检设置*/
			
 
				+
			
 
				+        save_alarm_send_user:'https://120.77.179.55/api/alarm/save_alarm_send_user',/*添加编辑推送人员*/
			
 
				+        alarm_send_user_list:'https://120.77.179.55/api/alarm/alarm_send_user_list',/*推送人员信息列表*/
			
 
				+        set_alarm_send_user_status:'https://120.77.179.55/api/alarm/set_alarm_send_user_status',/*设置推送人员状态*/
			
 
				+        del_alarm_send_user:'https://120.77.179.55/api/alarm/del_alarm_send_user',/*删除维修人员*/
			
 
				+
			
 
				     },
			
 
				     gisMap:{
			
 
				         mapGet:'https://120.77.179.55/api/map/get',/*地图首页数据*/
			
--- a/webConfig/src/components/header.vue
+++ b/webConfig/src/components/header.vue
@@ -18,7 +18,7 @@
 
				                         </div>
			
 
				                         <div class="nav_ul">
			
 
				                             <div class="nav_title"><span class="span">Maintain</span></div> 
			
 
				-                            <div class="nav_li" @click="linkToFun('/alarmMaintenance')" :class="{'select':routerStr == '/alarmMaintenance'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Alarm maintenance</span></div>
			
 
				+                            <div class="nav_li" @click="linkToFun('/alarmMaintenance')" :class="{'select':routerStr == '/alarmMaintenance'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Alarm</span></div>
			
 
				                             <div class="nav_li" @click="linkToFun('/historicalData')" :class="{'select':routerStr == '/historicalData'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Historical data</span></div>
			
 
				                         </div>
			
 
				                         <div class="nav_ul">
			
--- a/webConfig/src/img/maintenance.png
+++ b/webConfig/src/img/maintenance.png
--- a/webConfig/src/router.js
+++ b/webConfig/src/router.js
@@ -15,6 +15,8 @@ const alarmMaintenance = () => import('./views/alarmMaintenance/alarmMaintenance
 
				 const maintenanceRecord = () => import('./views/alarmMaintenance/maintenanceRecord.vue');
			
 
				 const repairPersonnel = () => import('./views/alarmMaintenance/repairPersonnel.vue');
			
 
				 const streetLightInformation = () => import('./views/alarmMaintenance/streetLightInformation.vue');
			
 
				+// const notificationSetting = () => import('./views/alarmMaintenance/notificationSetting.vue');
			
 
				+const maintenanceStaff = () => import('./views/alarmMaintenance/maintenanceStaff.vue');
			
 
				 
			
 
				 const historicalData = () => import('./views/historicalData/historicalData.vue');
			
 
				 
			
@@ -74,6 +76,11 @@ const routes = [
 
				         name: 'streetLightInformation',
			
 
				         component: streetLightInformation
			
 
				     },
			
 
				+    {
			
 
				+        path: '/maintenanceStaff',
			
 
				+        name: 'maintenanceStaff',
			
 
				+        component: maintenanceStaff
			
 
				+    },
			
 
				 
			
 
				     {
			
 
				         path: '/historicalData',
			
--- a/webConfig/src/views/alarmMaintenance/alarmMaintenance.vue
+++ b/webConfig/src/views/alarmMaintenance/alarmMaintenance.vue
@@ -30,7 +30,11 @@
 
				         </div>
			
 
				         <div class="wrap">
			
 
				             <div class="main_top clearfix">
			
 
				-                <div class="button_box">
			
 
				+                <div class="button_box_l">
			
 
				+                    <!-- <el-button round @click="linkToFun('/notificationSetting')">{{'Notification setting'}}</el-button> -->
			
 
				+                    <el-button round @click="linkToFun('/maintenanceStaff')">{{'Maintenance staff'}}</el-button>
			
 
				+                </div>
			
 
				+                <div class="button_box_r">
			
 
				                     <el-button round @click="exportExcel()" v-loading="loading.exportExcel">{{'Export Excel'}}</el-button>
			
 
				                     <el-button round @click="printing()" v-loading="loading.printing">{{'Print'}}</el-button>
			
 
				                     <el-button round icon="el-icon-refresh" @click="refresh()">{{'Refresh'}}</el-button>
			
@@ -1420,7 +1424,6 @@
 
				                 }
			
 
				             },
			
 
				             routerLink(type,data){
			
 
				-
			
 
				                 if(data){
			
 
				                     // console.log(data.lampid)
			
 
				                     var storage = window.localStorage;
			
@@ -1447,8 +1450,8 @@
 
				                         }
			
 
				                     }
			
 
				                 }
			
 
				-                // console.log(this.role)
			
 
				-                if(this.role == 'Super administrator'){
			
 
				+                console.log(this.role)
			
 
				+                if(this.role == '1'){
			
 
				                     isImplement = true;
			
 
				                 }
			
 
				                 if(isImplement){
			
@@ -1461,6 +1464,24 @@
 
				                     });
			
 
				                 }
			
 
				             },
			
 
				+            linkToFun(val){
			
 
				+                let isImplement = true;
			
 
				+                if(this.role == '1'){
			
 
				+                    isImplement = true;
			
 
				+                }
			
 
				+                if(isImplement){
			
 
				+                    this.$router.push({path:val});
			
 
				+                    this.$store.commit('ROUTERSTRFUN',{
			
 
				+                        routerStr:val,
			
 
				+                    })
			
 
				+                }else{
			
 
				+                    this.$message({
			
 
				+                      showClose: true,
			
 
				+                      message:'No view permissions',
			
 
				+                      type: 'warning'
			
 
				+                    });
			
 
				+                }
			
 
				+            },
			
 
				             routerLampLink(type,data){
			
 
				                 window.open('#/'+type+'?id='+data.lampid+'&name='+data.number);
			
 
				             },
			
@@ -1652,7 +1673,17 @@
 
				             margin-bottom: 80px;
			
 
				             padding-top: 32px;
			
 
				             position: relative;
			
 
				-            .button_box{
			
 
				+            display: flex;
			
 
				+            justify-content: space-between;
			
 
				+            .button_box_l{
			
 
				+                float: right;
			
 
				+                .el-button{
			
 
				+                    background: linear-gradient(140.3deg,rgba(252,132,64,1),rgba(254,113,33,1));
			
 
				+                    color: #fff;
			
 
				+                    margin-left: 18px;
			
 
				+                }
			
 
				+            }
			
 
				+            .button_box_r{
			
 
				                 float: right;
			
 
				                 .el-button{
			
 
				                     background: linear-gradient(140.3deg,rgba(252,132,64,1),rgba(254,113,33,1));
			
--- a/webConfig/src/views/alarmMaintenance/maintenanceStaff.vue
+++ b/webConfig/src/views/alarmMaintenance/maintenanceStaff.vue
--- a/webConfig/src/views/alarmMaintenance/notificationSetting.vue
+++ b/webConfig/src/views/alarmMaintenance/notificationSetting.vue