Browse Source

no message

XAWDJ0277HWXPT2\Administrator 5 years ago
parent
commit
122a904dbd
81 changed files with 857 additions and 1102 deletions
  1. 0 0
      web/css/chunk-139cf1a1.6ea5c8ec.css
  2. 0 1
      web/css/chunk-2b5ccf4a.64b14aae.css
  3. 0 0
      web/css/chunk-2ef2fac4.6cb2574c.css
  4. 1 0
      web/css/chunk-3520c2d6.17872edd.css
  5. 0 0
      web/css/chunk-3f41bc09.d60e5254.css
  6. 0 0
      web/css/chunk-565b1914.72fe42eb.css
  7. 0 0
      web/css/chunk-56b2c42d.8b682471.css
  8. 1 0
      web/css/chunk-6b1d2eca.a3faa082.css
  9. 0 0
      web/css/chunk-749ce008.3550b045.css
  10. 0 0
      web/css/chunk-7ef40bfa.c6dbfddd.css
  11. 0 0
      web/css/chunk-87aeea08.05975ca9.css
  12. 0 0
      web/css/chunk-9927e514.44f35dd8.css
  13. 1 0
      web/css/chunk-a80ca5cc.a4dfee99.css
  14. 0 1
      web/css/chunk-e1487306.6264fed5.css
  15. 0 0
      web/css/chunk-e4e87226.9745a476.css
  16. 0 1
      web/css/chunk-ef8423b2.ce1f82a1.css
  17. 1 1
      web/index.html
  18. 2 0
      web/js/app.0a0a432f.js
  19. 1 0
      web/js/app.0a0a432f.js.map
  20. 0 2
      web/js/app.abf0b6eb.js
  21. 0 1
      web/js/app.abf0b6eb.js.map
  22. 2 0
      web/js/chunk-139cf1a1.f0b71570.js
  23. 1 0
      web/js/chunk-139cf1a1.f0b71570.js.map
  24. 0 2
      web/js/chunk-1d8e8d5c.561118e4.js
  25. 0 1
      web/js/chunk-1d8e8d5c.561118e4.js.map
  26. 0 2
      web/js/chunk-2b5ccf4a.4579a31f.js
  27. 0 1
      web/js/chunk-2b5ccf4a.4579a31f.js.map
  28. 0 2
      web/js/chunk-2ce8a93e.5333bad3.js
  29. 0 1
      web/js/chunk-2ce8a93e.5333bad3.js.map
  30. 2 0
      web/js/chunk-2ef2fac4.63acb687.js
  31. 1 0
      web/js/chunk-2ef2fac4.63acb687.js.map
  32. 2 0
      web/js/chunk-3520c2d6.7ee1f38c.js
  33. 1 0
      web/js/chunk-3520c2d6.7ee1f38c.js.map
  34. 0 2
      web/js/chunk-37b70864.4cc08cd1.js
  35. 0 1
      web/js/chunk-37b70864.4cc08cd1.js.map
  36. 2 0
      web/js/chunk-3f41bc09.6eb6a330.js
  37. 1 0
      web/js/chunk-3f41bc09.6eb6a330.js.map
  38. 0 2
      web/js/chunk-4da40bf6.aa6dd3dc.js
  39. 0 1
      web/js/chunk-4da40bf6.aa6dd3dc.js.map
  40. 2 0
      web/js/chunk-565b1914.39dedb05.js
  41. 1 0
      web/js/chunk-565b1914.39dedb05.js.map
  42. 2 0
      web/js/chunk-56b2c42d.8cb39693.js
  43. 1 0
      web/js/chunk-56b2c42d.8cb39693.js.map
  44. 2 0
      web/js/chunk-6b1d2eca.b1b2530b.js
  45. 1 0
      web/js/chunk-6b1d2eca.b1b2530b.js.map
  46. 0 2
      web/js/chunk-6c55f908.7a3e0408.js
  47. 0 1
      web/js/chunk-6c55f908.7a3e0408.js.map
  48. 0 4
      web/js/chunk-6d0440c4.2d014bd4.js
  49. 0 1
      web/js/chunk-6d0440c4.2d014bd4.js.map
  50. 2 0
      web/js/chunk-749ce008.02f8bc30.js
  51. 1 0
      web/js/chunk-749ce008.02f8bc30.js.map
  52. 0 2
      web/js/chunk-76707987.d5d29871.js
  53. 0 1
      web/js/chunk-76707987.d5d29871.js.map
  54. 2 0
      web/js/chunk-7ef40bfa.661314a1.js
  55. 1 0
      web/js/chunk-7ef40bfa.661314a1.js.map
  56. 2 2
      web/js/chunk-87dbe6ea.74ef2f72.js
  57. 1 1
      web/js/chunk-87dbe6ea.74ef2f72.js.map
  58. 0 2
      web/js/chunk-8dedb20a.9d4a9d05.js
  59. 0 1
      web/js/chunk-8dedb20a.9d4a9d05.js.map
  60. 4 0
      web/js/chunk-9927e514.08ae63e2.js
  61. 1 0
      web/js/chunk-9927e514.08ae63e2.js.map
  62. 0 2
      web/js/chunk-9efb8bee.921ec54a.js
  63. 0 1
      web/js/chunk-9efb8bee.921ec54a.js.map
  64. 2 0
      web/js/chunk-a80ca5cc.16e5298f.js
  65. 1 0
      web/js/chunk-a80ca5cc.16e5298f.js.map
  66. 0 2
      web/js/chunk-e1487306.7bfa0170.js
  67. 0 1
      web/js/chunk-e1487306.7bfa0170.js.map
  68. 2 0
      web/js/chunk-e4e87226.11131fc8.js
  69. 1 0
      web/js/chunk-e4e87226.11131fc8.js.map
  70. 0 2
      web/js/chunk-ef8423b2.86bc887d.js
  71. 0 1
      web/js/chunk-ef8423b2.86bc887d.js.map
  72. 63 0
      web/js/chunk-vendors.c14eb133.js
  73. 1 0
      web/js/chunk-vendors.c14eb133.js.map
  74. 0 63
      web/js/chunk-vendors.dba02c96.js
  75. 0 1
      web/js/chunk-vendors.dba02c96.js.map
  76. 0 18
      webConfig/src/components/sideBar_idcol.vue
  77. 291 294
      webConfig/src/views/GISMap.vue
  78. 122 206
      webConfig/src/views/alarmMaintenance/alarmMaintenance.vue
  79. 1 1
      webConfig/src/views/dashboard.vue
  80. 236 214
      webConfig/src/views/historicalData/historicalData.vue
  81. 95 257
      webConfig/src/views/projectManagement.vue

web/css/chunk-1d8e8d5c.6ea5c8ec.css → web/css/chunk-139cf1a1.6ea5c8ec.css


File diff suppressed because it is too large
+ 0 - 1
web/css/chunk-2b5ccf4a.64b14aae.css


web/css/chunk-76707987.6cb2574c.css → web/css/chunk-2ef2fac4.6cb2574c.css


File diff suppressed because it is too large
+ 1 - 0
web/css/chunk-3520c2d6.17872edd.css


web/css/chunk-4da40bf6.d60e5254.css → web/css/chunk-3f41bc09.d60e5254.css


web/css/chunk-37b70864.72fe42eb.css → web/css/chunk-565b1914.72fe42eb.css


web/css/chunk-2ce8a93e.8b682471.css → web/css/chunk-56b2c42d.8b682471.css


File diff suppressed because it is too large
+ 1 - 0
web/css/chunk-6b1d2eca.a3faa082.css


web/css/chunk-6c55f908.3550b045.css → web/css/chunk-749ce008.3550b045.css


web/css/chunk-8dedb20a.c6dbfddd.css → web/css/chunk-7ef40bfa.c6dbfddd.css


web/css/chunk-87dbe6ea.05975ca9.css → web/css/chunk-87aeea08.05975ca9.css


web/css/chunk-6d0440c4.44f35dd8.css → web/css/chunk-9927e514.44f35dd8.css


File diff suppressed because it is too large
+ 1 - 0
web/css/chunk-a80ca5cc.a4dfee99.css


File diff suppressed because it is too large
+ 0 - 1
web/css/chunk-e1487306.6264fed5.css


web/css/chunk-9efb8bee.9745a476.css → web/css/chunk-e4e87226.9745a476.css


File diff suppressed because it is too large
+ 0 - 1
web/css/chunk-ef8423b2.ce1f82a1.css


File diff suppressed because it is too large
+ 1 - 1
web/index.html


File diff suppressed because it is too large
+ 2 - 0
web/js/app.0a0a432f.js


File diff suppressed because it is too large
+ 1 - 0
web/js/app.0a0a432f.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/app.abf0b6eb.js


File diff suppressed because it is too large
+ 0 - 1
web/js/app.abf0b6eb.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-139cf1a1.f0b71570.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-139cf1a1.f0b71570.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-1d8e8d5c.561118e4.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-1d8e8d5c.561118e4.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-2b5ccf4a.4579a31f.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-2b5ccf4a.4579a31f.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-2ce8a93e.5333bad3.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-2ce8a93e.5333bad3.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-2ef2fac4.63acb687.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-2ef2fac4.63acb687.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-3520c2d6.7ee1f38c.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-3520c2d6.7ee1f38c.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-37b70864.4cc08cd1.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-37b70864.4cc08cd1.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-3f41bc09.6eb6a330.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-3f41bc09.6eb6a330.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-4da40bf6.aa6dd3dc.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-4da40bf6.aa6dd3dc.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-565b1914.39dedb05.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-565b1914.39dedb05.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-56b2c42d.8cb39693.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-56b2c42d.8cb39693.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-6b1d2eca.b1b2530b.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-6b1d2eca.b1b2530b.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-6c55f908.7a3e0408.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-6c55f908.7a3e0408.js.map


File diff suppressed because it is too large
+ 0 - 4
web/js/chunk-6d0440c4.2d014bd4.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-6d0440c4.2d014bd4.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-749ce008.02f8bc30.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-749ce008.02f8bc30.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-76707987.d5d29871.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-76707987.d5d29871.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-7ef40bfa.661314a1.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-7ef40bfa.661314a1.js.map


File diff suppressed because it is too large
+ 2 - 2
web/js/chunk-87dbe6ea.74ef2f72.js


File diff suppressed because it is too large
+ 1 - 1
web/js/chunk-87dbe6ea.74ef2f72.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-8dedb20a.9d4a9d05.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-8dedb20a.9d4a9d05.js.map


File diff suppressed because it is too large
+ 4 - 0
web/js/chunk-9927e514.08ae63e2.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-9927e514.08ae63e2.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-9efb8bee.921ec54a.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-9efb8bee.921ec54a.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-a80ca5cc.16e5298f.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-a80ca5cc.16e5298f.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-e1487306.7bfa0170.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-e1487306.7bfa0170.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-e4e87226.11131fc8.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-e4e87226.11131fc8.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-ef8423b2.86bc887d.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-ef8423b2.86bc887d.js.map


File diff suppressed because it is too large
+ 63 - 0
web/js/chunk-vendors.c14eb133.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-vendors.c14eb133.js.map


File diff suppressed because it is too large
+ 0 - 63
web/js/chunk-vendors.dba02c96.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-vendors.dba02c96.js.map


+ 0 - 18
webConfig/src/components/sideBar_idcol.vue

