页面调整

src/layout/header-aside/layout.vue

@@ -137,8 +137,9 @@
         </div>
       </div>
       <div style="z-index:9999!important;" class="mfooter">
-        Copyright (C) 2009-2010. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1
-        电话：86-028-689XXXX 传真：86-028-6893XXXX
+        <!-- Copyright (C) 2009-2010. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1
+        电话：86-028-689XXXX 传真：86-028-6893XXXX -->
+        Copyright (C) 2019-2022. 四川旷谷信息工程有限公司
       </div>
     </div>
   </div>

src/pages/access/point/index.vue

@@ -673,8 +673,9 @@ export default {
       }).then(data => {
         if (data && data.code === 0) {
           this.station = data.bean
-          this.mapList = data.bean.mapList
-          if (this.mapList && this.treeData && this.treeData.length > 0) {
+          // this.mapList = data.bean.mapList
+          if (this.treeData && this.treeData.length > 0) {
+            this.mapList = this.treeData
             this.mapList.forEach(element => {
               element.readPath = this.urlPath + element.filePath
             })

src/pages/access/point/query-detail.vue

@@ -81,8 +81,8 @@
     </div>
     <div class='info-title'>资源点信息查询</div>
     <div class='info-form'>
-      <el-button type="primary" style='margin-left:30px;' @click="dialogList1">出入记录查询</el-button>
-      <el-button type="primary" @click="dialogList2">历史指令查询</el-button>
+      //- <el-button type="primary" style='margin-left:30px;' @click="dialogList1">出入记录查询</el-button>
+      <el-button v-if="isAuth('access:point:history')" type="primary" @click="dialogList2" style="margin:3px 0px 3px 90px;" size="small">历史指令查询</el-button>
     </div>
     <el-dialog :title="dataForm.name" width="1200px" :close-on-click-modal='false' :visible.sync='visible1' :modal-append-to-body='false'>
       div(slot='title')

src/pages/inspect/point/index.vue

@@ -601,8 +601,9 @@ export default {
       }).then(data => {
         if (data && data.code === 0) {
           this.station = data.bean
-          this.mapList = data.bean.mapList
-          if (this.mapList && this.treeData && this.treeData.length > 0) {
+          // this.mapList = data.bean.mapList
+          if (this.treeData && this.treeData.length > 0) {
+            this.mapList = this.treeData
             this.mapList.forEach(element => {
               element.readPath = this.urlPath + element.filePath
             })

src/pages/login/page.vue

@@ -29,7 +29,8 @@
                     el-col(:span='24' )
                       el-checkbox(v-model="formLogin.remember" checked) 记住密码
                   el-button(size="default" @click="submit" class='login-btn' :loading="loginLoad") 立即登录
-      div.lFooter() Copyright (C) 2009-2010. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1 电话：86-028-6893XXXX 传真：86-028-6893XXXX
+      //- div.lFooter() Copyright (C) 2009-2010. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1 电话：86-028-6893XXXX 传真：86-028-6893XXXX
+      div.lFooter() Copyright (C) 2019-2022. 四川旷谷信息工程有限公司
 </template>
 
 <script>

src/pages/ol/demo/index.vue

@@ -917,8 +917,9 @@ export default {
         .then((data) => {
           if (data && data.code === 0) {
             this.station = data.bean
-            this.mapList = data.bean.mapList
-            if (this.mapList && this.treeData) {
+            // this.mapList = data.bean.mapList
+            if (this.treeData && this.treeData.length > 0) {
+              this.mapList = this.treeData[0].children
               this.mapList.forEach(element => {
                 element.readPath = this.urlPath + element.filePath
               })

src/pages/ol/demo/no-query-detail.vue

@@ -98,7 +98,7 @@
         <p class="leftP">资源点编码&nbsp;:&nbsp;&nbsp;{{dataForm.code}}</p>
       </div>
       <div class="quDetailM">
-        <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;{{dataForm.status==1?'正常':'异常'}}</p>
+        <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;{{dataForm.byx2==1?'在线':'离线'}}</p>
       </div>
       <div class="quDetailM">
         <p class="leftP">部署位置&nbsp;:&nbsp;&nbsp;

src/pages/ol/demo/query-detail.vue

@@ -90,7 +90,7 @@
         <p class="leftP">资源点编码&nbsp;:&nbsp;&nbsp;{{dataForm.code}}</p>
       </div>
       <div class="quDetailM">
-        <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;{{dataForm.status==1?'正常':'异常'}}</p>
+        <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;{{dataForm.byx2==1?'在线':'离线'}}</p>
       </div>
       <div class="quDetailM">
         <p class="leftP">部署位置&nbsp;:&nbsp;&nbsp;

src/pages/routes/sys/takeover/index.vue

@@ -41,7 +41,7 @@
 
             template( slot='runStatus' slot-scope="scope")
                 span(v-if="scope.row.runStatus == 1") 正常运行
-                span(v-if="scope.row.runStatus == 2") 线路接管
+                span(v-if="scope.row.runStatus == 2") 总控接管
                 span(v-if="scope.row.runStatus == 3") 路网接管
 
             //- 操作项