Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into smswb_dev

yunxing 4 years ago
parent
commit
741c120778

+ 3 - 3
public/g.js

@@ -477,7 +477,7 @@ function (_super) {
 
     if (_util_util__WEBPACK_IMPORTED_MODULE_3__["isBrowser"] && el) {
       // 直接设置样式,不等待鼠标移动时再设置
-      el.style.cursor = cursor;
+      // el.style.cursor = cursor;
     }
   }; // 实现接口
 
@@ -2920,7 +2920,7 @@ function () {
     if (shape && !shape.get('destroyed')) {
       var canvas = this.canvas;
       var el = canvas.get('el');
-      el.style.cursor = shape.attr('cursor') || canvas.get('cursor');
+      // el.style.cursor = shape.attr('cursor') || canvas.get('cursor');
     }
   }; // 记录下点击的位置、图形,便于拖拽事件、click 事件的判定
 
@@ -2950,7 +2950,7 @@ function () {
 
 
         if (!toShape || toShape.get('destroyed')) {
-          el.style.cursor = this.canvas.get('cursor');
+          // el.style.cursor = this.canvas.get('cursor');
         }
       }
 

+ 24 - 0
src/App.vue

@@ -276,6 +276,22 @@ body ::-webkit-scrollbar-thumb:vertical:hover {
         background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
     }
 }