@@ -161,28 +161,10 @@
             },
             /*侧边栏里展开收起*/
             click2(data,d){
-                // console.log(this.sideBarList,'-===-=')
-                // if(this.searchType == 0){
-                //     return
-                // }
                 this.projectSelectFun(this.searchType,data,d)
             },
             click3(){
                 this.sideBarIsOn()
-                fun(this.version)
-                function fun(version){
-                    if($(".screenEN").length != 0){
-                        if(version == 0){
-                            $(".screenEN input").attr('placeholder','输入关键字按下回车键搜索');
-                        }else{
-                            $(".screenEN input").attr('placeholder','Enter keywords Search by Enter');
-                        }
-                    }else{
-                        setTimeout(function(){
-                            fun(version)
-                        },100)
-                    }
-                }
             },
             click4(){
                 this.projectAll();

File diff suppressed because it is too large
+ 291 - 294
webConfig/src/views/GISMap.vue


+ 122 - 206
webConfig/src/views/alarmMaintenance/alarmMaintenance.vue

@@ -9,13 +9,13 @@
             <div class="right_sidebar">
                 <div class="sideBar_box">
                     <div class="clearfix" @click="routerLink('/repairPersonnel')">
-                        <span>{{version==0?'维修员':'Maintenance staff'}}</span>
-                        <span>{{repairman}}&nbsp;&nbsp;{{version==0?'个':'individual'}}&nbsp;&nbsp;&nbsp;&nbsp;<i class="el-icon-arrow-right"></i>&nbsp;&nbsp;</span>
+                        <span>{{'Maintenance staff'}}</span>
+                        <span>{{repairman}}&nbsp;&nbsp;{{'individual'}}&nbsp;&nbsp;&nbsp;&nbsp;<i class="el-icon-arrow-right"></i>&nbsp;&nbsp;</span>
                     </div>
-                    <p>{{version==0?'近期维修':'Recent repairs'}}<span @click="routerLink('/maintenanceRecord')">{{version==0?'查看全部':'view all'}}</span></p>
+                    <p>{{'Recent repairs'}}<span @click="routerLink('/maintenanceRecord')">{{'view all'}}</span></p>
                     <ul>
                         <li class="right_sideBar_list" v-for="item in projectList" :key="item.id">
-                            <p>{{item.project_name}}<span>{{version==0?'维修员':'Maintenance staff'}}&nbsp;&nbsp;&nbsp;&nbsp;{{item.repair_username}}</span></p>
+                            <p>{{item.project_name}}<span>{{'Maintenance staff'}}&nbsp;&nbsp;&nbsp;&nbsp;{{item.repair_username}}</span></p>
                             <p><span>{{item.lampid}}:</span>{{item.repair_solution}}</p>
                             <div class="clearfix">
                                 <span>{{item.createtime}}</span>
@@ -31,35 +31,35 @@
         <div class="wrap">
             <div class="main_top clearfix">
                 <div class="button_box">
-                    <el-button round @click="exportExcel()" v-loading="loading.exportExcel">{{version==0?'导出Excel':'Export Excel'}}</el-button>
-                    <el-button round @click="printing()" v-loading="loading.printing">{{version == 0 ?'打印列表' : 'Print'}}</el-button>
-                    <el-button round icon="el-icon-refresh" @click="refresh()">{{version == 0 ?'刷新' : 'Refresh'}}</el-button>
+                    <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>
                 </div>
-                <ul class="alarm_nav clearfix" :class="{'alarm_nav_en':version == 1}">
+                <ul class="alarm_nav clearfix" :class="{'alarm_nav_en':version == 0}">
                     <li @click="alarmNavFun(item.name)" :class="{'alarm_nav_select':alarmNav==item.name}" v-for="item in alarmNavListEN" :key="item.id"><span>{{item.name}}</span></li>
                 </ul>
             </div>
-            <div class="screen-box clearfix" :class="{'screen-box_en':version == 1}">
+            <div class="screen-box clearfix" :class="{'screen-box_en':version == 0}">
                 <div class="search_box screen-box_box">
-                    <el-input :placeholder="version==0?'- 输入关键词进行搜索':'- Enter keywords to search'" v-model="keyword" class="search" @change="search()">
-                        <template slot="prepend">{{version==0?'搜索':'Search'}}</template>
+                    <el-input :placeholder="'- Enter keywords to search'" v-model="keyword" class="search" @change="search()">
+                        <template slot="prepend">{{'Search'}}</template>
                     </el-input>
                 </div>
-                <div class="screen-box_box" v-if="alarmNav != '巡检设置' && alarmNav != 'Inspection setup'">
-                    <span>{{version==0?'时间':'Time'}}</span>
+                <div class="screen-box_box" v-if="alarmNav != 'Inspection setup'">
+                    <span>{{'Time'}}</span>
                     <el-date-picker
                       v-model="dateTime"
                       type="datetimerange"
                       range-separator="-"
-                      :start-placeholder="version==0?'开始时间':'Start time'"
-                      :end-placeholder="version==0?'结束时间':'End Time'"
+                      :start-placeholder="'Start time'"
+                      :end-placeholder="'End Time'"
                       align="right">
                     </el-date-picker>
                 </div>
-                <div class="screen-box_box" v-if="alarmNav != '巡检设置' && alarmNav != 'Inspection setup'">
-                    <span>{{version==0?'类型':'Type'}}</span>
+                <div class="screen-box_box" v-if="alarmNav != 'Inspection setup'">
+                    <span>{{'Type'}}</span>
                     <el-select v-model="alarmType">
-                        <el-option key="0" value="0" :label="version==0?'全部':'All'"></el-option>
+                        <el-option key="0" value="0" :label="'All'"></el-option>
                         <el-option
                           v-for="item in alarmTypeList"
                           :key="item.name"
@@ -68,15 +68,14 @@
                         </el-option>
                     </el-select>
                 </div>
-                <div class="screen-box_box" v-if="alarmNav != '巡检设置' && alarmNav != 'Inspection setup'">
-                    <span>{{version==0?'标注':'Callout'}}</span>
+                <div class="screen-box_box" v-if="alarmNav != 'Inspection setup'">
+                    <span>{{'Callout'}}</span>
                     <el-select v-model="alarmStatus">
-                        <el-option key="-1" value="-1" :label="version==0?'全部':'All'"></el-option>
-                        <el-option key="1" value="1" :label="version==0?'已处理':'Processed'"></el-option>
-                        <el-option key="0" value="0" :label="version==0?'未处理':'Untreated'"></el-option>
+                        <el-option key="-1" value="-1" :label="'All'"></el-option>
+                        <el-option key="1" value="1" :label="'Processed'"></el-option>
+                        <el-option key="0" value="0" :label="'Untreated'"></el-option>
                     </el-select>
                 </div>
-                <!-- <el-button style="margin-top: 5px;float: right;" round @click="BatchSetup()" v-if="alarmNav == '巡检设置'|| alarmNav == 'Inspection setup'">{{version == 0 ?'批量设置' : 'Batch setup'}}</el-button> -->
             </div>
             <div class="information_box">
                 <el-table
@@ -87,35 +86,15 @@
                     width="100%"
                     :height="showOverflowTooltip?'calc(100% - 92px)':''"
                     @selection-change="handleSelectionChange"
-                    :class="{'table_style':(alarmNav != '巡检设置'&&alarmNav != 'Inspection setup')}"
+                    :class="{'table_style':(alarmNav != 'Inspection setup')}"
                     :row-class-name="tableRowClassName">
-                    <!-- <el-table-column
-                      type="selection"
-                      v-if="alarmNav == '巡检设置'||alarmNav == 'Inspection setup'"
-                      :width="48">
-                    </el-table-column> -->
                     <el-table-column
-                      v-if="version == 0"
-                      label="编号"
-                      prop="GL_index"
-                      align="center"
-                      :show-overflow-tooltip="showOverflowTooltip"
-                      width="52">
-                    </el-table-column>
-                    <el-table-column
-                      v-if="version == 1"
                       label="Number"
                       prop="GL_index"
                       align="center"
                       :show-overflow-tooltip="showOverflowTooltip"
                       width="82">
                     </el-table-column>
-                    <!-- <el-table-column align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" :min-width="item.prop=='updatetime'?'160':(item.label.length+1)*14+20" v-for="(item,index) in tableList" v-if="version == 0">
-                        <template  slot-scope="scope">
-                            <span class="tag_select" v-if="item.prop == 'number'" @click="routerLampLink('streetLightInformation',scope.row)">{{scope.row[item.prop]}}</span>
-                            <span v-if="item.prop != 'number'" :title="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
-                        </template>
-                    </el-table-column> -->
                     <el-table-column align="center" :show-overflow-tooltip="showOverflowTooltip" :prop="item.prop" :label="item.label" :key="item.id" :min-width="item.prop=='updatetime'?'160':(item.label.length+1)*9+20" v-for="(item) in tableList">
                         <template  slot-scope="scope">
                             <span class="tag_select" v-if="item.prop == 'number'" @click="routerLampLink('streetLightInformation',scope.row)">{{scope.row[item.prop]}}</span>
@@ -123,26 +102,26 @@
                         </template>
                     </el-table-column>
                     <el-table-column
-                        v-if="alarmNav!='历史告警' && alarmNav!='Historical alarm'"
-                        :label="version==0?'操作':'operate'"
+                        v-if="alarmNav!='Historical alarm'"
+                        :label="'operate'"
                         align="center"
-                        :width="version==0?'230px':'350px'">
+                        :width="'350px'">
                       <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="(alarmNav == '告警信息'||alarmNav=='Alarm')&&scope.row.status == 0" @click="tableOperationfun1(scope.row)">{{version==0?'标记处理':'Tag processing'}}</el-button>
+                        <el-button type="text" size="small" v-if="(alarmNav=='Alarm')&&scope.row.status == 0" @click="tableOperationfun1(scope.row)">{{'Tag processing'}}</el-button>
                         <el-popover trigger="hover" placement="top" v-if="scope.row.name">
                           <p>姓名: {{ scope.row.name }}</p>
                           <div slot="reference" class="name-wrapper" style="display: inherit">
-                            <el-button type="text" size="small" v-if="(alarmNav == '告警信息'||alarmNav=='Alarm')&&scope.row.status == 1" @click="tableOperationfun1(scope.row)">{{version==0?'处理人':'Operator'}}</el-button>
+                            <el-button type="text" size="small" v-if="(alarmNav=='Alarm')&&scope.row.status == 1" @click="tableOperationfun1(scope.row)">{{'Operator'}}</el-button>
                           </div>
                         </el-popover>
-                        <el-button type="text" size="small" v-if="(alarmNav == '告警信息'||alarmNav=='Alarm')&&scope.row.status == 1&&!scope.row.name" @click="tableOperationfun1(scope.row)">{{version==0?'处理人':'Operator'}}</el-button>
-                        <el-button type="text" size="small" v-if="(alarmNav == '告警信息'||alarmNav=='Alarm')&&scope.row.status == 0" @click="tableOperationfun2(scope.row)">{{version==0?'维修调度':'Maintenance scheduling'}}</el-button>
-                        <el-button type="text" size="small" v-if="(alarmNav == '告警信息'||alarmNav=='Alarm')&&scope.row.status == 1" @click="tableOperationfun2(scope.row)">{{version==0?'维修信息':'Maintenance information'}}</el-button>
+                        <el-button type="text" size="small" v-if="(alarmNav=='Alarm')&&scope.row.status == 1&&!scope.row.name" @click="tableOperationfun1(scope.row)">{{'Operator'}}</el-button>
+                        <el-button type="text" size="small" v-if="(alarmNav=='Alarm')&&scope.row.status == 0" @click="tableOperationfun2(scope.row)">{{'Maintenance scheduling'}}</el-button>
+                        <el-button type="text" size="small" v-if="(alarmNav=='Alarm')&&scope.row.status == 1" @click="tableOperationfun2(scope.row)">{{'Maintenance information'}}</el-button>
 
-                        <el-button type="text" style="color:#fc8440" v-if="alarmNav == '告警信息'||alarmNav=='Alarm'" size="small" @click="tableOperationfun3(scope.row)">{{version==0?'删除':'delete'}}</el-button>
-                        <el-button type="text" style="color:#fc8440" v-if="alarmNav == '巡检设置'||alarmNav == 'Inspection setup'" size="small" @click="tableOperationfun2(scope.row)">{{version==0?'设置':'Set up'}}</el-button>
-                        <el-button type="text" v-if="alarmNav == '巡检设置'||alarmNav == 'Inspection setup'" size="small" @click="tableOperationfun3(scope.row)">{{version==0?'详情':'details'}}</el-button>
-                        <el-button type="text" v-if="alarmNav == '巡检设置'||alarmNav == 'Inspection setup'" size="small" @click="tableOperationfun4(scope.row)" v-loading="scope.row.synchronizationLoading">{{version==0?'同步巡检':'Synchronous inspection'}}</el-button>
+                        <el-button type="text" style="color:#fc8440" v-if="alarmNav=='Alarm'" size="small" @click="tableOperationfun3(scope.row)">{{'delete'}}</el-button>
+                        <el-button type="text" style="color:#fc8440" v-if="alarmNav == 'Inspection setup'" size="small" @click="tableOperationfun2(scope.row)">{{'Set up'}}</el-button>
+                        <el-button type="text" v-if="alarmNav == 'Inspection setup'" size="small" @click="tableOperationfun3(scope.row)">{{'details'}}</el-button>
+                        <el-button type="text" v-if="alarmNav == 'Inspection setup'" size="small" @click="tableOperationfun4(scope.row)" v-loading="scope.row.synchronizationLoading">{{'Synchronous inspection'}}</el-button>
                       </template>
                     </el-table-column>
                 </el-table>
@@ -161,11 +140,11 @@
         </div>
         <!-- 巡检设置 -->
         <el-dialog
-          :title="version==0?'巡检设置':'Inspection setting'"
+          :title="'Inspection setting'"
           :visible.sync="inspectionSetupDialog"
           width="60%">
-          <el-form ref="form" :model="inspectionSetupform" :label-width="version==0?'140px':'180px'">
-              <el-form-item :label="version==0?'巡检命令:':'Inspection order:'">
+          <el-form ref="form" :model="inspectionSetupform" :label-width="'180px'">
+              <el-form-item :label="'Inspection order:'">
                 <el-select :disabled="inspectionSetupType=='XQ'" v-model="inspectionSetupform.switch" style="width:100%" @keyup.native="inspectionSetupdown($event)">
                     <el-option
                       v-for="item in patrolOrderList"
@@ -175,7 +154,7 @@
                     </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item :label="version==0?'巡检时间间隔(min):':'Inspection interval(min):'">
+              <el-form-item :label="'Inspection interval(min):'">
                 <el-select :disabled="inspectionSetupType=='XQ'" v-model="inspectionSetupform.interval" style="width:100%" @keyup.native="inspectionSetupdown($event)">
                     <el-option key="15" value="15" label="15"></el-option>
                     <el-option key="30" value="30" label="30"></el-option>
@@ -186,17 +165,17 @@
                     <el-option key="1440" value="1440" label="1440"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="inspectionSetupType=='XQ'" :label="version==0?'参数设置时间:':'Parameter setting time:'">
+              <el-form-item v-if="inspectionSetupType=='XQ'" :label="'Parameter setting time:'">
                 <el-input disabled v-model="inspectionSetupform.updatetime" style="width:100%" @keyup.native="inspectionSetupdown($event)"></el-input>
               </el-form-item>
           </el-form>
           <div class="dialog_foot" v-if="inspectionSetupType!='XQ'">
-            <el-button type="primary" @click="inspectionSetupSave(lampId)" v-loading="loading.inspectionSetupSave">{{version==0?'保 存':'Save'}}</el-button>
+            <el-button type="primary" @click="inspectionSetupSave(lampId)" v-loading="loading.inspectionSetupSave">{{'Save'}}</el-button>
           </div>
         </el-dialog>
         <!-- 故障详情弹框 -->
         <el-dialog
-          :title="version==0?'故障详情':'Fault details'"
+          :title="'Fault details'"
           :visible.sync="detailsDetailsDialog"
           :close-on-click-modal="false"
           class="detailsDetails_box"
@@ -204,22 +183,22 @@
           <el-form label-width="80px" :model="detailsDetailsData" label-position="right" class="box">
               <el-row>
                 <el-col :span="12" style="padding-right: 15px">
-                    <el-form-item :label="version==0?'项目名称:':'Project name:'">
+                    <el-form-item :label="'Project name:'">
                         <el-input v-model="detailsDetailsData.projectname" disabled></el-input>
                     </el-form-item>
-                    <el-form-item :label="version==0?'报警事件:':'Alarm event:'">
+                    <el-form-item :label="'Alarm event:'">
                         <el-input v-model="detailsDetailsData.stralarmtype" disabled></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12" style="padding-left: 15px">
-                    <el-form-item :label="version==0?'报警路灯:':'Alarm Lamp:'">
+                    <el-form-item :label="'Alarm Lamp:'">
                         <el-input v-model="detailsDetailsData.number" disabled></el-input>
                     </el-form-item>
-                    <el-form-item :label="version==0?'报警时间:':'Alarm time:'">
+                    <el-form-item :label="'Alarm time:'">
                         <el-input v-model="detailsDetailsData.updatetime" disabled></el-input>
                     </el-form-item>
                 </el-col>
-                <el-form-item :label="version==0?'维修调度:':'Maintenance scheduling:'">
+                <el-form-item :label="'Maintenance scheduling:'">
                     <el-select v-model="detailsDetailsData.userid" @keyup.native="detailsDetailsKeydown($event)">
                         <el-option
                           v-for="item in detailsDetailsData.list"
@@ -232,12 +211,12 @@
               </el-row>
           </el-form>
           <div class="dialog_foot">
-            <el-button type="primary" @click="detailsDetailsKeep()" v-loading="loading.detailsDetailsKeep">{{version==0?'确  定':'Determine'}}</el-button>
+            <el-button type="primary" @click="detailsDetailsKeep()" v-loading="loading.detailsDetailsKeep">{{'Determine'}}</el-button>
           </div>
         </el-dialog>
         <!-- 处理人 -->
         <el-dialog
-          :title="version==0?'处理人':'Operator'"
+          :title="'Operator'"
           :visible.sync="itionsDialog"
           width="80%">
           <el-table
@@ -248,15 +227,6 @@
             height="calc(100% - 92px)"
             :row-class-name="tableRowClassName">
             <el-table-column
-              v-if="version == 0"
-              label="编号"
-              prop="GL_index"
-              align="center"
-              :show-overflow-tooltip="true"
-              width="52">
-            </el-table-column>
-            <el-table-column
-              v-if="version == 1"
               label="Number"
               prop="GL_index"
               align="center"
@@ -278,12 +248,12 @@
             </el-pagination>
         </div>
           <div class="dialog_foot">
-            <el-button type="primary" @click="itionsDialog = false">{{version==0?'关  闭':'Close'}}</el-button>
+            <el-button type="primary" @click="itionsDialog = false">{{'Close'}}</el-button>
           </div>
         </el-dialog>
         <!-- 维修信息 -->
         <el-dialog
-          :title="version==0?'维修信息':'Maintenance information'"
+          :title="'Maintenance information'"
           :visible.sync="schedulingInformationDialog"
           width="80%">
           <el-table
@@ -294,23 +264,12 @@
             height="calc(100% - 92px)"
             :row-class-name="tableRowClassName">
             <el-table-column
-              v-if="version == 0"
-              label="编号"
-              prop="GL_index"
-              align="center"
-              :show-overflow-tooltip="true"
-              width="52">
-            </el-table-column>
-            <el-table-column
-              v-if="version == 1"
               label="Number"
               prop="GL_index"
               align="center"
               :show-overflow-tooltip="true"
               width="82">
             </el-table-column>
-            <!-- <el-table-column align="center" :show-overflow-tooltip="true" :prop="item.prop" :label="item.label" :key="item.id" :min-width="item.prop=='updatetime'?'160':(item.label.length+1)*14+20" v-for="(item) in schedulingInformationList" v-if="version == 0">
-            </el-table-column> -->
             <el-table-column align="center" :show-overflow-tooltip="true" :prop="item.prop" :label="item.label" :key="item.id" :min-width="item.prop=='repair_time'?'160':(item.label.length+1)*8+15" v-for="(item) in schedulingInformationListEN">
             </el-table-column>
         </el-table>
@@ -324,28 +283,28 @@
             </el-pagination>
         </div>
           <div class="dialog_foot">
-            <el-button type="primary" @click="schedulingInformationDialog = false">{{version==0?'关  闭':'Close'}}</el-button>
+            <el-button type="primary" @click="schedulingInformationDialog = false">{{'Close'}}</el-button>
           </div>
         </el-dialog>
         <!-- 添加维修记录 -->
         <el-dialog
-          :title="version==0?'维修信息':'Maintenance information'"
+          :title="'Maintenance information'"
           :visible.sync="recordDialog"
           class="record_dialog"
           width="60%">
           <el-form ref="recordForm" :model="recordForm" label-width="140px">
               <el-row>
                 <el-col :span="12">
-                  <el-form-item :label="version==0?'维修人员名称:':'Maintenance personnel name:'" prop="repair_id">
+                  <el-form-item :label="'Maintenance personnel name:'" prop="repair_id">
                     <el-input v-model="recordForm.repair_id" disabled></el-input>
                   </el-form-item>
-                  <el-form-item :label="version==0?'网络名称:':'Network name:'" prop="networkid">
+                  <el-form-item :label="'Network name:'" prop="networkid">
                     <el-input v-model="recordForm.networkid" disabled></el-input>
                   </el-form-item>
-                  <el-form-item :label="version==0?'维修的故障:':'Repair failure:'">
+                  <el-form-item :label="'Repair failure:'">
                     <el-input v-model="recordForm.repair_hitch"></el-input>
                   </el-form-item>
-                  <el-form-item :label="version==0?'维修方案时间:':'Maintenance schedule:'">
+                  <el-form-item :label="'Maintenance schedule:'">
                     <el-date-picker
                       v-model="recordForm.repair_time"
                       type="datetime">
@@ -353,23 +312,23 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item :label="version==0?'项目名称:':'project name:'" prop="projectid">
+                  <el-form-item :label="'project name:'" prop="projectid">
                     <el-input v-model="recordForm.projectid" disabled></el-input>
                   </el-form-item>
-                  <el-form-item :label="version==0?'路灯ID:':'Lamp ID:'" prop="lampid">
+                  <el-form-item :label="'Lamp ID:'" prop="lampid">
                     <el-input v-model="recordForm.lampid" disabled></el-input>
                   </el-form-item>
-                  <el-form-item :label="version==0?'维修方案:':'maintenance proposal:'">
+                  <el-form-item :label="'maintenance proposal:'">
                     <el-input v-model="recordForm.repair_solution" disabled></el-input>
                   </el-form-item>
-                  <el-form-item :label="version==0?'路段:':'Road section:'">
+                  <el-form-item :label="'Road section:'">
                     <el-input v-model="recordForm.address" disabled></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
           </el-form>
           <div class="dialog_foot">
-            <el-button type="primary" @click="recordDialog = false">{{version==0?'关  闭':'Close'}}</el-button>
+            <el-button type="primary" @click="recordDialog = false">{{'Close'}}</el-button>
           </div>
         </el-dialog>
         <button type="button" id="btn2" style="display: none"></button>
@@ -472,21 +431,19 @@
           })
         },
         mounted(){
-            if(this.version == 1){
-                this.alarmNav = 'Alarm';
-            }
+            this.alarmNav = 'Alarm';
             // this.getProjectNav('默认')
             this.nearRepairList();
             this.alarmTypeListFun();
 
-            this.patrolOrderList = [{value:'1',label:this.version==0?'开':'on'},{value:'0',label:this.version==0?'关':'off'}];
+            this.patrolOrderList = [{value:'1',label:'on'},{value:'0',label:'off'}];
         },
         methods:{
             handleSelectionChange(val) {
                 this.multipleSelection = val;
             },
             refresh(){
-                if(this.alarmNav != '巡检设置' && this.alarmNav != 'Inspection setup'){
+                if(this.alarmNav != 'Inspection setup'){
                     this.alarmGet(1,data => {
                         console.log(data)
                     })
@@ -568,7 +525,7 @@
                 }else{
                     this.$message({
                       showClose: true,
-                      message:this.version == 0?'请先选中灯控':'Please select the light control',
+                      message:'Please select the light control',
                       type: 'warning'
                     });
                 }
@@ -646,11 +603,7 @@
                         data =>{
                             // this.total = data.data.list.total*16;
                             this.loading.printing = false;
-                            if(this.version == 1){
-                                this.tableList = this.alarmTableListEN;
-                            }else{
-                                this.tableList = this.alarmTableList;
-                            }
+                            this.tableList = this.alarmTableListEN;
                             this.tableData = data.data.list.history_list;
                             this.loading.table = false;
                             let i = (this.currentPage - 1)*this.pageSize+1;
@@ -701,28 +654,16 @@
                         {},
                         data =>{
                             this.loading.printing = false;
-                            if(this.version == 1){
-                                this.tableList = this.patrolTableListEN;
-                            }else{
-                                this.tableList = this.patrolTableList;
-                            }
+                            this.tableList = this.patrolTableListEN;
                             this.tableData = data.data.patrol_list;
                             let i = (this.currentPage - 1)*this.pageSize+1;
                             for(let d of this.tableData){
                                 d.GL_index = i;
                                 i++;
                                 if(d.patroltype == '1'){
-                                    if(this.version =='0'){
-                                        d.patroltype = '开'
-                                    }else{
-                                        d.patroltype = 'on'
-                                    }
+                                    d.patroltype = 'on'
                                 }else if(d.patroltype == '0'){
-                                    if(this.version =='0'){
-                                        d.patroltype = '关'
-                                    }else{
-                                        d.patroltype = 'off'
-                                    }
+                                    d.patroltype = 'off'
                                 }
                             }
                             this.loading.table = false;
@@ -811,11 +752,7 @@
                     downloads = 0;
                     this.loading.table = true;
                 }
-                if(this.version == 1){
-                    this.tableList = this.patrolTableListEN;
-                }else{
-                    this.tableList = this.patrolTableList;
-                }
+                this.tableList = this.patrolTableListEN;
                 // this.$refs.elTable.doLayout();
                 baseApi.ajax_post(
                     allUrl.alarm.patrol_list,
@@ -842,17 +779,9 @@
                                     d.GL_index = i;
                                     i++;
                                     if(d.patroltype == '1'){
-                                        if(this.version =='0'){
-                                            d.patroltype = '开'
-                                        }else{
-                                            d.patroltype = 'on'
-                                        }
+                                        d.patroltype = 'on'
                                     }else if(d.patroltype == '0'){
-                                        if(this.version =='0'){
-                                            d.patroltype = '关'
-                                        }else{
-                                            d.patroltype = 'off'
-                                        }
+                                        d.patroltype = 'off'
                                     }
                                 }
                                 this.loading.table = false;
@@ -865,10 +794,10 @@
             },
             alarmGet(value,callback,download){
                 let type = '';
-                if(this.alarmNav == '告警信息' || this.alarmNav == 'Alarm'){
+                if(this.alarmNav == 'Alarm'){
                     type = 0;
                 }
-                if(this.alarmNav == '历史告警' || this.alarmNav == 'Historical alarm'){
+                if(this.alarmNav == 'Historical alarm'){
                     type = 1;
                 }
                 let downloads = '';
@@ -879,11 +808,7 @@
                     downloads = 0;
                     this.loading.table = true;
                 }
-                if(this.version == 1){
-                    this.tableList = this.alarmTableListEN;
-                }else{
-                    this.tableList = this.alarmTableList;
-                }
+                this.tableList = this.alarmTableListEN;
                 // this.$refs.elTable.doLayout();
                 baseApi.ajax_post(
                     allUrl.alarm.alarmGet,
@@ -939,11 +864,7 @@
                         // console.log(data,'公司列表')
                         this.projectNav = data.data;
                         for(var key in data.data){
-                            if(this.version == 1){
-                                this.$set(data.data[key],'type','Unfold')
-                            }else{
-                                this.$set(data.data[key],'type','展开')
-                            }
+                            this.$set(data.data[key],'type','Unfold')
                             if(data.data[key].project_list){
                                 for(var d of data.data[key].project_list){
                                     this.$set(d,'companyId',data.data[key].id)
@@ -977,63 +898,58 @@
             },
             /*侧边栏里展开收起*/
             sideBarListIsOpen(data){
-                if(data.type == '收起'){
-                    data.type = '展开';   
-                }else if(data.type == '展开'){
-                    data.type = '收起';   
-                }
-                if(this.version == 1){
-                    if(data.type == 'Collapse'){
-                        data.type = 'Unfold';   
-                    }else{
-                        data.type = 'Collapse'; 
-                    }
+                if(data.isOpen){
+                    data.isOpen = false;   
+                }else{
+                    data.isOpen = true;   
                 }
             },
-            projectSelectFun(data){
-                this.companyId = data.companyId;
-                this.projectId = data.id;
+            projectSelectFun(type,data,d){
                 var storage = window.localStorage;
                 storage.setItem('projectId',data.id);
-                storage.setItem('companyId',data.companyId);
-
-                if(!data.isOpen){
+                if(this.sideBarCompanyType != 0){
+                    if(d.cId != this.companyId){
+                        this.companyId = d.cId;
+                        storage.setItem('companyId',d.cId);
+                    }
+                }
+                this.projectId = data.id;
+                this.roadId = '';
+                if(!data.isOpen||this.projectId != data.id){
                     this.$set(data,'isOpen',true)
                     this.sectionNavGet(this.projectId,data)
                 }else{
                     this.$set(data,'isOpen',false)
                 }
-                this.roadId = '';
-
-                if(this.alarmNav != '巡检设置' && this.alarmNav != 'Inspection setup'){
-                    this.alarmGet(1,() => {
-                        // console.log(data)
-                    })
+                if(this.alarmNav != 'Inspection setup'){
+                    this.alarmGet(1,() => {})
                 }else{
-                    this.patrol_list(1,() => {
-                        // console.log(data)
-                    })
+                    this.patrol_list(1,() => {})
                 }
             },
             roadSelectFun(data,obj,d){
                 var storage = window.localStorage;
-                if(d.id != this.companyId){
-                    storage.setItem('companyId',d.id);
-                    this.companyId = d.id;
-                }
-                if(obj.id != this.projectId){
-                    storage.setItem('projectId',data.id);
-                    this.projectId = obj.id;
+                if(this.sideBarCompanyType == 0){
+                    if(data.id != this.projectId){
+                        storage.setItem('projectId',data.id);
+                        this.projectId = data.id;
+                    }
+                    this.roadId = obj.name;
+                }else{
+                    if(data.cId != this.companyId){
+                        this.companyId = data.cId;
+                        storage.setItem('companyId',data.cId);
+                    }
+                    if(obj.id != this.projectId){
+                        storage.setItem('projectId',obj.id);
+                        this.projectId = obj.id;
+                    }
+                    this.roadId = d.name;
                 }
-                this.roadId = data.value;
-                if(this.alarmNav != '巡检设置' && this.alarmNav != 'Inspection setup'){
-                    this.alarmGet(1,() => {
-                        // console.log(data)
-                    })
+                if(this.alarmNav != 'Inspection setup'){
+                    this.alarmGet(1,() => {})
                 }else{
-                    this.patrol_list(1,() => {
-                        // console.log(data)
-                    })
+                    this.patrol_list(1,() => {})
                 }
             },
             sectionNavGet(id,obj){
@@ -1296,7 +1212,7 @@
                     if(data.updatetime == null){
                         this.$message({
                           showClose: true,
-                          message:this.version == 0?'该路灯尚未设置':'The street lamp has not been set up',
+                          message:'The street lamp has not been set up',
                           type: 'warning'
                         });
                     }else{
@@ -1312,9 +1228,9 @@
                         this.inspectionSetupType = 'XQ';
                     }
                 }else{
-                    this.$confirm(this.version==0?'此操作将永久删除该灯控, 是否继续?':'This operation will permanently delete the light control and continue?', this.version==0?'提示':'prompt', {
-                      confirmButtonText: this.version==0?'确定':'determine',
-                      cancelButtonText: this.version==0?'取消':'cancel',
+                    this.$confirm('This operation will permanently delete the light control and continue?', 'prompt', {
+                      confirmButtonText:'determine',
+                      cancelButtonText:'cancel',
                       type: 'warning'
                     }).then(() => {
                       baseApi.ajax_post(
@@ -1340,7 +1256,7 @@
                     }).catch(() => {
                       this.$message({
                         type: 'info',
-                        message: this.version == 0?'已取消删除':'Canceled Del'
+                        message:'Canceled Del'
                       });          
                     });
                 }
@@ -1421,7 +1337,7 @@
                     }
                 }
                 // console.log(this.role)
-                if(this.role == '超级管理员'|| this.role == 'Super administrator'){
+                if(this.role == 'Super administrator'){
                     isImplement = true;
                 }
                 if(isImplement){
@@ -1429,7 +1345,7 @@
                 }else{
                     this.$message({
                       showClose: true,
-                      message:this.version==0?'无查看权限':'No view permissions',
+                      message:'No view permissions',
                       type: 'warning'
                     });
                 }
@@ -1654,8 +1570,8 @@
         }
         .screen-box{
             margin-bottom: 20px;
+            display: flex;
             .search_box{
-                float: left;
                 width:344px;
                 height:50px;line-height: 50px;
                 background:rgba(255,255,255,1);

+ 1 - 1
webConfig/src/views/dashboard.vue

@@ -673,7 +673,7 @@
                                 // },
                             },
                             visualMap: {
-                                color: ['rgba(166, 65, 7, 1)','rgba(224, 84, 5, 1)','rgba(230, 96, 20, 1)','rgba(252, 132, 64, 1)','rgba(252, 132, 64, 1)','rgba(255, 255, 255, 1)'],
+                                color: ['rgba(166, 65, 7, 1)','rgba(255, 255, 255, 1)'],
                                 pieces: [
                                     {gte: 10000, label: '≥10000 Light'},
                                     {gte: 2000, lte: 10000, label: '2000-10000 Lights'},

+ 236 - 214
webConfig/src/views/historicalData/historicalData.vue

@@ -6,24 +6,17 @@
             </div>
                 <side-bar-idcol class="side_bar_left" :sideBarList="projectNav" :projectId="projectId" :roadId="roadId" :sideBarListIsOpen="sideBarListIsOpen" :projectSelectFun="projectSelectFun" :roadSelectFun="roadSelectFun" :sideBarIsOn="sideBarIsOn" :sideBarType="sideBarType" :sideBarCompanyList="sideBarCompanyList"></side-bar-idcol>
             <div style="text-align: center;padding-top: 50px;" v-if="!projectId">
-                <p>{{version == 0?'当前公司下无项目':'There is no project under the current company'}}</p>
+                <p>{{'There is no project under the current company'}}</p>
             </div>
             <div class="wrap" v-if="projectId">
                 <div class="main_top clearfix">
                     <div class="search_box" v-if="reportType != 'report'">
-                        <el-input :placeholder="version==0?'- 输入关键词进行搜索':'- Enter keywords to search'" v-model="keyword" class="search" @change="search()">
-                            <template slot="prepend">{{version==0?'搜索':'Search'}}</template>
+                        <el-input :placeholder="'- Enter keywords to search'" v-model="keyword" class="search" @change="search()">
+                            <template slot="prepend">{{'Search'}}</template>
                         </el-input>
                     </div>
                     <div class="button_box">
-                        <el-select v-model="reportDropDownType" placeholder="" v-if="reportType == 'table' || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists'))">
-                           <!--  <el-option
-                              v-if="version == 0"
-                              v-for="item in reportList"
-                              :key="item.value"
-                              :label="item.label"
-                              :value="item.value">
-                            </el-option> -->
+                        <el-select v-model="reportDropDownType" placeholder="" v-if="reportType == 'table' || (reportType == 'report'&&reportNav=='Lists')">
                             <el-option
                               v-for="item in reportListEN"
                               :key="item.value"
@@ -31,42 +24,37 @@
                               :value="item.value">
                             </el-option>
                         </el-select>
-                        <div class="monthly_report" v-if="reportType == 'report'&&reportNav!='列表'&&reportNav!='Lists'">
+                        <div class="monthly_report" v-if="reportType == 'report'&&reportNav!='Lists'">
                             <p>
                                 <span>
                                     <span @click="reportDateType()">{{reportLabelType}} &nbsp;&nbsp;</span>
                                     <span @click="reportDate()"><span v-if="reportModelType == 'month'">{{month}}</span> {{year}}&nbsp;&nbsp;</span></span>
-                                <span @click="reportDataCK()">{{version==0?'查看':'See'}}<i class="el-icon-arrow-right"></i></span>
+                                <span @click="reportDataCK()">{{'See'}}<i class="el-icon-arrow-right"></i></span>
                                 <el-select v-model="reportModelType" ref="inputRef">
-                                    <el-option key="month" label="月报" value="month" v-if="version==0"></el-option>
-                                    <el-option key="year" label="年报" value="year" v-if="version==0"></el-option>
-                                    <el-option key="month" label="Month report" value="month" v-if="version==1"></el-option>
-                                    <el-option key="year" label="Year report" value="year" v-if="version==1"></el-option>
+                                    <el-option key="month" label="Month report" value="month"></el-option>
+                                    <el-option key="year" label="Year report" value="year"></el-option>
                                 </el-select>
                                 <el-date-picker
                                   v-if="reportModelType == 'month'"
                                   ref="inputMonthRef"
                                   v-model="monthReport"
                                   type="month"
-                                  :placeholder="version==0?'月':'Month'">
+                                  :placeholder="'Month'">
                                 </el-date-picker>
                                 <el-date-picker
                                   v-if="reportModelType == 'year'"
                                   ref="inputYearRef"
                                   v-model="yearReport"
                                   type="year"
-                                  :placeholder="version==0?'年':'Year'">
+                                  :placeholder="'Year'">
                                 </el-date-picker>
                             </p>
                         </div>
-                        <el-button round @click="exportExcel()" v-if="reportType == 'table'  || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists'))" v-loading="loading.exportExcel">{{version==0?'导出Excel':'Export Excel'}}</el-button>
-                        <el-button round icon="el-icon-refresh" @click="refresh()" v-if="reportType == 'table'">{{version == 0 ?'刷新' : 'Refresh'}}</el-button>
+                        <el-button round @click="exportExcel()" v-if="reportType == 'table'  || (reportType == 'report'&&reportNav=='Lists')" v-loading="loading.exportExcel">{{'Export Excel'}}</el-button>
+                        <el-button round icon="el-icon-refresh" @click="refresh()" v-if="reportType == 'table'">{{'Refresh'}}</el-button>
 
                     </div>
-                    <ul class="report_nav clearfix" :class="{'report_nav_en':version == 1}" v-if="reportType == 'report' && version == 0">
-                        <li @click="reportNavFun(item.name)" :class="{'report_nav_select':reportNav==item.name}" v-for="(item) in reportNavList" :key="item.name"><span>{{item.name}}</span></li>
-                    </ul>
-                    <ul class="report_nav clearfix" :class="{'report_nav_en':version == 1}" v-if="reportType == 'report' && version == 1">
+                    <ul class="report_nav clearfix" :class="{'report_nav_en':version == 0}" v-if="reportType == 'report'">
                         <li @click="reportNavFun(item.name)" :class="{'report_nav_select':reportNav==item.name}" v-for="(item) in reportNavListEN" :key="item.name"><span>{{item.name}}</span></li>
                     </ul>
                 </div>
@@ -86,34 +74,32 @@
                           type="selection"
                           min-width="50">
                         </el-table-column>
-                        <!-- <el-table-column align="center" :show-overflow-tooltip="true" :prop="item.prop" :label="item.label" :key="item.id" :width="item.prop=='updatetime'?160:''" v-for="(item,index) in tableList" v-if="version == 0">
-                        </el-table-column> -->
                         <el-table-column :show-overflow-tooltip="true" :prop="item.prop" :label="item.label" :key="item.id" :min-width="(item.label.length+1)*9+15" v-for="(item) in tableList">
                         </el-table-column>
                     </el-table>
-                    <div class="echarts_box" v-if="reportType == 'report' && (reportNav!='列表'&& reportNav!='Lists')">
+                    <div class="echarts_box" v-if="reportType == 'report' && (reportNav!='Lists')">
                         <div class="box">
                             <div class="title">
-                                <span class="sapn">{{version==0?'发电量报表':'Generation capacity Report'}}(kWh)</span>
+                                <span class="sapn">{{'Generation capacity Report'}}(kWh)</span>
                             </div>
                             <div class="echarts generation_capacity" v-loading="loading.generationCapacity"></div>
                         </div>
                         <div class="box">
                             <div class="title">
-                                <span class="span">{{version==0?'用电量报表':'Electricity consumption Report'}}(kWh)</span>
+                                <span class="span">{{'Electricity consumption Report'}}(kWh)</span>
                             </div>
                             <div class="echarts electricity_consumption" v-loading="loading.electricityConsumption"></div>
                         </div>
                         <div class="box">
                             <div class="title">
-                                <span class="span">{{version==0?'电流报表':'Current Report'}}(A)</span>
+                                <span class="span">{{'Current Report'}}(A)</span>
                                 <div class="right_box">
                                     <div class="nav_box">
                                         <div class="nav_li" :class="{'select_nav':currentType == 'max'}" @click="currentTypeFun('max')">
-                                            <span>{{version==0?'放电最大值':'Maximum'}}</span>
+                                            <span>{{'Maximum'}}</span>
                                         </div>
                                         <div class="nav_li" :class="{'select_nav':currentType == 'min'}" @click="currentTypeFun('min')">
-                                            <span>{{version==0?'充电最大值':'Minimum '}}</span>
+                                            <span>{{'Minimum '}}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -122,14 +108,14 @@
                         </div>
                         <div class="box">
                             <div class="title">
-                                <span class="span">{{version==0?'温度报表':'Temperature Report'}}(℃)</span>
+                                <span class="span">{{'Temperature Report'}}(℃)</span>
                                 <div class="right_box">
                                     <div class="nav_box">
                                         <div class="nav_li" :class="{'select_nav':temperType == 'max'}" @click="temperTypeFun('max')">
-                                            <span>{{version==0?'最大值':'Maximum'}}</span>
+                                            <span>{{'Maximum'}}</span>
                                         </div>
                                         <div class="nav_li" :class="{'select_nav':temperType == 'min'}" @click="temperTypeFun('min')">
-                                            <span>{{version==0?'最小值':'Minimum '}}</span>
+                                            <span>{{'Minimum '}}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -138,14 +124,14 @@
                         </div>
                         <div class="box">
                             <div class="title">
-                                <span class="span">{{version==0?'功率报表':'Power Report'}}(W)</span>
+                                <span class="span">{{'Power Report'}}(W)</span>
                                 <div class="right_box">
                                     <div class="nav_box">
                                         <div class="nav_li" :class="{'select_nav':capacityType == 'max'}" @click="capacityTypeFun('max')">
-                                            <span>{{version==0?'放电最大值':'Maximum'}}</span>
+                                            <span>{{'Maximum'}}</span>
                                         </div>
                                         <div class="nav_li" :class="{'select_nav':capacityType == 'min'}" @click="capacityTypeFun('min')">
-                                            <span>{{version==0?'充电最大值':'Minimum '}}</span>
+                                            <span>{{'Minimum '}}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -154,14 +140,14 @@
                         </div>
                         <div class="box">
                             <div class="title">
-                                <span class="span">{{version==0?'电压报表':'Voltage Report'}}(V)</span>
+                                <span class="span">{{'Voltage Report'}}(V)</span>
                                 <div class="right_box">
                                     <div class="nav_box">
                                         <div class="nav_li" :class="{'select_nav':voltageType == 'max'}" @click="voltageTypeFun('max')">
-                                            <span>{{version==0?'最大值':'Maximum'}}</span>
+                                            <span>{{'Maximum'}}</span>
                                         </div>
                                         <div class="nav_li" :class="{'select_nav':voltageType == 'min'}" @click="voltageTypeFun('min')">
-                                            <span>{{version==0?'最小值':'Minimum '}}</span>
+                                            <span>{{'Minimum '}}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -170,8 +156,7 @@
                         </div>
                     </div>
                     <div class="paging_box">
-                        <el-button type="primary" :class="{'report_bottton':reportType == 'report'}" icon="el-icon-check" round @click="reportTypeFun()" v-if="version == 0&&(reportType == 'table' || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists')))">{{reportTypeBt}}</el-button>
-                        <el-button type="primary" :class="{'report_bottton':reportType == 'report'}" icon="el-icon-check" round @click="reportTypeFun()" v-if="version == 1&&(reportType == 'table' || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists')))" style="width: 230px;">{{reportTypeBt}}</el-button>
+                        <el-button type="primary" :class="{'report_bottton':reportType == 'report'}" icon="el-icon-check" round @click="reportTypeFun()" v-if="reportType == 'table' || (reportType == 'report'&&reportNav=='Lists')" style="width: 230px;">{{reportTypeBt}}</el-button>
                         <el-pagination
                           v-if="reportType == 'table' || (reportType == 'report'&&(reportNav=='列表'||reportNav=='Lists'))"
                           @size-change="handleSizeChange"
@@ -278,58 +263,16 @@
         mounted(){
             var date = new Date();
             this.tableList = this.powerTableList;
-            if(this.version == 1){
-                this.reportNav = 'Lists';
-                this.reportLabelType = 'Month report';
-                this.reportTypeBt = 'See selected street lights';
-                this.tableList = this.powerTableListEN;
-            }
+            this.reportNav = 'Lists';
+            this.reportLabelType = 'Month report';
+            this.reportTypeBt = 'See selected street lights';
+            this.tableList = this.powerTableListEN;
+            
             this.month = date.toDateString().split(" ")[1];
             this.year = date.getFullYear();
             // this.getProjectNav('默认')
         },
         methods:{
-            /*侧栏列表*/
-            sideBarCompanyList(val,type,init){
-                baseApi.ajax_post(
-                    allUrl.project.projectNav,
-                    {
-                        username:this.username,
-                        client_key:this.client_key,
-                        token:this.token,
-                        type:type,
-                        keyword:val,
-                    },
-                    {},
-                    data =>{
-                        // console.log(data,'公司列表')
-                        console.log(init)
-                        if(init){
-                            for(let key in data.data){
-                                if(data.data.length>0){
-                                    this.projectId = data.data[0].id;
-                                    this.$set(data.data[0],'isOpen',true)
-                                }
-                                console.log(key)
-                                // if(data.data[key].sectionList.length>0){
-                                // }
-                            }
-
-                        }else{
-                            if(type == 0){
-                                for(let key in data.data){
-                                    if(data.data.length>0){
-                                    this.projectId = data.data[0].id;
-                                        this.$set(data.data[0],'isOpen',true)
-                                    }
-                                    console.log(key)
-                                }  
-                            }
-                        }
-                        this.projectNav = data.data;
-                    },
-                this)
-            },
             search(){
                 this.reportHome(this.currentPage,0,data => {
                     // console.log(data)
@@ -431,10 +374,7 @@
                         this.companyId = storage.getItem("companyId");
 
                         for(var key in data.data){
-                            this.$set(data.data[key],'type','展开')
-                            if(this.version == 1){
-                                this.$set(data.data[key],'type','Unfold')
-                            }
+                            this.$set(data.data[key],'type','Unfold')
                             if(data.data[key].project_list){
                                 for(var d of data.data[key].project_list){
                                     this.$set(d,'companyId',data.data[key].id)
@@ -442,10 +382,7 @@
                             }
                             if(this.companyId != 'false' && this.companyId){
                                 if(data.data[key].id == this.companyId){
-                                    this.$set(data.data[key],'type','收起')
-                                    if(this.version == 1){
-                                        this.$set(data.data[key],'type','Collapse')
-                                    }
+                                    this.$set(data.data[key],'type','Collapse')
                                     this.projectId = projectId;
                                     for(let obj of data.data[key].project_list){
                                         if(this.projectId == obj.id){
@@ -453,32 +390,21 @@
                                         }
                                     }
                                     this.reportHome(1,0,data => {
-                                        // console.log(data)
-                                        if(this.version == 0){
-                                            this.tableList = this.powerTableList;
-                                        }else{
-                                            this.tableList = this.powerTableListEN;
-                                        }
+                                        this.tableList = this.powerTableListEN;
                                         this.tableData = data.data.list;
                                     })
                                 }
                             }else{
                                 if(value == '默认'){
                                     if(key == 0){
-                                        this.$set(data.data[key],'type','收起')
-                                        if(this.version == 1){
-                                            this.$set(data.data[key],'type','Collapse')
-                                        }
+                                        this.$set(data.data[key],'type','Collapse')
                                         if(data.data[key].project_list.length > 0){
                                             this.companyId = data.data[key].project_list[0].companyId;
                                             this.projectId = data.data[key].project_list[0].id;
                                             this.projectName = data.data[key].project_list[0].projectname;
                                             this.reportHome(1,0,data => {
                                                 // console.log(data)
-                                                this.tableList = this.powerTableList;
-                                                if(this.version == 1){
-                                                    this.tableList = this.powerTableListEN;
-                                                }
+                                                this.tableList = this.powerTableListEN;
                                                 this.tableData = data.data.list;
                                             })
                                         }else{
@@ -491,70 +417,209 @@
                     },
                 this)
             },
+            /*侧栏列表*/
+            sideBarCompanyList(val,type,init){
+                baseApi.ajax_post(
+                    allUrl.project.projectNav,
+                    {
+                        username:this.username,
+                        client_key:this.client_key,
+                        token:this.token,
+                        type:type,
+                        keyword:val,
+                    },
+                    {},
+                    data =>{
+                        // console.log(data,'公司列表')
+                        console.log(init)
+                        if(init){
+                            if(type == 0){
+                                if(data.data.length>0){
+                                    this.projectId = data.data[0].id;
+                                    this.reportHome(1,0,data => {
+                                        this.tableList = this.powerTableListEN;
+                                        this.tableData = data.data.list;
+                                    })
+                                    for(let key in data.data){
+                                        this.$set(data.data[key],'isOpen',false)
+                                    }
+                                    this.$set(data.data[0],'isOpen',true)
+                                }
+
+                            }else{
+                                if(data.data.length>0){
+                                    for(let key in data.data){
+                                        this.$set(data.data[key],'isOpen',false)
+                                        if(data.data[0].projectList.length>0){
+                                            for(let d of data.data[0].projectList){
+                                                this.$set(d,'isOpen',true)
+                                            }
+                                        }
+                                    }
+                                    this.$set(data.data[0],'isOpen',true)
+                                    this.companyId = data.data[0].cId;
+                                    if(data.data[0].projectList.length>0){
+                                        this.projectId = data.data[0].projectList[0].id;
+                                        this.$set(data.data[0].projectList[0],'isOpen',true)
+                                        this.reportHome(1,0,data => {
+                                            this.tableList = this.powerTableListEN;
+                                            this.tableData = data.data.list;
+                                        })
+                                    }else{
+                                        this.projectId = null;
+                                        this.deviceTotalData = {
+                                            light_num:0,
+                                            online_num:0,
+                                            fault_count:0,
+                                            network_num:0
+                                        };
+                                        this.deviceList = [];
+                                        this.total = 0;
+                                        this.count = 0;
+                                        this.fault = 0;
+                                    }
+                                }else{
+                                    this.companyId = null
+                                    this.projectId = null;
+                                    this.deviceTotalData = {
+                                        light_num:0,
+                                        online_num:0,
+                                        fault_count:0,
+                                        network_num:0
+                                    };
+                                    this.deviceList = [];
+                                    this.total = 0;
+                                    this.count = 0;
+                                    this.fault = 0;
+                                }
+                            }
+                        }else{
+                            if(type == 0){
+                                if(data.data.length>0){
+                                    this.projectId = data.data[0].id;
+                                    this.reportHome(1,0,data => {
+                                        this.tableList = this.powerTableListEN;
+                                        this.tableData = data.data.list;
+                                    })
+                                    for(let key in data.data){
+                                        this.$set(data.data[key],'isOpen',false)
+                                    }
+                                    this.$set(data.data[0],'isOpen',true)
+                                }
+
+                            }else{
+                                if(data.data.length>0){
+                                    for(let key in data.data){
+                                        this.$set(data.data[key],'isOpen',false)
+                                        if(data.data[0].projectList.length>0){
+                                            for(let d of data.data[0].projectList){
+                                                this.$set(d,'isOpen',true)
+                                            }
+                                        }
+                                    }
+                                    this.$set(data.data[0],'isOpen',true)
+                                    this.companyId = data.data[0].cId;
+                                    if(data.data[0].projectList.length>0){
+                                        this.projectId = data.data[0].projectList[0].id;
+                                        this.$set(data.data[0].projectList[0],'isOpen',true)
+                                        this.reportHome(1,0,data => {
+                                            this.tableList = this.powerTableListEN;
+                                            this.tableData = data.data.list;
+                                        })
+                                    }else{
+                                        this.projectId = null;
+                                        this.projectId = null;
+                                        this.deviceTotalData = {
+                                            light_num:0,
+                                            online_num:0,
+                                            fault_count:0,
+                                            network_num:0
+                                        };
+                                        this.deviceList = [];
+                                        this.total = 0;
+                                        this.count = 0;
+                                        this.fault = 0;
+                                    }
+                                }else{
+                                    this.companyId = null;
+                                    this.projectId = null;
+                                    this.deviceTotalData = {
+                                        light_num:0,
+                                        online_num:0,
+                                        fault_count:0,
+                                        network_num:0
+                                    };
+                                    this.deviceList = [];
+                                    this.total = 0;
+                                    this.count = 0;
+                                    this.fault = 0;
+                                }
+                            }
+                        }
+                        this.projectNav = data.data;
+                    },
+                this)
+            },
             /*侧边栏打开关闭*/
             sideBarIsOn(){
                 if(this.reportType == 'table'||this.sideBarType=='on'){
                     if(this.sideBarType == 'on'){
                         this.sideBarType = 'off';
-                        if(document.getElementsByClassName('sideBar')[0]){
-                            document.getElementsByClassName('sideBar')[0].setAttribute('style', 'width: 0px ;transition:all 0.6s;');
-                        }
                     }else{
                         this.sideBarType = 'on';
-                        if(document.getElementsByClassName('sideBar')[0]){
-                            document.getElementsByClassName('sideBar')[0].setAttribute('style', 'width: 300px ;transition:all 0.6s;');
-                        }
                     }
                 }
             },
             /*侧边栏里展开收起*/
-            sideBarListIsOpen(data){
-                if(data.type == '收起'){
-                    data.type = '展开';   
-                }else if(data.type == '展开'){
-                    data.type = '收起';   
-                }
-                if(this.version == 1){
-                    if(data.type == 'Collapse'){
-                        data.type = 'Unfold';   
-                    }else{
-                        data.type = 'Collapse'; 
-                    }
+            sideBarListIsOpen(){
+                if(this.sideBarType == 'on'){
+                    this.sideBarType = 'off';
+                }else{
+                    this.sideBarType = 'on';
                 }
             },
-            projectSelectFun(data){
+            projectSelectFun(type,data,d){
                 var storage = window.localStorage;
                 storage.setItem('projectId',data.id);
-                storage.setItem('companyId',data.companyId);
-                this.companyId = data.companyId;
+                if(this.sideBarCompanyType != 0){
+                    if(d.cId != this.companyId){
+                        this.companyId = d.cId;
+                        storage.setItem('companyId',d.cId);
+                    }
+                }
                 this.projectId = data.id;
-                this.projectName = data.projectname;
-
-                if(!data.isOpen){
+                this.roadId = '';
+                if(!data.isOpen||this.projectId != data.id){
                     this.$set(data,'isOpen',true)
                     this.sectionNavGet(this.projectId,data)
                 }else{
                     this.$set(data,'isOpen',false)
+                    this.maplampListDW();
                 }
-                this.roadId = '';
 
                 this.reportHome(1,0,data => {
                     this.tableData = data.data.list;
                 })
-                console.log(data)
             },
-            roadSelectFun(data){
+            roadSelectFun(data,obj,d){
                 var storage = window.localStorage;
-                if(d.id != this.companyId){
-                    storage.setItem('companyId',d.id);
-                    this.companyId = d.id;
-                }
-                if(obj.id != this.projectId){
-                    storage.setItem('projectId',data.id);
-                    this.projectId = obj.id;
+                if(this.sideBarCompanyType == 0){
+                    if(data.id != this.projectId){
+                        storage.setItem('projectId',data.id);
+                        this.projectId = data.id;
+                    }
+                    this.roadId = obj.name;
+                }else{
+                    if(data.cId != this.companyId){
+                        this.companyId = data.cId;
+                        storage.setItem('companyId',data.cId);
+                    }
+                    if(obj.id != this.projectId){
+                        storage.setItem('projectId',obj.id);
+                        this.projectId = obj.id;
+                    }
+                    this.roadId = d.name;
                 }
-                this.roadId = data.value;
-
                 this.reportHome(1,0,data => {
                     // console.log(data)
                     this.tableData = data.data.list;
@@ -639,11 +704,7 @@
                         }
                     }else{
                         this.reportType = 'report';
-                        if(this.version == 1){
-                            this.reportTypeBt = 'return';
-                        }else{
-                            this.reportTypeBt = '返回';
-                        }
+                        this.reportTypeBt = 'return';
                         this.reportData(1,0,()=>{
                         })
                     }
@@ -654,53 +715,28 @@
                     this.currentPage = 1;
                     this.multipleSelectionHC = this.multipleSelection;
                     if(this.multipleSelection.length == 0){
-                        if(this.version == 0){
-                            this.$message({
-                              showClose: true,
-                              message:this.version==0?'请先勾选数据':'Please check the data first',
-                              type: 'warning'
-                            });
-                        }else{
-                            this.$message({
-                              showClose: true,
-                              message:'Please select the data first',
-                              type: 'warning'
-                            });
-                        }
+                        this.$message({
+                          showClose: true,
+                          message:'Please select the data first',
+                          type: 'warning'
+                        });
                     }else if(this.multipleSelection.length > 4){
-                        if(this.version == 0){
-                            this.$message({
-                              showClose: true,
-                              message:this.version==0?'最多勾选4个路灯':'A maximum of four Lamp',
-                              type: 'warning'
-                            });
-                        }else{
-                            this.$message({
-                              showClose: true,
-                              message:'Select up to four street lights',
-                              type: 'warning'
-                            });
-                        }
+                        this.$message({
+                          showClose: true,
+                          message:'Select up to four street lights',
+                          type: 'warning'
+                        });
                     }else{
                         this.reportData(1,0,()=>{
                             this.reportType = 'report';
-                            if(this.version == 1){
-                                this.reportTypeBt = 'return';
-                            }else{
-                                this.reportTypeBt = '返回';
-                            }
+                            this.reportTypeBt = 'return';
                         })
                     }
                 }else{
                     this.reportType = 'table';
-                    this.reportNav = '列表';
-                    if(this.version == 1){
-                        this.reportNav = 'Lists';
-                    }
+                    this.reportNav = 'Lists';
                     this.reportTypeBt = '查看选中路灯';
-                    if(this.version == 1){
-                        this.reportTypeBt = 'See selected street lights';
-                    }
+                    this.reportTypeBt = 'See selected street lights';
                     this.currentPage = 1;
                     this.reportHome(this.currentPage,0,data => {
                         this.tableData = data.data.list;
@@ -753,11 +789,7 @@
                                     this.tableData = data.data.list;
                                     this.currentPage = value;
                                     this.total = data.data.total*this.pageSize;
-                                    if(this.version == 1){
-                                        this.tableList = this[this.reportDropDownType+'TableListEN'];
-                                    }else{
-                                        this.tableList = this[this.reportDropDownType+'TableList'];
-                                    }
+                                    this.tableList = this[this.reportDropDownType+'TableListEN'];
                                     callback(data)
                                 }else{
                                     let obg = {
@@ -847,9 +879,9 @@
                     }else{
                         myChart = this.$echarts.init(document.getElementsByClassName(titleType)[0]);
                     }
-                    if(type == '柱状图' || type == 'Histogram'){
+                    if(type == 'Histogram'){
                         fun('bar')
-                    }else if(type == '折线图' || type == 'line chart'){
+                    }else if(type == 'line chart'){
                         fun('line')
                     }
                     function fun(type){
@@ -1152,11 +1184,7 @@
             reportDropDownType(curVal){
                 if(this.reportType == 'table'){
                     this.reportHome(1,0,data => {
-                        if(this.version == 1){
-                            this.tableList = this[curVal+'TableListEN'];
-                        }else{
-                            this.tableList = this[curVal+'TableList'];
-                        }
+                        this.tableList = this[curVal+'TableListEN'];
                         this.tableData = data.data.list; 
                     })
                 }else{
@@ -1166,17 +1194,11 @@
             },
             reportModelType(curVal){
                 if(curVal == 'month'){
-                    this.reportLabelType = '月报'
-                    if(this.version == 1){
-                        this.reportLabelType = 'Month report'
-                    }
+                    this.reportLabelType = 'Month report'
                     this.monthReport = this.yearReport;
                 }else{
                     this.yearReport = this.monthReport;
-                    this.reportLabelType = '年报'
-                    if(this.version == 1){
-                        this.reportLabelType = 'Year report'
-                    }
+                    this.reportLabelType = 'Year report'
                 }
                 this.loading.generationCapacity = true;
                 this.loading.electricityConsumption = true;
@@ -1277,8 +1299,9 @@
             margin-bottom: 29px;
             padding-top: 32px;
             position: relative;
+            display: flex;
+            justify-content: space-between;
             .search_box{
-                float: left;
                 width:345px;
                 height:50px;line-height: 50px;
                 background:rgba(255,255,255,1);
@@ -1301,7 +1324,6 @@
                 }
             }
             .button_box{
-                float: right;
                 .monthly_report{
                     display: inline-block;
                     font-size: 12px;

+ 95 - 257
webConfig/src/views/projectManagement.vue

@@ -264,8 +264,8 @@
                 </div>
                 <div class="div2">
                     <div>
-                        <span>{{version==0?'亮度':'brightness'}}: {{lampLightSlider}}%</span>
-                        <span @click="lampLightSliderSave()" v-loading="loading.lampLightSlider">{{version==0?'保存':'save'}}</span>
+                        <span>{{'brightness'}}: {{lampLightSlider}}%</span>
+                        <span @click="lampLightSliderSave()" v-loading="loading.lampLightSlider">{{'save'}}</span>
                     </div>
                     <div>
                         <el-slider v-model="lampLightSlider"></el-slider>
@@ -286,7 +286,7 @@
                       <el-form-item label="Project name:" prop="projectName" :rules="{required: true, message: 'Can not be empty', trigger: 'blur'}">
                         <el-input v-model="addItemData.projectName" @keyup.native="projectKeydown($event)"></el-input>
                       </el-form-item>
-                      <el-form-item label="Country:" prop="countryId" :rules="{required: true, message: version==0?'不能为空':'Not null', trigger: 'change'}">
+                      <el-form-item label="Country:" prop="countryId" :rules="{required: true, message: 'Not null', trigger: 'change'}">
                         <el-select v-model="addItemData.countryId" @change = "countryType" @keyup.native="projectKeydown($event)">
                             <el-option
                               v-for="item in countryList"
@@ -296,7 +296,7 @@
                             </el-option>
                         </el-select>
                       </el-form-item>
-                      <el-form-item label="City:" prop="cityId" :rules="{required: true, message: version==0?'不能为空':'Not null', trigger: 'change'}" v-if="cityList.length > 0">
+                      <el-form-item label="City:" prop="cityId" :rules="{required: true, message: 'Not null', trigger: 'change'}" v-if="cityList.length > 0">
                         <el-select v-model="addItemData.cityId" @change = "cityType" @keyup.native="projectKeydown($event)">
                             <el-option
                               v-for="item in cityList"
@@ -314,7 +314,7 @@
                       <el-form-item label="Number:" prop="projectNo" :rules="{required: true, message: 'Can not be empty', trigger: 'blur'}">
                         <el-input v-model="addItemData.projectNo" @keyup.native="projectKeydown($event)"></el-input>
                       </el-form-item>
-                      <el-form-item label="Province:" prop="provinceId" :rules="{required: true, message: version==0?'不能为空':'Not null', trigger: 'change'}" v-if="provinceList.length > 0">
+                      <el-form-item label="Province:" prop="provinceId" :rules="{required: true, message:'Not null', trigger: 'change'}" v-if="provinceList.length > 0">
                         <el-select v-model="addItemData.provinceId" @change = "provinceType" @keyup.native="projectKeydown($event)">
                             <el-option
                               v-for="item in provinceList"
@@ -327,7 +327,7 @@
                       <el-form-item label="Province:" v-if="provinceList.length == 0">
                         <el-input v-model="addItemData.provinceId" :disabled="true"></el-input>
                       </el-form-item>
-                      <el-form-item label="Area:" prop="areaId" :rules="{required: true, message: version==0?'不能为空':'Not null', trigger: 'change'}" v-if="areaList.length > 0">
+                      <el-form-item label="Area:" prop="areaId" :rules="{required: true, message:'Not null', trigger: 'change'}" v-if="areaList.length > 0">
                         <el-select v-model="addItemData.areaId" @keyup.native="projectKeydown($event)">
                             <el-option
                               v-for="item in areaList"
@@ -362,7 +362,6 @@
           <div class="dialog_foot">
             <el-button type="primary" @click="projectSaveFun()" v-loading="projectSaveLoading">{{projectButton}}</el-button>
             <span class="project_del" v-if="projectTitle == 'Edit Project'" @click="projectSaveDel()">{{'Delete Project'}}</span>
-            <!-- <span class="project_upgrade" v-if="(projectTitle == 'Edit Project')&&userid == '263'" @click="projectUpgrade()">{{version == 0 ?'固件升级' : 'Firmware update'}}</span> -->
           </div>
         </el-dialog>
         <!-- 字段管理弹框 -->
@@ -372,7 +371,7 @@
           :close-on-click-modal="false"
           class="field_box"
           width="95%">
-          <div class="clearfix" :class="{'fielf_box':(windowWidth < 1600 && version == 1)}">
+          <div class="clearfix" :class="{'fielf_box':(windowWidth < 1600 && version == 0)}">
             <div class="field_list" :class="{'field_select':item.select=='1'&&item.select}" v-for="(item) in fieldList" :key="item.fields" v-show="item.fields1 != 'lighteness'">
                 <div @click="fieldSelect(item)">
                     <img src="../img/projectManagement/select.png" height="12" width="12" v-if="item.select=='1'">
@@ -446,13 +445,12 @@
           width="95%">
             <el-dialog
               width="80%"
-              :title="version==0?'路灯定位':'Lamp positioning'"
+              :title="'Lamp positioning'"
               :visible.sync="amapWrapper"
               :close-on-click-modal="false"
               append-to-body>
               <div class="lampAmapWrapper_box">
-                    <el-input class="screenMap" v-model="screenMap" @keyup.native="screenMapKeyUp($event)" :placeholder="version
-                    ==0?'请输入关键字搜索':'Please enter the keyword search'" clearable>
+                    <el-input class="screenMap" v-model="screenMap" @keyup.native="screenMapKeyUp($event)" :placeholder="'Please enter the keyword search'" clearable>
                      <i slot="prefix" class="scree-icon el-icon-search" @click="screenMapChange(screenMap)"></i>
                     </el-input>
                   <div id="lampAmapWrapper">
@@ -569,7 +567,6 @@
             <div class="main_box">
                 <div class="screen_box" v-if="dataLSType == '1'">
                     <el-pagination
-                      @size-change="handleSizeChangeLS"
                       @current-change="handleCurrentChangeLS"
                       :current-page.sync="currentPageLS"
                       :page-size="16"
@@ -666,7 +663,7 @@
                                       start-placeholder=""
                                       end-placeholder="">
                                     </el-date-picker>
-                                    <el-button size="small" @click="screenDateFun()">{{version=='0'?'确定':'Determine'}}<i class="el-icon-arrow-right"></i></el-button>
+                                    <el-button size="small" @click="screenDateFun()">{{'Determine'}}<i class="el-icon-arrow-right"></i></el-button>
                                 </div>
                             </div>
                         </div>
@@ -675,7 +672,7 @@
                             <h3>{{'No data can be queried'}}</h3>
                         </div>
                         <div class="echarts_bottom echarts_line">
-                            <div class="echarts_bottom_text">{{version=='0'?'采样周期':'sampling period'}}: {{historyDataInfo.patrolinterval}}{{version=='0'?'分钟':'minutes'}}</div>
+                            <div class="echarts_bottom_text">{{'sampling period'}}: {{historyDataInfo.patrolinterval}}{{'minutes'}}</div>
                             <div class="data_type_nav">
                                 <div class="li" :class="{'select':dataLSType == '0'}" @click="dataLSTypeFun('0')">{{'Diagram'}}</div>
                                 <div class="li" :class="{'select':dataLSType == '1'}" @click="dataLSTypeFun('1')">{{'list'}}</div>
@@ -1147,8 +1144,14 @@
                 lampLatitude:0,
                 networkList:[],
                 /*灯控历史*/
-                historicalNavList:[{model:'lamp_info_log',label:'路灯'},{model:'system_info_log',label:'系统'},{model:'battery_info_log',label:'蓄电池'},{model:'solar_info_log',label:'太阳能板'},{model:'3',label:'充放电量'}],
-                historicalNavListEN:[{model:'lamp_info_log',label:'Lamp'},{model:'system_info_log',label:'system'},{model:'battery_info_log',label:'Battery'},{model:'solar_info_log',label:'Solar panels'},{model:'3',label:'Capacity'}],
+                // historicalNavList:[{model:'lamp_info_log',label:'路灯'},{model:'system_info_log',label:'系统'},{model:'battery_info_log',label:'蓄电池'},{model:'solar_info_log',label:'太阳能板'},{model:'3',label:'充放电量'}],
+                historicalNavListEN:[
+                    {model:'lamp_info_log',label:'Lamp'},
+                    // {model:'system_info_log',label:'system'},
+                    {model:'battery_info_log',label:'Battery'},
+                    {model:'solar_info_log',label:'Solar panels'},
+                    {model:'3',label:'Capacity'}
+                ],
                 historicalTableData:[],
                 historicalTableList:[],
                 screenDateLS:'',
@@ -1781,15 +1784,6 @@
                 remRatio:'remRatio',
                 sideBarCompanyType:'sideBarCompanyType',
             }),
-            historicalNavListFor(){
-                let list = [];
-                for(let item of this.historicalNavList){
-                    if(((item.model =='3'&&this.dataLSType=='0')||item.model !='3')&&((item.model =='system_info_log'&&this.dataLSType=='1')||item.model !='system_info_log')){
-                        list.push(item)
-                    }
-                }
-                return list
-            },
             historicalNavListENFor(){
                 let list = [];
                 for(let item of this.historicalNavListEN){
@@ -1857,6 +1851,13 @@
             // this.getProjectNav('init');
         },
         methods:{
+            tableRowClassName({row, rowIndex}) {
+                console.log(row)
+                if (rowIndex%2 == 0) {
+                  return 'row_bg';
+                }
+                return '';
+            },
             commandHide(val){
                 this.$nextTick(function(){
                     if($('.'+val)&&$('.'+val+' >.select').offset()){
@@ -2169,51 +2170,17 @@
             sideBarIsOn(){
                 if(this.sideBarType == 'on'){
                     this.sideBarType = 'off';
-                    // if(document.getElementsByClassName('side_bar_main')[0]){
-                    //     document.getElementsByClassName('side_bar_main')[0].setAttribute('style', 'width: 0px;');
-                    // }
                 }else{
                     this.sideBarType = 'on';
-                    // if(document.getElementsByClassName('side_bar_main')[0]){
-                    //     document.getElementsByClassName('side_bar_main')[0].setAttribute('style', 'width: 20rem;');
-                    // }
-
-                    // let this_ = this;
-                    // if(this.projectId != 0){
-                    //     $('.side_bar_main .sideBar_box').animate({scrollTop: $('#sideBar_projectId_'+this_.projectId).offset().top - 250 + $('.side_bar_main .sideBar_box').scrollTop()})
-                    // }
-                }
-
-                fun(this.version)
-                function fun(version){
-                    if($(".screenEN").length != 0){
-                        if(version == 0){
-                            $(".screenEN input").attr('placeholder','输入关键字按下回车键搜索');
-                        }else{
-                            $(".screenEN input").attr('placeholder','Enter keywords Search by Enter');
-                        }
-                    }else{
-                        setTimeout(function(){
-                            fun(version)
-                        },100)
-                    }
                 }
             },
             /*侧边栏里展开收起*/
             sideBarListIsOpen(data){
-                console.log(data)
-                // var storage = window.localStorage;
-                // this.companyId = data.cId;
-                // storage.setItem('companyId',data.cId);
-                // storage.setItem('projectId',false);
-                // this.projectId = '';
-                // this.roadId = '';
                 if(data.isOpen){
                     data.isOpen = false;   
                 }else{
                     data.isOpen = true;   
                 }
-                // this.getLightList(this.currentPage);
             },
             projectAll(){
                 this.projectId = 0;
@@ -2245,10 +2212,6 @@
             roadSelectFun(data,obj,d){
                 var storage = window.localStorage;
                 if(this.sideBarCompanyType == 0){
-                    // if(data.cId != this.companyId){
-                    //     this.companyId = d.cId;
-                    //     storage.setItem('companyId',d.cId);
-                    // }
                     if(data.id != this.projectId){
                         storage.setItem('projectId',data.id);
                         this.projectId = data.id;
@@ -2267,11 +2230,6 @@
                 }
                 this.getLightList(this.currentPage);
                 this.getProjectData(this.projectId)
-            
-                // if(d.id != this.companyId){
-                //     storage.setItem('companyId',d.id);
-                //     this.companyId = d.id;
-                // }
             },
             /*获取表格字段*/
             getFields(){
@@ -2310,19 +2268,11 @@
             fieldSelect(data){
                 if(data.select == '1'){
                     if(data.fields1 == 'number' || data.fields1 == 'address' || data.fields1 == 'networkname' || data.fields1 == 'section'){
-                        if(this.version == 0){
-                            this.$message({
-                              showClose: true,
-                              message:'该字段不能取消显示',
-                              type: 'warning'
-                            });
-                        }else{
-                            this.$message({
-                              showClose: true,
-                              message:'This field cannot be undisplayed',
-                              type: 'warning'
-                            });
-                        }
+                        this.$message({
+                          showClose: true,
+                          message:'This field cannot be undisplayed',
+                          type: 'warning'
+                        });
                     }else{
                         data.select = '0'
                     }
@@ -2337,16 +2287,6 @@
                 this.tableConfig.prop1 = [];
                 this.tableConfig.width = [];
                 for(var d of this.fieldList){
-                    // if(d.select == '1' && this.version == 0){
-                    //     this.$set(this.tableConfig.label,this.tableConfig.label.length,d.name);
-                    //     this.$set(this.tableConfig.prop1,this.tableConfig.prop1.length,d.field);
-                    //     this.$set(this.tableConfig.prop,this.tableConfig.prop.length,d.fields1);
-                    //     if(d.fields1 == 'updatetime'){
-                    //         this.$set(this.tableConfig.width,this.tableConfig.width.length,160);
-                    //     }else{
-                    //         this.$set(this.tableConfig.width,this.tableConfig.width.length,(d.name.length+1)*14+20);
-                    //     }
-                    // }
                     if(d.select == '1'){
                         this.$set(this.tableConfig.label,this.tableConfig.label.length,d.enname);
                         this.$set(this.tableConfig.prop1,this.tableConfig.prop1.length,d.field);
@@ -2622,6 +2562,9 @@
                 this.currentPage = val;
                 this.getLightList(this.currentPage);
             },
+            handleCurrentChangeLS(val) {
+                this.lampcontrolHistorylist(val);
+            },
             seeFun(data){
                 this.detailsDialog = true;
                 this.detailsFieldList = [];
@@ -2786,17 +2729,10 @@
                     },
                   this)
                 }).catch(() => {
-                  if(this.version == 0){
-                      this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                      });          
-                    }else{
-                      this.$message({
+                    this.$message({
                         type: 'info',
                         message: 'Undeleted'
-                      });   
-                  }
+                    });
                 });
             },
             projectKeydown(e){
@@ -3000,7 +2936,7 @@
                 if(isNaN(this.lampLongitude) || isNaN(this.lampLatitude) || this.lampLongitude>180||this.lampLongitude<-180||this.lampLatitude>90||this.lampLatitude<-90){
                     this.$message({
                       showClose: true,
-                      message: this.version==0?'请输入正确的经纬度':'Please enter the correct latitude and longitude',
+                      message: 'Please enter the correct latitude and longitude',
                       type: 'warning'
                     });
                 }else{
@@ -3129,7 +3065,7 @@
                                     this_.mapDWIsTrue = true;
                                     this_.$message({
                                       showClose: true,
-                                      message: this_.version==0?'无法识别,请更改搜索内容':'Unrecognized, please change the search content',
+                                      message: 'Unrecognized, please change the search content',
                                       type: 'warning'
                                     });
                                 }
@@ -3234,43 +3170,26 @@
                 let this_ = this;
                 // console.log(val)
                 //地理编码,返回地理编码结果
-                if(this.version == 0){
-                    this_.geocoder.getLocation(val, function(status, result) {
-                        console.log(status, result)
-                        if (status === 'complete' && result.info === 'OK') {
-                            if(result.geocodes.length >0){
-                                this_.positionPicker.start([result.geocodes[0].location.lng,result.geocodes[0].location.lat])
-                            }
-                        }else{
-                            this_.$message({
-                              showClose: true,
-                              message:'无法识别,请更改搜索内容',
-                              type: 'warning'
-                            });
-                        }
-                    });
-                }else{
-                    this_.geocoder.geocode({address:val},function(status, result){
-                        // console.log(status, result)
-                        let lng = 0;
-                        let lat = 0;
-                        if(result === 'OK'){
-                            lng = status[0].geometry.location.lng();
-                            lat = status[0].geometry.location.lat();
-                            console.log(lng,lat)
-                            this_.positionPicker.setPosition(new google.maps.LatLng(lat,lng))
-                            this_.map.setCenter(new google.maps.LatLng(lat,lng));
-                            this_.mapDWIsTrue = false;
-                        }else{
-                            this_.$message({
-                              showClose: true,
-                              message:'Unrecognized, please change the search content',
-                              type: 'warning'
-                            });
-                            this_.mapDWIsTrue = true;
-                        }
-                    })
-                }
+                this_.geocoder.geocode({address:val},function(status, result){
+                    // console.log(status, result)
+                    let lng = 0;
+                    let lat = 0;
+                    if(result === 'OK'){
+                        lng = status[0].geometry.location.lng();
+                        lat = status[0].geometry.location.lat();
+                        console.log(lng,lat)
+                        this_.positionPicker.setPosition(new google.maps.LatLng(lat,lng))
+                        this_.map.setCenter(new google.maps.LatLng(lat,lng));
+                        this_.mapDWIsTrue = false;
+                    }else{
+                        this_.$message({
+                          showClose: true,
+                          message:'Unrecognized, please change the search content',
+                          type: 'warning'
+                        });
+                        this_.mapDWIsTrue = true;
+                    }
+                })
             },
             gisFun(obj,type){
                 this.lampId = obj.id;
@@ -3291,7 +3210,7 @@
                 }else{
                     this.$message({
                       showClose: true,
-                      message:this.version==0?'无查看权限':'No view permissions',
+                      message:'No view permissions',
                       type: 'warning'
                     });
                 }
@@ -3307,9 +3226,9 @@
                 this.currentPageLS = 1;
                 this.historicalNavSelect = 'lamp_info_log';
                 if(data.loadtype == '1'){
-                    this.historicalNavList[0].label = this.version =='0'?'捕虫器':'Insect trap';
+                    this.historicalNavListEN[0].label = 'Insect trap';
                 }else{
-                    this.historicalNavList[0].label = this.version =='0'?'路灯':'lamp';
+                    this.historicalNavListEN[0].label = 'lamp';
                 }
                 this.historicalTableList = JSON.parse(JSON.stringify(this[this.historicalNavSelect+'TableListEN']));
                 
@@ -3377,30 +3296,7 @@
                         this.historicalNavSelect = 'lamp_info_log';
                     }
                     this.currentPageLS = 1;
-                    if(this.version == 0){
-                        this.historicalTableList = JSON.parse(JSON.stringify(this[this.historicalNavSelect+'TableList']));
-                        if(this.lampLoadtype == '1'){
-                            for(let key in this.historicalTableList){
-                                if(this.historicalTableList[key].prop == 'lighteness'){
-                                    this.historicalTableList.splice(key,1)
-                                }
-                                if(this.historicalTableList[key].prop == 'lampstatus'){
-                                    this.historicalTableList[key].label = '捕虫器状态'
-                                }
-                                if(this.historicalTableList[key].prop == 'lampvoltage'){
-                                    this.historicalTableList[key].label = '捕虫器电压'
-                                }
-                                if(this.historicalTableList[key].prop == 'lampcurrent'){
-                                    this.historicalTableList[key].label = '捕虫器电流'
-                                }
-                                if(this.historicalTableList[key].prop == 'lamppower'){
-                                    this.historicalTableList[key].label = '捕虫器功率'
-                                }
-                            }
-                        }
-                    }else{
-                        this.historicalTableList = this[this.historicalNavSelect+'TableListEN'];
-                    }
+                    this.historicalTableList = this[this.historicalNavSelect+'TableListEN'];
                     this.lampcontrolHistorylist(1,0);
                 }
             },
@@ -3882,17 +3778,9 @@
                 this)
                 this.loadParametersData = this.loadParametersDataOld;
                 if(data.loadtype == '1'){
-                    if(this.version == '0'){
-                        this.loadParametersList = this.catcherloadParametersListOld;
-                    }else{
-                        this.loadParametersListEN = this.catcherloadParametersListENOld
-                    }
+                    this.loadParametersListEN = this.catcherloadParametersListENOld
                 }else{
-                    if(this.version == '0'){
-                        this.loadParametersList = this.loadParametersListOld;
-                    }else{
-                        this.loadParametersListEN = this.loadParametersListENOld
-                    }
+                    this.loadParametersListEN = this.loadParametersListENOld
                 }
                 for(let key in this.loadParametersData){
                     this.loadParametersData[key] = '';
@@ -4006,19 +3894,11 @@
                         }
                         if(data.data.status == '2'){
                             if(data.data.code == '0000'){
-                                if(this_.version == 0){
-                                    this_.$notify({
-                                      title: '操作成功',
-                                      message: '路灯 '+data.data.data.number,
-                                      type: 'success'
-                                    });
-                                }else{
-                                    this_.$notify({
-                                      title: 'Successful operation',
-                                      message: 'Lamp '+data.data.data.number,
-                                      type: 'success'
-                                    });
-                                }
+                                this_.$notify({
+                                    title: 'Successful operation',
+                                    message: 'Lamp '+data.data.data.number,
+                                    type: 'success'
+                                });
                                 this_.giveCommandJournal.push({
                                     time:this_.GMTToZero2(new Date()),
                                     text:data.data.msg,
@@ -4035,17 +3915,10 @@
                                     websocket.close();
                                 }
                             }else{
-                                if(this_.version == 0){
-                                    this_.$notify.error({
-                                      title: '操作失败',
-                                      message: '路灯 '+data.data.data.number+':'+data.data.msg
-                                    });
-                                }else{
-                                    this_.$notify.error({
-                                      title: 'Operation failed',
-                                      message: 'Lamp '+data.data.data.number+':'+data.data.msg
-                                    });
-                                }
+                                this_.$notify.error({
+                                  title: 'Operation failed',
+                                  message: 'Lamp '+data.data.data.number+':'+data.data.msg
+                                });
                                 this_.giveCommandJournal.push({
                                     time:this_.GMTToZero2(new Date()),
                                     text:data.data.msg,
@@ -4114,11 +3987,7 @@
                     let parameter = {};
                     let obj = [];
                     let objData = {};
-                    if(this.version == 0){
-                        obj = this['batteryParametersList'+this.batteryParametersData.batterytype]
-                    }else if(this.version == 1){
-                        obj = this['batteryParametersList'+this.batteryParametersData.batterytype+'EN']
-                    }
+                    obj = this['batteryParametersList'+this.batteryParametersData.batterytype+'EN']
                     for(let d of obj){
                         console.log(d.model)
                         parameter[d.model] = this.batteryParametersData[d.model]
@@ -4237,19 +4106,11 @@
                         }
                         if(data.data.status == '2'){
                             if(data.data.code == '0000'){
-                                if(this_.version == 0){
-                                    this_.$notify({
-                                      title: '操作成功',
-                                      message: '路灯 '+data.data.data.number,
-                                      type: 'success'
-                                    });
-                                }else{
-                                    this_.$notify({
-                                      title: 'Successful operation',
-                                      message: 'Lamp '+data.data.data.number,
-                                      type: 'success'
-                                    });
-                                }
+                                this_.$notify({
+                                    title: 'Successful operation',
+                                    message: 'Lamp '+data.data.data.number,
+                                    type: 'success'
+                                });
                                 this_.giveCommandJournal.push({
                                     time:this_.GMTToZero2(new Date()),
                                     text:data.data.msg,
@@ -4266,17 +4127,10 @@
                                     websocket.close();
                                 }
                             }else{
-                                if(this_.version == 0){
-                                    this_.$notify.error({
-                                      title: '操作失败',
-                                      message: '路灯 '+data.data.data.number+':'+data.data.msg
-                                    });
-                                }else{
-                                    this_.$notify.error({
-                                      title: 'Operation failed',
-                                      message: 'Lamp '+data.data.data.number+':'+data.data.msg
-                                    });
-                                }
+                                this_.$notify.error({
+                                    title: 'Operation failed',
+                                    message: 'Lamp '+data.data.data.number+':'+data.data.msg
+                                });
                                 this_.giveCommandJournal.push({
                                     time:this_.GMTToZero2(new Date()),
                                     text:data.data.msg,
@@ -4323,19 +4177,11 @@
                             if(callback){
                                 callback(data)
                             }
-                            if(this.version == 0){
-                                this.$message({
-                                  showClose: true,
-                                  message:'获取负载参数成功',
-                                  type: 'success'
-                                });
-                            }else{
-                                this.$message({
-                                  showClose: true,
-                                  message:'Get load parameters successfully',
-                                  type: 'success'
-                                });
-                            }
+                            this.$message({
+                                showClose: true,
+                                message:'Get load parameters successfully',
+                                type: 'success'
+                            });
                             data.data.first_light_time = new Date('2018-08-06 '+data.data.first_light_time);
                             data.data.second_light_time = new Date('2018-08-06 '+data.data.second_light_time);
                             data.data.third_light_time = new Date('2018-08-06 '+data.data.third_light_time);
@@ -4400,19 +4246,11 @@
                         if(callback){
                             callback(data)
                         }
-                        if(this.version == 0){
-                            this.$message({
-                              showClose: true,
-                              message:'获取蓄电池参数成功',
-                              type: 'success'
-                            });
-                        }else{
-                            this.$message({
-                              showClose: true,
-                              message:'Get battery parameters successfully',
-                              type: 'success'
-                            });
-                        }
+                        this.$message({
+                            showClose: true,
+                            message:'Get battery parameters successfully',
+                            type: 'success'
+                        });
                         this.batteryParametersDataHC = Object.assign({},data.data)
                         for(let key in data.data){
                             this.batteryParametersData[key] = data.data[key]
@@ -4965,13 +4803,13 @@
                             height:1.5rem;
                             position: relative;
                             cursor: pointer;
+                            border-radius:0.75rem;
+                            overflow: hidden;
                             .progress_inner{
                                 height:1.5rem;;line-height:1.5rem;
                                 background:linear-gradient(134deg,rgba(252,169,64,1) 0%,rgba(252,132,64,1) 100%);
-                                border-radius:0.75rem;
                             }
                             .text{
-                                border-radius:0.75rem;
                                 background:rgba(252,132,64,0.1);
                                 position: absolute;
                                 top: 0;left:0;