+.el-dialog__header {
+    padding: 16px 24px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+}
+.el-dialog__headerbtn .el-dialog__close {
+    color: #fff;
+}
+
+.el-dialog__title {
+    font-size: 16px;
+    padding-right: 6px;
+    padding-left: 24px;
+    font-weight: bold;
+    color: #fff;
+    font-weight: normal;
+}
 .clearfix::after {
     content: '.';
     display: block;
@@ -335,6 +351,14 @@ body {
         line-height: 26px;
         width: 8%;
     }
+    .el-table__row{
+        cursor: pointer;
+    }
+    .el-dialog__wrapper{
+        .el-table__row{
+            cursor: default;
+        }
+    }
 }
 .el-dialog__header {
     border-bottom: 1px solid rgba(239, 240, 241, 1);

+ 14 - 12
src/components/Rotation/src/rotation.vue

@@ -5,28 +5,28 @@
 */
 <template>
     <div :class='[type==1?"rotationFull":(type==3?"rotationFullYlt":"rotation")]' class='wanda-rotation'>
-        <div v-if='rotationImg.length==1&&size=="height"' class='rotationConType'>
-            <img :src='rotationImg[0].url' alt />
+        <div v-if='rotationImgs.length==1&&size=="height"' class='rotationConType'>
+            <img :src='rotationImgs[0].url' alt />
         </div>
-        <div v-else-if='rotationImg.length==1&&size=="width"' class='rotationCon'>
-            <img :src='rotationImg[0].url' alt />
+        <div v-else-if='rotationImgs.length==1&&size=="width"' class='rotationCon'>
+            <img :src='rotationImgs[0].url' alt />
         </div>
         <!-- <el-carousel v-else trigger='click' style='height:100%;width:100%' :interval='5000' arrow='always' @change='changePic' :loop='false'>
-            <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
+            <el-carousel-item v-for='(item,index) in rotationImgs' :key='index'>
                 <img :src='item.url' alt />
             </el-carousel-item>
         </el-carousel>-->
         <!-- 不显示指示器 -->
-        <!-- :indicator-position='rotationImg.length == 1 ? "none":""' -->
+        <!-- :indicator-position='rotationImgs.length == 1 ? "none":""' -->
         <el-carousel
             v-else-if='type!="5"'
             style='height:100%;width:100%'
             :interval='5000'
             indicator-position='none'
-            :arrow='rotationImg.length == 1 ? "never":"always"'
+            :arrow='rotationImgs.length == 1 ? "never":"always"'
             @change='changePic'
         >
-            <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
+            <el-carousel-item v-for='(item,index) in rotationImgs' :key='index'>
                 <img :src='item.url' alt style='  width: 100%; height: 100%;object-fit: container;' />
             </el-carousel-item>
         </el-carousel>
@@ -35,16 +35,17 @@
             style='height:100%;width:100%'
             :interval='5000'
             indicator-position='none'
-            :arrow='rotationImg.length == 1 ? "never":"always"'
+            :arrow='rotationImgs.length == 1 ? "never":"always"'
             @change='changePic'
         >
-            <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
+            <el-carousel-item v-for='(item,index) in rotationImgs' :key='index'>
                 <img :src='item.url' alt style='  width: 100%; height: 100%;object-fit:contain' />
             </el-carousel-item>
         </el-carousel>
     </div>
 </template>
 <script>
+import { cloneDeep } from 'lodash'
 export default {
     name: 'Rotation',
     props: ['rotationImg', 'type', 'size'],
@@ -80,8 +81,9 @@ export default {
     },
     // 解决两张图片时,轮播顺序反向
     created() {
-        if (this.rotationImg && this.rotationImg.length === 2) {
-            this.rotationImg = [...this.rotationImg, ...this.rotationImg]
+        this.rotationImgs = cloneDeep(this.rotationImg)
+        if (this.rotationImgs && this.rotationImgs.length === 2) {
+            this.rotationImgs = [...this.rotationImgs, ...this.rotationImgs]
         }
     },
     mounted() {

+ 1 - 1
src/components/floorList.vue

@@ -54,7 +54,7 @@ export default {
             startTime: '',
             endTime: '',
             floorObj2: {},
-            showNumber: 8, //需要展示的楼层数   //TODO:
+            showNumber: 8, //需要展示的楼层数
             height: 39, //一个楼层的高度
             currIndex: 0, //当前楼层在 楼层数组中的下标,上下箭头使用
             conHeight: 0, // floor-out 的高度

+ 1 - 1
src/utils/format.js

@@ -6,7 +6,7 @@ const formatter = (date) => {
     return moment.unix(date / 1000).format("YYYY.MM.DD")
 }
 const formatterTime = (date) => {
-    return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm")
+    return moment.unix(date / 1000).format("YYYY.MM.DD HH:mm")
 }
 const number_format = (number, decimals, dec_point, thousands_sep) => {
     /*

+ 4 - 6
src/utils/ganttChart/GanttChart_day.js

@@ -382,15 +382,13 @@ GanttChartDay.prototype.handleClick = function(task, flag, ev) {
 GanttChartDay.prototype.statusColor = function(task) {
     switch (task.statusType) {
         case 1:
-            return ['#e7e9ea', '#c3c7cb']
+            return ['#E7E9EA', '#C3C7CB']
         case 2:
-            return ['#dee9fe', '#5b8ff9']
+            return ['#FBCE99', '#F58300']
         case 3:
-            return ['#fbce99', '#f58300']
-        case 4:
-            return ['#fbb8b5', '#f54e45']
+            return ['#FBB8B5', '#F54E45']
         default:
-            return ['#f54e45', '#fbb8b5']
+            return ['#FBB8B5', '#F54E45']
     }
 }
 

+ 6 - 6
src/utils/ganttChart/GanttChart_month.js

@@ -376,15 +376,13 @@ GanttChartMonth.prototype.handleClick = function(task, flag, ev) {
 GanttChartMonth.prototype.statusColor = function(task) {
     switch (task.statusType) {
         case 1:
-            return ['#e7e9ea', '#c3c7cb']
+            return ['#E7E9EA', '#C3C7CB']
         case 2:
-            return ['#dee9fe', '#5b8ff9']
+            return ['#FBCE99', '#F58300']
         case 3:
-            return ['#fbce99', '#f58300']
-        case 4:
-            return ['#fbb8b5', '#f54e45']
+            return ['#FBB8B5', '#F54E45']
         default:
-            return ['#fbb8b5', '#f54e45']
+            return ['#FBB8B5', '#F54E45']
     }
 }
 
@@ -552,9 +550,11 @@ GanttChartMonth.prototype.drawTasks = function() {
                             rectEl._pdata = _taskItem
                             _taskItem._rectEl = rectEl
                             rectEl.on('mouseover', (ev) => {
+                                document.querySelector('#ganttContainer>canvas').style.cursor = 'pointer';
                                 // this.handleClick(ev.target, 'enter', ev)
                             })
                             rectEl.on('mouseleave', (ev) => {
+                                document.querySelector('#ganttContainer>canvas').style.cursor = 'default';
                                 // this.handleClick(ev.target, 'leave', ev)
                             })
                             rectEl.on('click', (ev) => {

+ 74 - 56
src/views/analysis/CoreDeviceReport.vue

@@ -68,6 +68,7 @@
           <template slot-scope="scope">
             <span
               style="color: #025BAA"
+              :style="{'cursor': scope.row.photos_num?'pointer' : 'default'}"
               @click="showPicturesDetail(scope.row, 'equip')"
             >{{ scope.row.photos_num?(scope.row.photos_num + '张') : '—' }}</span>
             <!-- <span style="color: #025BAA" @click="showPicturesDetail(scope.row)">1张</span> -->
@@ -75,7 +76,11 @@
         </el-table-column>
         <el-table-column prop="attachments_num" label="报告">
           <template slot-scope="scope">
-            <span style="color: #025BAA" @click="(e) => showReportDetail(scope.row, 'equip', e)">{{ scope.row.attachments_num?(scope.row.attachments_num+ '张') : '—'}}</span>
+            <span
+              style="color: #025BAA"
+              :style="{'cursor': scope.row.attachments_num?'pointer' : 'default'}"
+              @click="(e) => showReportDetail(scope.row, 'equip', e)"
+            >{{ scope.row.attachments_num?(scope.row.attachments_num+ '张') : '—'}}</span>
             <!-- <span style="color: #025BAA" @click="(e) => showReportDetail(scope.row, 'equip', e)">1张</span> -->
           </template>
         </el-table-column>
@@ -108,6 +113,7 @@
             <template slot-scope="scope">
               <span
                 style="color: #025BAA"
+                :style="{'cursor': scope.row.photosNum?'pointer' : 'default'}"
                 @click="showPicturesDetail(scope.row, 'his')"
               >{{ scope.row.photosNum?(scope.row.photosNum + '张') : '—' }}</span>
               <!-- <span style="color: #025BAA" @click="showPicturesDetail(scope.row)">1张</span> -->
@@ -115,7 +121,11 @@
           </el-table-column>
           <el-table-column width="100" property="attachmentsNum" label="报告">
             <template slot-scope="scope">
-              <span style="color: #025BAA" @click="(e) => showReportDetail(scope.row, 'his', e)">{{ scope.row.attachmentsNum?(scope.row.attachmentsNum+ '张') : '—'}}</span>
+              <span
+                style="color: #025BAA"
+                :style="{'cursor': scope.row.attachmentsNum?'pointer' : 'default'}"
+                @click="(e) => showReportDetail(scope.row, 'his', e)"
+              >{{ scope.row.attachmentsNum?(scope.row.attachmentsNum+ '张') : '—'}}</span>
               <!-- <span style="color: #025BAA" @click="(e) => showReportDetail(scope.row, 'his', e)">1张</span> -->
             </template>
           </el-table-column>
@@ -153,7 +163,11 @@
         </el-dialog>
       </div>
     </div>
-    <div v-show="showAccessory" class="accessory-container" :style="{'top': accessoryPos.top + 'px', 'left': accessoryPos.left + 'px'}">
+    <div
+      v-show="showAccessory"
+      class="accessory-container"
+      :style="{'top': accessoryPos.top + 'px', 'left': accessoryPos.left + 'px'}"
+    >
       <div v-for="(item) in accessoryList" :key="'id_' + item.id">
         <a :href="item.url" target="_blank" :title="item.name">{{item.name}}</a>
       </div>
@@ -168,7 +182,7 @@ import {
   queryEquipmentList,
   queryTableData,
   queryHistoryTableData,
-  queryDetailData
+  queryDetailData,
 } from "../../api/coreDeviceReport";
 import _ from "lodash";
 import moment from "moment";
@@ -222,32 +236,32 @@ export default {
       accessoryList: [], // 附件
       accessoryPos: {
         top: 0,
-        left: 0
+        left: 0,
       }, // 附件弹窗位置
     };
   },
 
   components: {
     Select,
-    Input
+    Input,
   },
 
   computed: {},
 
   beforeMount() {
-    let PLAZAID = localStorage.getItem('PLAZAID');
+    let PLAZAID = localStorage.getItem("PLAZAID");
     this.plazaId = Number(PLAZAID) || 1000423;
   },
   mounted() {
-    document.addEventListener('click', () => {
+    document.addEventListener("click", () => {
       setTimeout(() => {
         if (this.isClickAccessory) {
           this.isClickAccessory = false;
-          return
+          return;
         }
         this.showAccessory = false;
-      }, 20)
-    })
+      }, 20);
+    });
     this.getSystemList();
   },
 
@@ -256,14 +270,14 @@ export default {
      * 获取系统列表数据
      */
     getSystemList() {
-      querySystemList().then(res => {
+      querySystemList().then((res) => {
         if (res.result === "success") {
           let data = res.data;
           let newData = [];
-          _.forEach(data, item => {
+          _.forEach(data, (item) => {
             newData.push({
               id: item.code,
-              name: item.name
+              name: item.name,
             });
           });
           this.systemList = newData;
@@ -295,7 +309,7 @@ export default {
       if (this.systemId !== "") {
         param.smsxt = this.systemId;
       }
-      queryEquipmentList("/data/home/querySystemCard", param).then(res => {
+      queryEquipmentList("/data/home/querySystemCard", param).then((res) => {
         const { result, data } = res;
         if (result === "success") {
           let newData = [],
@@ -305,16 +319,19 @@ export default {
             this.systemContentData = [];
             this.curPage = 1;
             this.tatol = 0;
-            return
+            return;
           }
           _.forEach(data[0].assetTypeList, (item, index) => {
             let itemData = {
               name: item.category_name,
               isMaintenance: item.is_detecting,
-              statusNum: (item.category_code !== 'rdd' && item.category_code !== 'rqa')?item.is_exception_num : item.is_exception_workorder_num,
+              statusNum:
+                item.category_code !== "rdd" && item.category_code !== "rqa"
+                  ? item.is_exception_num
+                  : item.is_exception_workorder_num,
               num: item.asset_num,
               abnormal: item.is_exception_num !== 0,
-              category_code: item.category_code
+              category_code: item.category_code,
             };
             if (!item.category_code) {
               console.error("without category_code..", item);
@@ -331,17 +348,17 @@ export default {
           });
           const { query } = this.$route;
           _.forEach(newData, (item) => {
-            if (item.category_code === 'tja') {
-              item.unitText = '个';
-            } else if (item.category_code === 'tjb'){
-              item.unitText = '段';
+            if (item.category_code === "tja") {
+              item.unitText = "个";
+            } else if (item.category_code === "tjb") {
+              item.unitText = "段";
             } else {
-              item.unitText = '台';
+              item.unitText = "台";
             }
-          })
+          });
           this.systemContentData = newData;
           if (!_.isEmpty(query) && query.equipId) {
-            _.map(this.systemContentData, o => {
+            _.map(this.systemContentData, (o) => {
               return (o.isActive = o.category_code == query.equipId);
             });
           }
@@ -354,7 +371,7 @@ export default {
      */
     changeEquipment(id) {
       this.curPage = 1;
-      _.map(this.systemContentData, o => {
+      _.map(this.systemContentData, (o) => {
         return (o.isActive = o.category_code === id);
       });
       this.getTableData();
@@ -364,22 +381,22 @@ export default {
      */
     getTableData() {
       let query = {
-        category_code: _.find(this.systemContentData, o => {
+        category_code: _.find(this.systemContentData, (o) => {
           return o.isActive;
-        }).category_code
+        }).category_code,
       };
       let url = `/data/sms_asset/query?plazaId=${this.plazaId}&page=${this.curPage}&size=${this.pageSize}&orderBy=is_exception,0`;
       if (_.trim(this.searchKey) !== "") {
         url = `${url}&keyword=${this.searchKey}:sbjc,sbjbm`;
       }
-      queryTableData(url, query).then(res => {
+      queryTableData(url, query).then((res) => {
         const { result, count, data } = res;
         if (result === "success") {
           this.tatol = count;
           this.tableData = data;
           _.forEach(this.tableData, (item, index) => {
-            item.index = ((this.curPage - 1) * this.pageSize )+ index + 1;
-          })
+            item.index = (this.curPage - 1) * this.pageSize + index + 1;
+          });
         }
       });
     },
@@ -408,7 +425,7 @@ export default {
         }
         if (ins.isClickPicture) {
           ins.isClickPicture = false;
-          return
+          return;
         }
         ins.equipTitle = row.sbjc;
         ins.dialogTableVisible = true;
@@ -429,16 +446,16 @@ export default {
         // assetnum: 24071,
         startDate: this.startTime,
         // startDate: 20000101000000,
-        endDate: this.endTime
+        endDate: this.endTime,
         // endDate: 20200201000000
       };
       queryHistoryTableData("/data/base/queryDateByAssetNum", param).then(
-        res => {
+        (res) => {
           const { result, data, count } = res;
           if (result === "success") {
             this.historyTableData = data;
             this.hisTotal = count;
-            _.forEach(this.historyTableData, item => {
+            _.forEach(this.historyTableData, (item) => {
               let name;
               switch (item.type) {
                 case 0:
@@ -500,7 +517,7 @@ export default {
       if (type === "equip") {
         if (!val.photos_num) {
           this.isClickPicture = true;
-          return
+          return;
         }
         if (!val.file_type || !val.file_type_id) {
           return;
@@ -522,7 +539,7 @@ export default {
       if (type === "equip") {
         if (!val.attachments_num) {
           this.isClickPicture = true;
-          return
+          return;
         }
         if (!val.file_type || !val.file_type_id) {
           return;
@@ -530,13 +547,13 @@ export default {
       } else {
         if (!val.attachmentsNum) {
           this.isClickPicture = true;
-          return
+          return;
         }
       }
       this.accessoryPos = {
         top: e.clientY + 5,
-        left: e.clientX - 360 -5
-      }
+        left: e.clientX - 360 - 5,
+      };
       this.showAccessory = true;
       this.isClickAccessory = true;
       this.detailTitle = "附件预览";
@@ -549,14 +566,14 @@ export default {
       let param = {
         assetnum: this.assetnum,
         plazaId: this.plazaId,
-        file_type: type === 'equip'?val.file_type : val.type,
+        file_type: type === "equip" ? val.file_type : val.type,
         // file_type: 0,
-        file_type_id: type === 'equip'?val.file_type_id : val.id,
+        file_type_id: type === "equip" ? val.file_type_id : val.id,
         // file_type_id: this.detailTitle === "图片预览" ?2914 : 1136,
         // file_type_id: 9886,
-        type: this.detailTitle === "图片预览" ? 0 : 1
+        type: this.detailTitle === "图片预览" ? 0 : 1,
       };
-      queryDetailData("/data/base/queryFileDetails", param).then(res => {
+      queryDetailData("/data/base/queryFileDetails", param).then((res) => {
         const { result, data } = res;
         if (result === "success") {
           let newData = [];
@@ -565,7 +582,7 @@ export default {
               id: item.id,
               url: item.urlname,
               isActive: index === 0,
-              name: item.description
+              name: item.description,
             });
           });
           if (this.detailTitle === "图片预览") {
@@ -583,14 +600,14 @@ export default {
      * 切换当前预览大图
      */
     changeCurImg(id) {
-      _.map(this.pictureList, o => {
+      _.map(this.pictureList, (o) => {
         return (o.isActive = o.id === id);
       });
-      this.curImg = _.find(this.pictureList, o => {
+      this.curImg = _.find(this.pictureList, (o) => {
         return o.isActive;
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -711,6 +728,7 @@ export default {
     height: 100%;
     overflow: auto;
     .item {
+      cursor: pointer;
       > img {
         width: 180px;
         border: 4px solid rgba(245, 246, 247, 1);
@@ -730,7 +748,7 @@ export default {
       &:not(:last-of-type) {
         margin-bottom: 20px;
       }
-      .active>img{
+      .active > img {
         border-color: rgba(31, 35, 41, 0.15);
       }
     }
@@ -751,7 +769,7 @@ export default {
       max-height: 530px;
     }
   }
-  .accessory-container{
+  .accessory-container {
     padding-top: 4px;
     padding-bottom: 4px;
     width: 360px;
@@ -759,11 +777,11 @@ export default {
     overflow: auto;
     position: fixed;
     background: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(31,35,41,0.1);
+    box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
     border-radius: 2px;
-    border: 1px solid rgba(228,229,231,1);
+    border: 1px solid rgba(228, 229, 231, 1);
     z-index: 5000;
-    >div>a{
+    > div > a {
       padding-left: 12px;
       padding-right: 12px;
       display: block;
@@ -773,8 +791,8 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      &:hover{
-        background: #F5F6F7;
+      &:hover {
+        background: #f5f6f7;
       }
     }
   }

+ 169 - 121
src/views/analysis/GanttChart.vue

@@ -44,7 +44,10 @@
               <Task class="icon" />
               <div class="title">任务状态</div>
             </div>
-            <div v-show="ganttDetail.status" :style="{'background': ganttDetail.color && ganttDetail.color[1]?ganttDetail.color[1] : '', 'color': ganttDetail.color && ganttDetail.color[0]?ganttDetail.color[0] : ''}">{{ganttDetail.status}}</div>
+            <div
+              v-show="ganttDetail.status"
+              :style="{'background': ganttDetail.color && ganttDetail.color[0]?ganttDetail.color[0] : '', 'color': ganttDetail.color && ganttDetail.color[1]?ganttDetail.color[1] : ''}"
+            >{{ganttDetail.status}}</div>
           </div>
           <div class="row">
             <div>
@@ -68,10 +71,19 @@
             <div>
               <div>
                 <div class="num">{{pictureList.length}}张</div>
-                <div v-if="pictureList.length > 0" class="more" @click="() => showImgDetail = true">查看更多</div>
+                <div
+                  v-if="pictureList.length > 0"
+                  class="more"
+                  @click="() => showImgDetail = true"
+                >查看更多</div>
               </div>
               <div class="pictrue-container">
-                <div v-for="(item) in pictures" :key="'id_' + item.id" @click="showImgContainer(item.id)" class="item">
+                <div
+                  v-for="(item) in pictures"
+                  :key="'id_' + item.id"
+                  @click="showImgContainer(item.id)"
+                  class="item"
+                >
                   <img src="../../assets/imgs/analysis/picture.png" alt />
                   <div class="info" :title="item.name">{{item.name}}</div>
                 </div>
@@ -87,14 +99,26 @@
               <div>
                 <div class="num">{{accessoryList.length}}张</div>
               </div>
-              <div class="accessory-container" :style="{'max-height': accessoryIsExpand?'' : '115px'}">
-                <a :href="item.url?item.url : 'javascript:void(0)'" target="_blank" v-for="(item) in accessoryList" :key="'id_' + item.id" class="item">
+              <div
+                class="accessory-container"
+                :style="{'max-height': accessoryIsExpand?'' : '115px'}"
+              >
+                <a
+                  :href="item.url?item.url : 'javascript:void(0)'"
+                  target="_blank"
+                  v-for="(item) in accessoryList"
+                  :key="'id_' + item.id"
+                  class="item"
+                >
                   <img src="../../assets/imgs/analysis/report_pdf.png" alt />
                   <div class="info" :title="item.name">{{item.name}}</div>
                 </a>
-                <div v-if="accessoryList.length > 0" class="expand-more" @click="() => accessoryIsExpand = !accessoryIsExpand">
-                  <ExpandArrow :class="{'expand': accessoryIsExpand}"/>
-                  展开更多
+                <div
+                  v-if="accessoryList.length > 0"
+                  class="expand-more"
+                  @click="() => accessoryIsExpand = !accessoryIsExpand"
+                >
+                  <ExpandArrow :class="{'expand': accessoryIsExpand}" />展开更多
                 </div>
               </div>
             </div>
@@ -117,13 +141,19 @@
         <el-dialog :title="'图片预览'" :visible.sync="showImgDetail" width="1260px">
           <div class="detail-container">
             <div class="pictures-menu">
-              <div v-for="(item) in pictureList" :key="'id_' + item.id" class="item" @click="changeCurImg(item.id)" :class="{'active': item.isActive}">
-                <img :src="item.url?item.url : ''" alt="">
+              <div
+                v-for="(item) in pictureList"
+                :key="'id_' + item.id"
+                class="item"
+                @click="changeCurImg(item.id)"
+                :class="{'active': item.isActive}"
+              >
+                <img :src="item.url?item.url : ''" alt />
                 <div class="name" :title="item.name">{{item.name}}</div>
               </div>
             </div>
             <div class="cur-img-container">
-              <img v-if="curImg && curImg.url" :src="curImg.url" alt="">
+              <img v-if="curImg && curImg.url" :src="curImg.url" alt />
             </div>
           </div>
         </el-dialog>
@@ -159,28 +189,22 @@ export default {
       legends: [
         {
           id: 1,
-          text: "按时完成",
+          text: "完成",
           backgroundColor: "#E7E9EA",
-          borderColor: "#C3C7CB"
+          borderColor: "#C3C7CB",
         },
         {
           id: 2,
-          text: "未开始/进行中",
-          backgroundColor: "rgba(91, 143, 249, 0.2)",
-          borderColor: "#5B8FF9"
-        },
-        {
-          id: 3,
-          text: "逾期完成",
+          text: "即将逾期",
           backgroundColor: "#FBCE99",
-          borderColor: "#F58300"
+          borderColor: "#F58300",
         },
         {
-          id: 4,
+          id: 3,
           text: "逾期未完成",
           backgroundColor: "#FBB8B5",
-          borderColor: "#F54E45"
-        }
+          borderColor: "#F54E45",
+        },
       ], // 图例
       timeType: "month", // 甘特图时间类型
       treeData: [], // 树结构数据
@@ -215,7 +239,6 @@ export default {
       accessoryIsExpand: false, // 附件是否展开
 
       showImgDetail: false, // 查看更多图片弹框显示状态
-
     };
   },
 
@@ -226,25 +249,25 @@ export default {
     Picture,
     Report,
     Menu,
-    ExpandArrow
+    ExpandArrow,
   },
 
   computed: {},
 
   beforeMount() {
-    let PLAZAID = localStorage.getItem('PLAZAID');
+    let PLAZAID = localStorage.getItem("PLAZAID");
     this.plazaId = Number(PLAZAID) || 1000423;
   },
   mounted() {
-    document.addEventListener('click', () => {
+    document.addEventListener("click", () => {
       setTimeout(() => {
         if (this.isClickAccessory) {
           this.isClickAccessory = false;
-          return
+          return;
         }
         this.showAccessory = false;
-      }, 20)
-    })
+      }, 20);
+    });
     this.initChartTime();
     this.getSystemList();
   },
@@ -255,22 +278,22 @@ export default {
      */
     initChartTime() {
       let endTime = new Date().getTime(),
-          startTime = endTime - 1000*60*60*24*365;
-      this.startTime = moment.unix(startTime / 1000).format('YYYYMMDDHHmmss');
-      this.endTime = moment.unix(endTime / 1000).format('YYYYMMDDHHmmss');
+        startTime = endTime - 1000 * 60 * 60 * 24 * 365;
+      this.startTime = moment.unix(startTime / 1000).format("YYYYMMDDHHmmss");
+      this.endTime = moment.unix(endTime / 1000).format("YYYYMMDDHHmmss");
     },
     /**
      * 获取系统列表数据
      */
     getSystemList() {
-      querySystemList().then(res => {
+      querySystemList().then((res) => {
         if (res.result === "success") {
           let data = res.data;
           let newData = [];
-          _.forEach(data, item => {
+          _.forEach(data, (item) => {
             newData.push({
               id: item.code,
-              name: item.name
+              name: item.name,
             });
           });
           this.systemList = newData;
@@ -319,7 +342,7 @@ export default {
      * 切换视图
      */
     changeView() {
-      console.log('timeType', this.timeType)
+      console.log("timeType", this.timeType);
       if (window.gc) {
         gc.gCanvas.destroy();
         window.gc = null;
@@ -335,9 +358,9 @@ export default {
         smsxt: this.systemId,
         plazaId: this.plazaId,
         startDate: this.startTime, // time[0]
-        endDate: this.endTime // time[1]
+        endDate: this.endTime, // time[1]
       };
-      queryGanttChart("/data/base/queryGanttChart", param).then(res => {
+      queryGanttChart("/data/base/queryGanttChart", param).then((res) => {
         const { dsfList, wbList, zwList, result } = res;
         console.log("res", res);
         if (result === "success") {
@@ -351,36 +374,36 @@ export default {
               name: name[index],
               open: true,
               // children: name[index] === '专维'?[] : this.disGanttData(dsfList)
-              children: this.disGanttData(data[index])
+              children: this.disGanttData(data[index]),
             });
           });
           this.treeData = newData;
 
-          let taskData = _.map(_.cloneDeep(newData), item => {
+          let taskData = _.map(_.cloneDeep(newData), (item) => {
             let parentNode = {
               id: item.id,
               type: item.name,
               open: item.open,
             };
             return Object.assign(parentNode, {
-              dataList: _.map(item.children, _item => {
+              dataList: _.map(item.children, (_item) => {
                 return {
                   parentNode,
                   id: _item.id,
                   title: _item.name,
-                  tasks: _item.originData
+                  tasks: _item.originData,
                 };
-              })
-            })
+              }),
+            });
           });
           console.log("taskData", taskData);
           if (!window.gc) {
             let width = this.$refs.chartContainer.offsetWidth;
             let handleFn = null;
-            if (this.timeType === 'month') {
-              handleFn = GanttChartMonth
+            if (this.timeType === "month") {
+              handleFn = GanttChartMonth;
             } else {
-              handleFn = GanttChartDay
+              handleFn = GanttChartDay;
             }
             window.gc = new handleFn({
               chartParentContainer: "chartContainer",
@@ -388,18 +411,25 @@ export default {
               viewWidth: width,
               cWidth: 3 * width,
               tasks: taskData,
-              daysCount: this.timeType === 'month'? (365*1.5) : parseInt((3 * width) / 40),
+              daysCount:
+                this.timeType === "month"
+                  ? 365 * 1.5
+                  : parseInt((3 * width) / 40),
               callback: this.showDialog,
-              pageToCallback: (data)=>{
+              pageToCallback: (data) => {
                 const { startAt, endAt } = data;
-                this.startTime = moment.unix(new Date(startAt).getTime() / 1000).format('YYYYMMDDHHmmss');
-                this.endTime = moment.unix(new Date(endAt).getTime() / 1000).format('YYYYMMDDHHmmss');
+                this.startTime = moment
+                  .unix(new Date(startAt).getTime() / 1000)
+                  .format("YYYYMMDDHHmmss");
+                this.endTime = moment
+                  .unix(new Date(endAt).getTime() / 1000)
+                  .format("YYYYMMDDHHmmss");
                 this.getGanttChartData();
-              }
+              },
             });
             gc.main();
           } else {
-            gc.changeTasks(taskData)
+            gc.changeTasks(taskData);
           }
         }
       });
@@ -409,19 +439,23 @@ export default {
      */
     disGanttData(arr) {
       let data = [];
-      _.forEach(arr, item => {
+      _.forEach(arr, (item) => {
         data.push({
           id: item.id,
           name: item.name,
           checked: "uncheck",
-          originData: _.map(item.data, _item => {
+          originData: _.map(item.data, (_item) => {
             // _item.startDate = moment.unix((new Date().getTime() - 1000*60*60*24*7)/1000).format('YYYY-MM-DD HH:mm:ss');
-            _item.startDate = moment.unix(_item.startDate / 1000).format("YYYY-MM-DD HH:mm:ss");
+            _item.startDate = moment
+              .unix(_item.startDate / 1000)
+              .format("YYYY-MM-DD HH:mm:ss");
             // _item.endDate = moment.unix(new Date().getTime()/1000).format('YYYY-MM-DD HH:mm:ss');
-            _item.endDate = moment.unix(_item.endDate / 1000).format("YYYY-MM-DD HH:mm:ss");
+            _item.endDate = moment
+              .unix(_item.endDate / 1000)
+              .format("YYYY-MM-DD HH:mm:ss");
             _item.description = _item.parentname;
             return _item;
-          })
+          }),
         });
       });
       return data;
@@ -452,53 +486,58 @@ export default {
       let param = {
         plazaId: this.plazaId,
         type: statusType,
-        id: id
+        id: id,
       };
-      queryGanttDetail("/data/base/queryGanttChartDetails", param).then(res => {
-        const { result, data } = res;
-        if (result === "success") {
-          if (!data) {
-            this.ganttDetail = {}
-            return
-          }
-          const {
-            status,
-            planStartDate,
-            planEndDate,
-            realStartDate,
-            realEndDate,
-            statusType,
-            name
-          } = data;
-          let color;
-          switch (statusType) {
-            case 1:
-              color = ['#c3c7cb', '#e7e9ea'];
-              break
-            case 2:
-              color = ['#5b8ff9', '#5b8ff933'];
-              break
-            case 3:
-              color = ['#f58300', '#fbce99'];
-              break
-            case 4:
-              color = ['#f54e45', '#fbb8b5'];
-              break
-            default:
-              color = ['#f54e45', '#fbb8b5'];
-              break
+      queryGanttDetail("/data/base/queryGanttChartDetails", param).then(
+        (res) => {
+          const { result, data } = res;
+          if (result === "success") {
+            if (!data) {
+              this.ganttDetail = {};
+              return;
+            }
+            const {
+              status,
+              planStartDate,
+              planEndDate,
+              realStartDate,
+              realEndDate,
+              statusType,
+              name,
+            } = data;
+            let color;
+            switch (statusType) {
+              case 1:
+                color = ["#E7E9EA", "#C3C7CB"];
+                break;
+              case 2:
+                color = ["#FBCE99", "#F58300"];
+                break;
+              case 3:
+                color = ["#FBB8B5", "#F54E45"];
+                break;
+              default:
+                color = ["#FBB8B5", "#F54E45"];
+                break;
+            }
+            let newData = {
+              status,
+              color: color,
+              name: name,
+              planTime:
+                planStartDate && planEndDate
+                  ? this.dealDetailTime(planStartDate, planEndDate)
+                  : "--",
+              realTime:
+                realStartDate && realEndDate
+                  ? this.dealDetailTime(realStartDate, realEndDate)
+                  : "--",
+            };
+            this.ganttDetail = newData;
+            this.tableData = data.assetList;
           }
-          let newData = {
-            status,
-            color: color,
-            name: name,
-            planTime: (planStartDate && planEndDate)?this.dealDetailTime(planStartDate, planEndDate) : '--',
-            realTime: (realStartDate && realEndDate)?this.dealDetailTime(realStartDate, realEndDate) : '--'
-          };
-          this.ganttDetail = newData;
-          this.tableData = data.assetList;
         }
-      });
+      );
     },
     /**
      * 处理时间
@@ -522,17 +561,17 @@ export default {
         type: type,
         // assetnum: this.assetnum,
       };
-      queryDetailData("/data/base/queryFileDetails", param).then(res => {
+      queryDetailData("/data/base/queryFileDetails", param).then((res) => {
         console.log("photo", res);
         const { result, data } = res;
-        if (result === 'success') {
+        if (result === "success") {
           let newData = [];
           _.forEach(data, (item, index) => {
             newData.push({
               id: item.id,
               url: item.urlname,
               isActive: index === 0,
-              name: item.description
+              name: item.description,
             });
           });
           if (type === 0) {
@@ -549,22 +588,30 @@ export default {
      * 切换当前预览大图
      */
     changeCurImg(id) {
-      _.map(this.pictureList, (o) => {return o.isActive = o.id === id});
-      this.curImg = _.find(this.pictureList, (o) => {return o.isActive});
+      _.map(this.pictureList, (o) => {
+        return (o.isActive = o.id === id);
+      });
+      this.curImg = _.find(this.pictureList, (o) => {
+        return o.isActive;
+      });
     },
     /**
      * 展示图片
      */
     showImgContainer(id) {
-      console.log('id', id)
-      _.map(this.pictures, (o) => {return o.isActive = o.id === id});
-      this.curImg = _.find(this.pictures, (o) => {return o.isActive});
+      console.log("id", id);
+      _.map(this.pictures, (o) => {
+        return (o.isActive = o.id === id);
+      });
+      this.curImg = _.find(this.pictures, (o) => {
+        return o.isActive;
+      });
       this.showImgDetail = true;
-    }
+    },
   },
   beforeDestroy() {
     window.gc = null;
-  }
+  },
 };
 </script>
 
@@ -720,7 +767,7 @@ export default {
           width: 24px;
           margin-right: 15px;
         }
-        .info{
+        .info {
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
@@ -730,10 +777,10 @@ export default {
         margin-bottom: 8px;
       }
     }
-    .accessory-container{
+    .accessory-container {
       position: relative;
       overflow: hidden;
-      .expand-more{
+      .expand-more {
         position: absolute;
         left: 444px;
         bottom: 0;
@@ -741,12 +788,12 @@ export default {
         cursor: pointer;
         display: flex;
         align-items: center;
-        >svg{
+        > svg {
           margin-right: 4px;
           width: 16px;
-          transition: transform .36s;
+          transition: transform 0.36s;
         }
-        .expand{
+        .expand {
           transform: rotate(180deg);
         }
       }
@@ -770,6 +817,7 @@ export default {
     height: 100%;
     overflow: auto;
     .item {
+      cursor: pointer;
       > img {
         width: 180px;
         border: 4px solid rgba(245, 246, 247, 1);
@@ -790,7 +838,7 @@ export default {
         margin-bottom: 20px;
       }
     }
-    .active>img{
+    .active > img {
       border-color: rgba(31, 35, 41, 0.15);
     }
   }

+ 15 - 3
src/views/analysis/SpecificationUpdateRecord.vue

@@ -148,9 +148,9 @@ export default {
             let text = _.find(this.incidentList, (o) => {return o.id === item.objtype}).name
             item.evenType = text;
             if (item.objtype === 0 || item.objtype === 2) {
-              item.time = moment.unix(item.changedate / 1000).format('YYYY-MM-DD')
+              item.time = moment.unix(item.changedate / 1000).format('YYYY.MM.DD')
             } else {
-              item.time = moment.unix(item.changedate / 1000).format('YYYY-MM-DD HH-mm')
+              item.time = moment.unix(item.changedate / 1000).format('YYYY.MM.DD HH:mm')
             }
             return
           })
@@ -189,7 +189,7 @@ export default {
         case 0: // 专维
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.id}`;
           break
-        case 1: // 维保
+        case 1: //重要维保
           let value;
           if (row.apptype === '外委' || row.apptype === '自维') {
             value = 'WB_GZGL';
@@ -203,7 +203,19 @@ export default {
         case 2: // 第三方视图
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`;
           break
+        case 3: // 综合事项
+          
+          break
+        case 4: // 重要维修
+
+          break
+        case 5: // 其他事项
+
+          break
+        default:
+          return
       }
+      if (!url) return
       window.open(url, '_blank');
     }
   },

+ 37 - 217
src/views/equipment/eqDialog.vue

@@ -8,13 +8,13 @@
                 <!-- 2020-7-12 查看图纸时 隐藏图标(查看入口) -->
                 <!-- v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"' -->
                 <!-- v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP" && dialogInfo.label !== "查看图纸"' -->
-                <img v-if='showImg' src='../../assets/imgs/zy2.png' @click='visibalBox' style='margin-top:-4px;' alt />
+                <img v-if='showImg' src='../../assets/imgs/zy2.png' @click='visibalBox' class='title-img' alt />
             </div>
             <!-- 没有tab的页面 -->
             <div v-if='Object.keys(dialogInfo).length>0 && dialogInfo.children.length==0' style='padding-top:16px;height:100%'>
                 <!-- 原理图 -->
                 <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;overflow:auto;height:100%;margin:0 auto'>
-                    <rotation type='3' v-if='rotationImg.length>0' :size='sizePic' :rotationImg='rotationImg'></rotation>
+                    <rotation :key='`rotaion_${rotationKey}`' type='3' v-if='rotationImg.length>0' :size='sizePic' :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建装饰主要材料清单 -->
                 <!-- <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table> -->
@@ -133,7 +133,13 @@
                                 >
                                     <!-- 有tab的原理图 -->
                                     <div style='width:100%;height:600px;'>
-                                        <rotation :size='sizePic' v-if='rotationImg.length>0' type='3' :rotationImg='rotationImg'></rotation>
+                                        <rotation
+                                            :key='`tab_rotaion_${rotationKey}`'
+                                            :size='sizePic'
+                                            v-if='rotationImg.length>0'
+                                            type='3'
+                                            :rotationImg='rotationImg'
+                                        ></rotation>
                                     </div>
                                 </el-tab-pane>
                                 <!-- 发布之后的编辑器的分支图 -->
@@ -183,216 +189,18 @@ export default {
             diff: '',
             difference: '', //区分给水排水
             rotationImg: [],
+            rotationKey: 1,
             tabLabel: '',
             tabCount: [],
             sizePic: '',
             imgInfo: {},
             showFenbuPic: false, //显示楼层分布组件
             key: 1, //弹窗key值,重新渲染table组件
-            //  code字典,打开主要设备维保/维修事项;专维及其他事项 三个tab 中, title右侧小图标使用
-            /** 最后取值 -1:不显示右侧图标; 1:   2:   ...  */
-            codeDict: [
-                {
-                    /** 供电系统 */
-                    1001: [
-                        {
-                            主要设备维保事项: {
-                                配电室内重要维保: 1,
-                                配电室外重要维保: 2,
-                                日常维保事项: -1,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                配电室内重要维修: 1,
-                                配电室外重要维修: 2,
-                                日常维修事项: -1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 暖通系统 */
-                    1002: [
-                        {
-                            主要设备维保事项: {
-                                冷源机房内重要维保: 1,
-                                冷源机房外重要维保: 2,
-                                日常维保事项: -1,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                冷源机房内重要维修: 1,
-                                冷源机房外重要维修: 2,
-                                日常维修事项: -1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 消防系统 */
-                    1003: [
-                        {
-                            主要设备维保事项: {
-                                '中控室/消防泵房内重要维保': 1,
-                                '中控室/消防泵房外重要维保': 2,
-                                日常维保事项: -1,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                '中控室/消防泵房内重要维修': 1,
-                                '中控室/消防泵房外重要维修': 2,
-                                日常维修事项: -1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 弱电系统 */
-                    1004: [
-                        {
-                            主要设备维保事项: {
-                                慧云机房内重要维保: 1,
-                                慧云机房外重要维保: 2,
-                                日常维保事项: -1,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                慧云机房内重要维修: 1,
-                                慧云机房外重要维修: 2,
-                                日常维修事项: -1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 给排水 */
-                    1005: [
-                        {
-                            主要设备维保事项: {
-                                给水系统重要维保: 1,
-                                排水系统重要维保: 2,
-                                日常维保事项: -1,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                给水系统重要维修: 1,
-                                排水系统重要维修: 2,
-                                日常维修事项: -1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                给水系统专项维修: 1,
-                                排水系统专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 电梯系统 */
-                    1006: [
-                        {
-                            主要设备维保事项: {
-                                重要维保事项: 1,
-                                日常维保事项: 2,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                重要维修事项: 1,
-                                日常维修事项: 2,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 燃气系统 */
-                    1007: [
-                        {
-                            主要设备维保事项: {
-                                重要维保事项: 1,
-                                日常维保事项: 1,
-                            },
-                        },
-                        {
-                            主要设备维修事项: {
-                                重要维修事项: 1,
-                                日常维修事项: 1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-                {
-                    /** 土建装饰 */
-                    1008: [
-                        {
-                            维保事项: {
-                                重要维保事项: 1,
-                                日常维保事项: 1,
-                            },
-                        },
-                        {
-                            维修事项: {
-                                重要维修事项: 1,
-                                日常维修事项: 1,
-                            },
-                        },
-                        {
-                            专维及其他事项: {
-                                专项维修: 1,
-                                其他事项: 1,
-                            },
-                        },
-                    ],
-                },
-            ],
         }
     },
     computed: {
         showImg: function () {
-            let arr = ['QD', 'YL', 'GJSP']
+            let arr = ['QD', 'YL']
             //  日常维保/维修事项 tab页,  不显示icon
             let flag = true
             let labelArr = ['日常维保事项', '日常维修事项']
@@ -402,7 +210,11 @@ export default {
                 flag = true
             }
             // title右侧 icon入口
-            return arr.indexOf(this.dialogInfo.id.slice(2, 4)) === -1 && this.dialogInfo.label !== '查看图纸' && flag
+            // 1. 主要设备清单, 系统原理图 不显示 icon
+            // 2. 供电系统 楼层电井(间)控制商铺范围清单(GJSP)不显示icon
+            // 3. 查看图纸 不显示icon
+            // 4. 点开 主要设备维保事项/维修事项, 专维及其他事项 中的日常维保事项,日常维修事项 不显示 icon
+            return arr.indexOf(this.dialogInfo.id.slice(2, 4)) === -1 && this.dialogInfo.id !== 'GJSP' && this.dialogInfo.label !== '查看图纸' && flag
         },
     },
     mounted() {},
@@ -424,16 +236,16 @@ export default {
     methods: {
         //打开弹窗
         showModal(item) {
-            console.log(item)
+            // console.log(item)
             this.visible = true
             this.dialogInfo = item
             if (Object.keys(this.dialogInfo).length > 0 && this.dialogInfo.children.length > 0) {
                 this.activeName = this.dialogInfo.children[0].param.tab_code
-                console.log(this.dialogInfo)
+                // console.log(this.dialogInfo)
                 this.diff = this.dialogInfo.children[0].param.diff
                 //给排水的专维区分
                 this.difference = this.dialogInfo.children[0].param.difference
-                console.log(this.diff)
+                // console.log(this.diff)
                 if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
                     this.typecode = this.dialogInfo.children[0].param.type_code
                     this.activeName = this.typecode
@@ -453,7 +265,7 @@ export default {
         },
         //点击tab函数
         handleClick(tab) {
-            console.log(tab)
+            // console.log(tab)
             this.key++
             if (this.param) {
                 this.param = tab.name
@@ -507,7 +319,7 @@ export default {
             let tabData = system.children.filter((v) => v.label === this.dialogInfo.label)[0]
             // 获取到子系统的param
             let param = tabData.children.filter((v) => v.label === this.tabLabel)[0].param
-            console.log(`%c${JSON.stringify(param, null, 2)}`, 'color:blue')
+            // console.log(`%c${JSON.stringify(param, null, 2)}`, 'color:blue')
             // 获取到 wznw,apply
             const { wznw, apply, difference } = param
             // 打开记录表格
@@ -527,7 +339,7 @@ export default {
                 plazaId: this.$store.state.plazaId,
                 module: '1002',
                 neTypename: '位置布置图',
-                typecode: typecode,
+                typecode,
             }
             switch (this.systemName) {
                 case '暖通系统':
@@ -559,15 +371,19 @@ export default {
                 this.rotationImg = res.data || []
                 let img = new Image()
                 img.src = this.rotationImg && this.rotationImg[0] ? this.rotationImg[0].url : ''
-                const vm = this
-                img.onload = function () {
-                    vm.$set(vm.imgInfo, 'width', img.width)
-                    vm.$set(vm.imgInfo, 'height', img.height)
-                    if (vm.imgInfo.width > vm.imgInfo.height) {
-                        vm.sizePic = 'width'
+                if (!img.src) {
+                    this.rotationKey++
+                    return true
+                }
+                img.onload = () => {
+                    this.$set(this.imgInfo, 'width', img.width)
+                    this.$set(this.imgInfo, 'height', img.height)
+                    if (this.imgInfo.width > this.imgInfo.height) {
+                        this.sizePic = 'width'
                     } else {
-                        vm.sizePic = 'height'
+                        this.sizePic = 'height'
                     }
+                    this.rotationKey++
                 }
             })
         },
@@ -647,6 +463,10 @@ export default {
         color: #fff;
         font-weight: normal;
     }
+    .title-img {
+        cursor: pointer;
+        margin-top: -4px;
+    }
 }
 .top {
     width: 1366px;

+ 0 - 1
src/views/equipment/table/eqDetaileDialog.vue

@@ -315,7 +315,6 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
-            // TODO: 添加条数?
             let postParams = {
                 classstructureid: this.row.classstructureid,
                 type_code: this.row.type_code,

+ 26 - 17
src/views/equipment/table/eqListTable.vue

@@ -91,8 +91,15 @@
         >
             <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>-->
-        <el-dialog width='100%' :title='`${type_name}设备清单`' :visible.sync='innerVisible' append-to-body :fullscreen='true'>
-            <eq-detail :key='`eqDetail${key}`' ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
+        <el-dialog
+            width='100%'
+            custom-class='eq-list-dialog'
+            :title='`${type_name}设备清单`'
+            :visible.sync='innerVisible'
+            append-to-body
+            :fullscreen='true'
+        >
+            <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
 </template>
@@ -264,20 +271,22 @@ export default {
         cursor: pointer;
     }
 }
-// 弹窗头部样式修改
-.el-dialog__header {
-    padding: 16px 24px;
-    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
-}
-.el-dialog__headerbtn .el-dialog__close {
-    color: #fff;
-}
-.el-dialog__title {
-    font-size: 16px;
-    padding-right: 6px;
-    padding-left: 24px;
-    font-weight: bold;
-    color: #fff;
-    font-weight: normal;
+.eq-list-dialog {
+    // 弹窗头部样式修改
+    .el-dialog__header {
+        padding: 16px 24px;
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+    .el-dialog__title {
+        font-size: 16px;
+        padding-right: 6px;
+        padding-left: 24px;
+        font-weight: bold;
+        color: #fff;
+        font-weight: normal;
+    }
 }
 </style>

+ 27 - 16
src/views/equipment/table/standTable.vue

@@ -84,7 +84,15 @@
             <eq-detail ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>-->
         <!-- 标准表格详情钻取表,使用全屏弹窗 -->
-        <el-dialog width='100%' :title='`${type_name}设备清单`' :visible.sync='innerVisible' append-to-body :fullscreen='true'>
+        <!-- 弹窗添加class -->
+        <el-dialog
+            custom-class='stand-dialog'
+            width='100%'
+            :title='`${type_name}设备清单`'
+            :visible.sync='innerVisible'
+            append-to-body
+            :fullscreen='true'
+        >
             <eq-detail :key='`eqDetail${key}`' ref='qdDialog' :row='row' :major='major' :smsxt='smsxt' :diff='diff' :sign='sign'></eq-detail>
         </el-dialog>
     </div>
@@ -268,21 +276,24 @@ export default {
         cursor: pointer;
     }
 }
-// 弹窗头部样式修改
-.el-dialog__header {
-    padding: 16px 24px;
-    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
-}
-.el-dialog__headerbtn .el-dialog__close {
-    color: #fff;
-}
 
-.el-dialog__title {
-    font-size: 16px;
-    padding-right: 6px;
-    padding-left: 24px;
-    font-weight: bold;
-    color: #fff;
-    font-weight: normal;
+.stand-dialog {
+    // 弹窗头部样式修改
+    .el-dialog__header {
+        padding: 16px 24px;
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    }
+    .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .el-dialog__title {
+        font-size: 16px;
+        padding-right: 6px;
+        padding-left: 24px;
+        font-weight: bold;
+        color: #fff;
+        font-weight: normal;
+    }
 }
 </style>

+ 9 - 10
src/views/homepage/index.vue

@@ -24,9 +24,9 @@
                                         <span class='equip-number'>{{equip.asset_num}}</span>
                                         <span class='equip-unit'>{{equip.category_name === '屋面logo' ? '个' : equip.category_name === '玻璃护栏' ? '段' : '台'}}</span>
                                     </div>
-                                    <div>
+                                    <!-- <div>
                                         <em v-if='false'>维保中</em>
-                                    </div>
+                                    </div> -->
                                 </section>
                             </div>
                         </div>
@@ -41,9 +41,9 @@
                                         <span class='equip-number'>{{equip.asset_num}}</span>
                                         <span class='equip-unit'>{{equip.category_name === '屋面logo' ? '个' : equip.category_name === '玻璃护栏' ? '段' : '台'}}</span>
                                     </div>
-                                    <div>
+                                    <!-- <div>
                                         <em v-if='false'>维保中</em>
-                                    </div>
+                                    </div> -->
                                 </section>
                             </div>
                         </div>
@@ -56,11 +56,11 @@
                                 <p class="line">
                                     <span >{{option.type === 1 ? '维保': option.type === 0 ? '专维' :  '第三方检测' }}</span>
                                     <span>
-                                        <em :style="{color:item.level == 1? '#646C73':'#C13830'}">{{option.month_unfinished}}</em>/<em>{{option.unfinished}}</em>/<em >{{option.total}}</em></span>
+                                        <em :style="{color:item.level == 1? '#646C73':'#C13830'}">{{option.due_num}}</em>/<em>{{option.unfinished}}</em>/<em >{{option.total}}</em>
+                                    </span>
                                 </p>
                                 <p class='desc'>
-                                    即将逾期/未完成/总数
-                                    <!-- {{option.type ===1 ? '即将逾期/当月未完成/总任务' :  '即将逾期/今年未完成/总任务' }} -->
+                                    {{option.type ===1 ? '即将逾期/未完成/当月总任务' : '即将逾期/未完成/本年总任务'  }}
                                 </p>
                             </div>
                         </div>
@@ -245,7 +245,6 @@ export default {
                     size: 13
                 }
             }
-
             getChangeList(params).then(res => {
                 if (res.result == 'success' && res.data) {
                     let result = res.data
@@ -254,7 +253,7 @@ export default {
                         if (item.objtype === 0) {
                             item.type = '专维'
                         } else if (item.objtype === 1) {
-                            item.type = '维保'
+                            item.type = '重要维保'
                         } else if (item.objtype === 2) {
                             item.type = '第三方检测'
                         } else if (item.objtype === 3) {
@@ -262,7 +261,7 @@ export default {
                         } else if (item.objtype === 4) {
                             item.type = '重要维修'
                         } else {
-                            item.type = '重点关注'
+                            item.type = '其他事项'
                         }
                     })
 

+ 1 - 0
src/views/other/zhsxOther.vue

@@ -115,6 +115,7 @@ export default {
       height: 16px;
       left: 260px;
       top: 3px;
+      cursor: pointer;
       img {
         width: 100%;
         height: 100%;

+ 1 - 1
src/views/other/zhsxOtherTable1.vue

@@ -239,7 +239,7 @@ export default {
                 //console.log('政府部门', res)
                 let department = [],
                     newArr = []
-                department = res.data.data.sms_zhsxjl.department ? res.data.data.sms_zhsxjl.department : []
+                department = res.data?.data?.sms_zhsxjl?.department || []
                 if (department.length > 0) {
                     department.forEach((el) => {
                         let obj = {

+ 9 - 1
src/views/overview/picModal.vue

@@ -15,6 +15,11 @@
 </template>
 
 <script>
+/**
+ * @author  yunxing
+ * @date    2020-09-07
+ * @description fix: 修复放大预览图片时,会出现蓝色头部的问题
+ */
 import PicViewRotation from './picViewRotation'
 export default {
     data() {
@@ -84,7 +89,10 @@ export default {
         margin-top: 5vh !important;
         position: relative;
         .el-dialog__header {
-            padding: 0;
+            padding: 0;// !important;
+            height: 0;
+            background: none; //!important;
+            border-bottom: none;
         }
         .el-dialog__body {
             padding: 0;

+ 14 - 10
src/views/overview/picViewRotation.vue

@@ -5,37 +5,41 @@
 */
 <template>
     <div class='wanda-rotation rotationFullYlt'>
-        <div v-if='rotationImg.length==1&&size=="height"' class='rotationConType'>
-            <img :src='rotationImg[0].url' alt />
+        <div v-if='rotationImgs.length==1&&size=="height"' class='rotationConType'>
+            <img :src='rotationImgs[0].url' alt />
         </div>
-        <div v-else-if='rotationImg.length==1&&size=="width"' class='rotationCon'>
-            <img :src='rotationImg[0].url' alt />
+        <div v-else-if='rotationImgs.length==1&&size=="width"' class='rotationCon'>
+            <img :src='rotationImgs[0].url' alt />
         </div>
         <el-carousel
             v-else
             style='height:100%;width:100%'
             :interval='5000'
             indicator-position='none'
-            :arrow='rotationImg.length == 1 ? "never":"always"'
+            :arrow='rotationImgs.length == 1 ? "never":"always"'
         >
-            <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
+            <el-carousel-item v-for='(item,index) in rotationImgs' :key='index'>
                 <img :src='item.url' alt style='  width: 100%; height: 100%;object-fit: container;' />
             </el-carousel-item>
         </el-carousel>
     </div>
-</template>s
+</template>
 <script>
+import { cloneDeep } from 'lodash'
 export default {
     name: 'Rotation',
     props: ['rotationImg', 'picType', 'size'],
     data() {
-        return {}
+        return {
+            rotationImgs: [],
+        }
     },
     methods: {},
     // 解决两张图片时,轮播顺序反向
     created() {
-        if (this.rotationImg && this.rotationImg.length === 2) {
-            this.rotationImg = [...this.rotationImg, ...this.rotationImg]
+        this.rotationImgs = cloneDeep(this.rotationImg)
+        if (this.rotationImgs && this.rotationImgs.length === 2) {
+            this.rotationImgs = [...this.rotationImgs, ...this.rotationImgs]
         }
     },
     mounted() {},

+ 45 - 45
src/views/statistics/index.vue

@@ -119,11 +119,11 @@
             </section>
             <section class='ratio-list'>
                 <section class='block' :style='panelStyle(item)' v-for='(item , index) in maintainList' :key='index'>
-                    <h4 class='section-title' @click='toggerPanel(item)'>{{item.title}}<img @mouseenter="showToolTip(index, item.title)" @mouseleave="hideToolTip(index, item.title)" src="../../assets/images/icons/notice.png" /></h4>
+                    <h4 class='section-title' @click='toggerPanel(item)'>{{item.title}}<img @mouseover="showToolTip(index, item.title)" @mouseout="hideToolTip(index, item.title)" src="../../assets/images/icons/notice.png" /></h4>
                     <transition name="selectDownUpExtendTop">
                         <div class="tool-tip" v-if="item.showToolTip">
                             <h5 style="font-weight:bold;">{{item.title + '比值'}}</h5>
-                            <p>{{item.title === '专维' ? '逾期未完成/今年即将逾期任务数/总任务' : '当月即将逾期/总任务'}}</p>
+                            <p>{{item.title === '专维' ? '逾期未完成/即将逾期/本年总任务' : '即将逾期/当月总任务'}}</p>
                             <div class="tip-triangle" :style="{left: item.title === '第三方检测' ? '12.5rem': '7.8rem'}"> </div>
                         </div>
                     </transition>
@@ -134,7 +134,7 @@
                                     <span>{{option.cname}}</span>
                                     <span v-if='item.title === "专维"'>
                                         <span>{{option.rptGlsmsStatistics.overdue_unfinished}} /</span>
-                                        <span>{{option.rptGlsmsStatistics.due_num || 0}} /</span>
+                                        <span>{{option.rptGlsmsStatistics.due_num}} /</span>
                                         <span>{{option.rptGlsmsStatistics.total}}</span>
                                     </span>
                                     <span v-else>
@@ -190,7 +190,7 @@ export default {
                 "东南": 'dongnan',
                 "其他": 'Other'
             },
-            provinceCities: {  // 各个区域的的中心坐标 缩放级别
+            provinceCities: {  // 各个区域的的中心坐标 缩放级别 
                 "青岛": {  center: [36.06667, 120.33333], zoom: 8 },
                 "北京": {  center: [39.604882122321174, 116.43660987308282], zoom: 8 },
                 "天津": {  center: [39.130593, 117.260892], zoom: 7 },
@@ -263,7 +263,7 @@ export default {
         ...mapGetters(['plazas', 'plazaId', 'accessLevel'])
     },
     watch: {
-
+         
     },
     created() {
         this.currentTime()
@@ -323,7 +323,6 @@ export default {
          * @Param data 当前点击的项
          */
         createNavpathByData(data) {
-            console.log(data)
             let pathArr = data.path.split('/')
             let newArr = []
             pathArr.forEach(item => {
@@ -341,7 +340,7 @@ export default {
             }
         },
         /**
-         * @Description 通过导航进行导航
+         * @Description 通过导航进行导航 
          * @Param id 所选区域的id
          * @Param index 点击项的序号
          */
@@ -355,8 +354,8 @@ export default {
             this.currentLevel = level
             this.currentZoneData = data
             this.getEventStatusData(level, data.ccode)
-            this.queryPlazaInfoCount(data.ccode, data.level, data.cid)
-            this.getSystemList(data.ccode, data.level)
+            this.queryPlazaInfoCount(data.ccode, data.level, data.cid) 
+            this.getSystemList(data.ccode, data.level) 
             if (level === 1) {
                 this.pantGroupMap(data, this.currentSysId)
             } else if (level === 2) {
@@ -376,13 +375,11 @@ export default {
          * @Param data 返回选中项的数据
          */
         selectProjectItem(ids) {
-            console.log(ids)
             if (!ids && this.currentZoneData) {
                 this.pantGroupMap(this.regulateDistrictData[0], this.systemList[0].smsxt)
                 this.createNavpathByData(this.regulateDistrictData[0])
             }
             let data = this.getDataByCityCcode(ids)
-       
             if (data.level !== 0) {  //  level=0时 plazaId必填
                 this.currentLevel = data.level
                 this.queryPlazaInfoCount(data.ccode, data.level)
@@ -391,6 +388,8 @@ export default {
             } else {
                 let parentNode = this.getDataByCityCcode(data.cparentcode)
                 this.currentLevel = parentNode.level
+                this.queryPlazaInfoCount(parentNode.ccode, parentNode.level)
+                this.getEventStatusData(parentNode.level, parentNode.ccode)
                 this.getSystemList(parentNode.ccode, parentNode.level) 
                 this.pantProjectsMap(parentNode, this.currentSysId)
             }
@@ -405,7 +404,7 @@ export default {
             } else {   // 点击项为广场时 直接跳转到详情页  地图不用响应
              
                 let pathData = {fromGroup: 'true'}
-                let routeData = this.$router.resolve({
+                let routeData = this.$router.resolve({  
                     name:'/home/homePage',
                 })
                 window.open(routeData.href, '_blank');
@@ -414,11 +413,11 @@ export default {
                     plazaName: data.cname,
                     plazaId: data.ccode
                 }
-                this.$store.commit('SETPLAZENAME', data.cname)
+                this.$store.commit('SETPLAZENAME', data.cname) 
                 localStorage.setItem('PLAZAID', data.ccode)
             }
         },
-
+   
         /**
          * @Description  查询项目信息统计数量
          * @Param  ccode  管理分区编码 必填
@@ -505,7 +504,7 @@ export default {
             })
         },
          /**
-        * @Description 展开 维保 第三方检测 专维
+        * @Description 展开 维保 第三方检测 专维 
         * @Param  item 展开的某一项
         */
         toggerPanel(item) {
@@ -540,7 +539,7 @@ export default {
         /**
         *@Description 根据数据计算维保/第三方检测/专维各自颜色条的长度  维保、第三方检测是用即将逾期数据判断;专维是如果有逾期未完成直接标红,如果没有,按照即将逾期的数量显示颜色
         *@Param item 某一项的数据
-        *@Param title 标题
+        *@Param title 标题 
         */
         barStyle(item, title) {
             let bg = ''
@@ -568,11 +567,11 @@ export default {
             }
         },
         /**
-         * @Description 根据数据来返 维保/第三方检测/专维 三个模块中显示条的颜色
+         * @Description 根据数据来返 维保/第三方检测/专维 三个模块中显示条的颜色 
          * @Param num 即将逾期数 / 逾期未完成数
          * @Param total 总数
          */
-        selectColorByNum (num, total) {
+        selectColorByNum (num, total) {    
             let devide =  num / total
             if ( (num > 1 && num <=24  ) || (  devide > 0.1 && devide <=0.2 ) ) {
                 return 0
@@ -582,7 +581,7 @@ export default {
                 return 2
             }
         },
-
+  
         /**
         * @Description 根据数据 判定地图上图标的显示显示颜色
         * @Param data 作为判断的数据
@@ -609,7 +608,7 @@ export default {
             this.times = moment().format('YYYY.MM.DD HH:mm')
             setTimeout(this.currentTime, 1000)
         },
-
+ 
          /**
         * @Description 格式化时间
         * @method param empty
@@ -629,7 +628,7 @@ export default {
         * @method param plazaId 广场id  如果是广场则此参数必填 其他情况下非必填
         */
         getSystemList(ccode, level) {
-            let params = null
+            let params = null 
             if (level === 0) {
                 params = {getParams:{plazaId: ccode, level}}
             } else {
@@ -675,7 +674,7 @@ export default {
          * @Param ccode 管理分区编码 必填
          * @Param level 1集团 2中心 3区域 0广场 必填
          */
-        getEventStatusData(level, ccode) {
+        getEventStatusData(level, ccode) {  
             let params = {
                 getParams: {
                     level,
@@ -752,13 +751,13 @@ export default {
                     }
                 }
             }).addTo(myMaps)
-            if (this.currentLevel === 1) {//1集团
+            if (this.currentLevel === 1) {//1集团 
                 this.pantGroupMap(this.currentZoneData, this.currentSysId)
             } else if (this.currentLevel === 2) {  // 2中心
                 this.pantZonesMap(this.currentZoneData, this.currentSysId)
-            } else if (this.currentLevel === 3) {  // 3区域
+            } else if (this.currentLevel === 3) {  // 3区域 
                 this.pantProjectsMap(this.currentZoneData, this.currentSysId)
-            }
+            }  
         },
         /**
          * @Description 清空地图 并添加全国底图
@@ -821,7 +820,7 @@ export default {
                 let promise = new Promise((resolve, reject) => {
                     let params = {
                         getParams: {
-                            smsxt: this.currentSysId,
+                            smsxt: this.currentSysId,  
                             level: 2,    // 中心
                             ccode: item.ccode
                         }
@@ -894,7 +893,7 @@ export default {
                 let promise = new Promise((resolve, reject) => {
                     let params = {
                         getParams: {
-                            smsxt: this.currentSysId,
+                            smsxt: this.currentSysId, 
                             level: 3,   // 区域
                             ccode: item.ccode
                         }
@@ -902,7 +901,7 @@ export default {
                     querySystemCard(params).then(res => {
                         if (res.result === 'success') {
                             let name = item.cname.split('区域')[0]
-
+                            
                             let num = 0
                             if (res.data) {
                                 let equip = res.data[0]
@@ -962,7 +961,7 @@ export default {
                     let params = {
                         getParams: {
                             plazaId: item.cid,   // 所查对象是广场的时候plazaId必传
-                            smsxt: this.currentSysId,
+                            smsxt: this.currentSysId,  
                             level: 0,   // 广场
                             ccode: item.ccode
                         }
@@ -1028,14 +1027,14 @@ export default {
                 html: type =='group' ? name :`<div>${name}</div>`,
                 className: 'my-leaflet-div-icon',
                 iconSize: 30
-            })
+            }) 
             let circleIcon = L.icon({
                 iconUrl: require(`../../assets/images/icons/${color}.png`),
                 iconSize: [24, 24],
                 iconAnchor: [16, 38],
             });
-
-            if (color  && center) {
+ 
+            if (color  && center) { 
                 let popup = L.popup({closeOnClick:true,offset: [-3,-20]}).setLatLng(center).setContent(contentHtml)
                 let marker = L.marker(center, { icon: textIcon }).addTo(groupLayer)
                 let marker2 = L.marker(center,{ icon: circleIcon} ).addTo(groupLayer)
@@ -1060,10 +1059,10 @@ export default {
                     this.createNavpathByData(data)
                     if (type === 'group') {
                         this.pantZonesMap(data, this.currentSysId)
-                    }
+                    } 
                     if (type === 'zone') {
                         this.pantProjectsMap(data, this.currentSysId)
-                    }
+                    } 
                     if (type === 'project') {
                         let routeData = this.$router.resolve({
                             name:'/home/homePage',
@@ -1074,9 +1073,9 @@ export default {
                             plazaName: data.cname,
                             plazaId: data.ccode
                         }
-                        this.$store.commit('SETPLAZENAME', data.cname)
+                        this.$store.commit('SETPLAZENAME', data.cname) 
                         localStorage.setItem('PLAZAID', data.ccode)
-                    }
+                    }   
                 })
             }
         },
@@ -1110,7 +1109,7 @@ export default {
                 return ''
             }
         },
-
+        
     },
     beforeDestroy() {
         window.removeEventListener('resize', this.reinitalMap)
@@ -1150,7 +1149,7 @@ export default {
         box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
         overflow: hidden;
         .home {
-            width: 285px;
+            width: 265px;
             height: 48px;
             // line-height: 48px;
             text-align: center;
@@ -1301,9 +1300,9 @@ export default {
                 margin-left: 1.2rem;
             }
         }
-
+        
         .system-general {
-            width: 29.4%;
+            width: 25.4%;
             box-sizing: border-box;
             background: white;
             .system-main-title {
@@ -1329,7 +1328,7 @@ export default {
                             display: flex;
                             align-items: center;
                             width: 25%;
-                            padding: 1.2rem 0 1.2rem 1rem ;
+                            padding: 1.2rem 0 1.2rem 1rem ;  
                             border-right: 1px solid #EFF0F1;
                             .img {
                                 height: 2.8rem;
@@ -1436,7 +1435,7 @@ export default {
             }
         }
         .map-box {
-            width: calc(52.6% - 2.4rem);
+            width: calc(56.6% - 2.4rem);
             margin: 0 12px;
             .cards-list {
                 display: flex;
@@ -1485,9 +1484,9 @@ export default {
                 #map {
                     height: 70vh;
                     overflow: hidden;
-
+                    
                     svg {
-                        pointer-events: none;
+                        pointer-events: none; 
                     }
                 }
                 .legend {
@@ -1597,4 +1596,5 @@ export default {
         }
     }
 }
-</style>
+</style> 
+ 

+ 4 - 4
vue.config.js

@@ -4,8 +4,8 @@ module.exports = {
         port: 8090,
         proxy: {
             '/data': {
-                // target: "http://60.205.177.43",
-                target: 'http://10.199.143.126',
+                target: "http://60.205.177.43",
+                // target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,
@@ -34,8 +34,8 @@ module.exports = {
             // 图例库服务
             "/serve": {
                 // target: 'http://192.168.200.87:8088',
-               target: 'http://10.199.143.129:8080',
-                // target: 'http://60.205.177.43:8080',
+            //    target: 'http://10.199.143.129:8080',
+                target: 'http://60.205.177.43:8080',
                 changeOrigin: true,
                 pathRewrite: {
                     "^/serve": "",