Jelajahi Sumber

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

shaun-sheep 4 tahun lalu
induk
melakukan
417d7197b3
39 mengubah file dengan 632 tambahan dan 446 penghapusan
  1. 3 3
      package.json
  2. 1 1
      public/systemConf.js
  3. 20 0
      src/App.vue
  4. 184 184
      src/assets/css/rotation.css
  5. 1 1
      src/assets/css/rotation.less
  6. TEMPAT SAMPAH
      src/assets/imgs/bjj.png
  7. 102 17
      src/components/Legend/src/legend.vue
  8. 2 1
      src/components/editLengend.vue
  9. 0 16
      src/components/floorList.vue
  10. 44 71
      src/components/floorListOther.vue
  11. 4 3
      src/components/floorMap/canvasFun.vue
  12. 21 3
      src/components/floorMap/index.vue
  13. 1 2
      src/components/legendremarks.vue
  14. 2 2
      src/components/menuList.vue
  15. 7 6
      src/components/viewLengend.vue
  16. 23 1
      src/lib/GraphView.js
  17. 26 3
      src/lib/GraphView.ts
  18. 1 0
      src/main.js
  19. 1 0
      src/main.ts
  20. 22 0
      src/store/index.js
  21. 2 2
      src/views/equipment/fenbuPic.vue
  22. 6 17
      src/views/equipment/index.vue
  23. 16 17
      src/views/equipment/table/eqDetaileDialog.vue
  24. 1 1
      src/views/equipment/table/eqListTable.vue
  25. 4 6
      src/views/equipment/table/standTable.vue
  26. 4 4
      src/views/equipment/table/wbTable.vue
  27. 5 5
      src/views/equipment/table/wxTable.vue
  28. 35 29
      src/views/legendLibrary/addForm.vue
  29. 13 15
      src/views/legendLibrary/addLegend.vue
  30. 11 4
      src/views/legendLibrary/index.vue
  31. 3 0
      src/views/legendRules/index.vue
  32. 2 2
      src/views/other/gcfz1.vue
  33. 4 1
      src/views/other/gcfz2.vue
  34. 37 15
      src/views/other/index.vue
  35. 1 1
      src/views/other/zhsxDialog.vue
  36. 7 4
      src/views/other/zhsxOtherTable1.vue
  37. 6 4
      src/views/other/zhsxOtherTable2.vue
  38. 7 3
      src/views/room/index.vue
  39. 3 2
      src/views/room/room5.vue

+ 3 - 3
package.json

@@ -9,10 +9,10 @@
     },
     "dependencies": {
         "@saga-web/base": "2.1.22",
-        "@saga-web/big": "1.0.49",
+        "@saga-web/big": "1.0.58",
         "@saga-web/draw": "2.1.100",
-        "@saga-web/feng-map": "1.0.11",
-        "@saga-web/graph": "2.1.93",
+        "@saga-web/feng-map": "1.0.15",
+        "@saga-web/graph": "2.1.96",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 1 - 1
public/systemConf.js

@@ -29,4 +29,4 @@ var __systemConf = {
         wandaBmGuideUrl: 'http://192.168.200.26:8090/wandaBmGuide/', //管理书地址
     },
 }
-window.__systemConf = __systemConf
+window.__systemConf = __systemConf

+ 20 - 0
src/App.vue

@@ -190,6 +190,26 @@ body ::-webkit-scrollbar-thumb:vertical:hover {
   border: 1px solid #e6e6e6;
 }
 
+#app{
+    //meri-design组件select的字体颜色
+    /deep/ .p-select-fakePlaceholder {
+        span {
+            span {
+                color: #606266 !important;
+                font-size: 13px;
+                font-weight: normal;
+            }
+        }
+    }
+    //element 分页组件背景色
+    /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
+        background:linear-gradient(180deg,rgba(54,156,247,1) 0%,rgba(2,91,170,1) 100%);
+    }
+    //element button 
+   /deep/ .el-button--primary,.p-button-primary{
+      background:linear-gradient(180deg,rgba(54,156,247,1) 0%,rgba(2,91,170,1) 100%);
+   }
+}
 .clearfix::after {
   content: ".";
   display: block;

+ 184 - 184
src/assets/css/rotation.css

@@ -1,260 +1,260 @@
 .overview {
-  background: #f2f5f7;
-  padding: 16px 20px 20px 20px;
-  height: calc(100% - 48px);
-  width: 100%;
+    background: #f2f5f7;
+    padding: 16px 20px 20px 20px;
+    height: calc(100% - 48px);
+    width: 100%;
 }
 .overview .view-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 .overview .view-title nav {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 }
 .overview .view-title nav span:nth-of-type(1) {
-  width: 3px;
-  height: 16px;
-  background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
-  border-radius: 2px;
-  margin-right: 4px;
-  display: inline-block;
+    width: 3px;
+    height: 16px;
+    background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+    border-radius: 2px;
+    margin-right: 4px;
+    display: inline-block;
 }
 .overview .view-title nav span:nth-of-type(2) {
-  height: 24px;
-  font-size: 16px;
-  font-family: MicrosoftYaHeiSemibold;
-  font-weight: bold;
-  color: #1f2429;
+    height: 24px;
+    font-size: 16px;
+    font-family: MicrosoftYaHeiSemibold;
+    font-weight: bold;
+    color: #1f2429;
 }
 .overview .view-title .view-button {
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  line-height: 22px;
-  width: 106px;
-  height: 32px;
-  background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
-  font-size: 14px;
-  color: #ffffff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  border-radius: 4px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    line-height: 22px;
+    width: 106px;
+    height: 32px;
+    background: linear-gradient(180deg, #369cf7 0%, #025baa 100%);
+    font-size: 14px;
+    color: #ffffff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    border-radius: 4px;
 }
 .overview .view-title .view-button img {
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  margin-right: 6px;
+    display: inline-block;
+    height: 16px;
+    width: 16px;
+    margin-right: 6px;
 }
 .overview .view-box {
-  height: calc(100% - 45px);
-  display: flex;
-  justify-content: space-between;
+    height: calc(100% - 32px);
+    display: flex;
+    justify-content: space-between;
 }
 .overview .view-box .view-left {
-  width: 58.5%;
-  margin-right: 10px;
-  display: flex;
-  flex-direction: column;
+    width: 58.5%;
+    margin-right: 10px;
+    display: flex;
+    flex-direction: column;
 }
 .overview .view-box .view-left .lb-left {
-  width: 100%;
-  height: 66%;
-  flex: 1;
-  margin-top: 12px;
-  margin-bottom: 10px;
-  position: relative;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+    width: 100%;
+    height: 66%;
+    flex: 1;
+    margin-top: 12px;
+    margin-bottom: 10px;
+    position: relative;
+    border: 1px solid #ccc;
+    border-radius: 4px;
 }
 .overview .view-box .view-left .lb-left img {
-  width: 100%;
+    width: 100%;
 }
 .overview .view-box .view-left .lb-left .lb-icon {
-  z-index: 99;
-  position: absolute;
-  top: 0;
-  right: 0px;
-  width: 32px;
-  height: 32px;
-  background: rgba(0, 0, 0, 0.6);
-  border-radius: 0px 4px 0px 4px;
-  cursor: pointer;
+    z-index: 99;
+    position: absolute;
+    top: 0;
+    right: 0px;
+    width: 32px;
+    height: 32px;
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: 0px 4px 0px 4px;
+    cursor: pointer;
 }
 .overview .view-box .view-left .lb-left .lb-img {
-  z-index: 101;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  top: 8px;
-  right: 10px;
-  cursor: pointer;
+    z-index: 101;
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    top: 8px;
+    right: 10px;
+    cursor: pointer;
 }
 .overview .view-box .view-left .lb-bottom {
-  height: 34%;
-  background: #ffffff;
-  padding: 12px 16px;
+    height: 34%;
+    background: #ffffff;
+    padding: 12px 16px;
 }
 .overview .view-box .view-left .lb-bottom nav {
-  width: 161px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-  margin-bottom: 12px;
-  border-radius: 4px;
+    width: 161px;
+    height: 32px;
+    display: flex;
+    align-items: center;
+    background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+    margin-bottom: 12px;
+    border-radius: 4px;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(1) {
-  width: 2px;
-  height: 16px;
-  background: #025baa;
-  margin-right: 6px;
-  display: inline-block;
+    width: 2px;
+    height: 16px;
+    background: #025baa;
+    margin-right: 6px;
+    display: inline-block;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(2) {
-  width: 107px;
-  height: 22px;
-  font-size: 14px;
-  font-family: MicrosoftYaHeiSemibold;
-  font-weight: bold;
-  color: #025baa;
+    width: 107px;
+    height: 22px;
+    font-size: 14px;
+    font-family: MicrosoftYaHeiSemibold;
+    font-weight: bold;
+    color: #025baa;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 {
-  height: 24px;
-  font-size: 16px;
-  font-family: MicrosoftYaHeiSemibold;
-  color: #1f2429;
-  line-height: 21px;
-  margin-bottom: 8px;
+    height: 24px;
+    font-size: 16px;
+    font-family: MicrosoftYaHeiSemibold;
+    color: #1f2429;
+    line-height: 21px;
+    margin-bottom: 8px;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 img {
-  width: 16px;
-  height: 16px;
-  margin-right: 3px;
-  margin-top: -3px;
+    width: 16px;
+    height: 16px;
+    margin-right: 3px;
+    margin-top: -3px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 {
-  margin: 16px 0;
-  height: 22px;
-  font-size: 14px;
-  font-family: MicrosoftYaHei;
-  color: #1f2429;
-  line-height: 19px;
-  display: flex;
-  align-items: center;
-  margin-bottom: 12px;
-  margin-top: 0px;
+    margin: 16px 0;
+    height: 22px;
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: #1f2429;
+    line-height: 19px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 12px;
+    margin-top: 0px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 img {
-  width: 16px;
-  height: 16px;
-  margin-right: 3px;
+    width: 16px;
+    height: 16px;
+    margin-right: 3px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom {
-  display: flex;
+    display: flex;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box {
-  width: 50%;
-  display: flex;
+    width: 50%;
+    display: flex;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-left {
-  display: flex;
-  align-items: center;
-  flex-direction: column;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-left span {
-  display: inline-block;
-  width: 56px;
-  margin-right: 8px;
-  font-size: 12px;
-  font-family: MicrosoftYaHei;
-  color: #646c73;
-  line-height: 22px;
+    display: inline-block;
+    width: 56px;
+    margin-right: 8px;
+    font-size: 12px;
+    font-family: MicrosoftYaHei;
+    color: #646c73;
+    line-height: 22px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom .place-box .place-right span {
-  display: inline-block;
-  font-size: 12px;
-  font-family: MicrosoftYaHei;
-  color: #1f2429;
-  line-height: 22px;
+    display: inline-block;
+    font-size: 12px;
+    font-family: MicrosoftYaHei;
+    color: #1f2429;
+    line-height: 22px;
 }
 .overview .view-box .view-right {
-  flex: 1;
+    flex: 1;
 }
 .overview .view-box .view-right .view-right-box {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
 }
 .overview .view-box .view-right .view-right-box .lb-right {
-  flex: 1;
-  height: 47%;
-  margin-top: 12px;
-  margin-bottom: 10px;
-  position: relative;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+    flex: 1;
+    height: 47%;
+    margin-top: 12px;
+    margin-bottom: 10px;
+    position: relative;
+    border: 1px solid #ccc;
+    border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-icon {
-  z-index: 99;
-  position: absolute;
-  top: 0;
-  right: 0px;
-  width: 32px;
-  height: 32px;
-  background: rgba(0, 0, 0, 0.6);
-  border-radius: 0px 4px 0px 4px;
-  cursor: pointer;
+    z-index: 99;
+    position: absolute;
+    top: 0;
+    right: 0px;
+    width: 32px;
+    height: 32px;
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: 0px 4px 0px 4px;
+    cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-img {
-  z-index: 101;
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  top: 8px;
-  right: 10px;
-  cursor: pointer;
+    z-index: 101;
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    top: 8px;
+    right: 10px;
+    cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
-  height: 53%;
-  background: #ffffff;
-  padding: 12px 16px;
-  overflow: hidden;
+    height: 53%;
+    background: #ffffff;
+    padding: 12px 16px;
+    overflow: hidden;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav {
-  width: 161px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-  margin-bottom: 12px;
-  border-radius: 4px;
+    width: 161px;
+    height: 32px;
+    display: flex;
+    align-items: center;
+    background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+    margin-bottom: 12px;
+    border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(1) {
-  width: 2px;
-  height: 16px;
-  background: #025baa;
-  margin-right: 6px;
-  display: inline-block;
+    width: 2px;
+    height: 16px;
+    background: #025baa;
+    margin-right: 6px;
+    display: inline-block;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(2) {
-  width: 107px;
-  height: 22px;
-  font-size: 14px;
-  font-family: MicrosoftYaHeiSemibold;
-  font-weight: bold;
-  color: #025baa;
+    width: 107px;
+    height: 22px;
+    font-size: 14px;
+    font-family: MicrosoftYaHeiSemibold;
+    font-weight: bold;
+    color: #025baa;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom .view-right-bottom {
-  overflow: auto;
+    overflow: auto;
 }
 @media only screen and (min-width: 768px) and (max-width: 1366px) {
 }

+ 1 - 1
src/assets/css/rotation.less

@@ -50,7 +50,7 @@
         }
     }
     .view-box {
-        height: calc(100% - 45px);
+        height: calc(100% - 32px);
         display: flex;
         justify-content: space-between;
         .view-left {

TEMPAT SAMPAH
src/assets/imgs/bjj.png


+ 102 - 17
src/components/Legend/src/legend.vue

@@ -35,13 +35,13 @@
         </div>
 
         <!-- 单独展示新增分布图 -->
-        <div class='edit_map1' v-if='floors.length==0' @click='addFloor'>
-            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+        <el-tooltip effect='dark' v-if='floors.length==0' content='新增分布图' placement='left'>
+            <div class='edit_map1' @click='addFloor'>
                 <!-- <p class='tltk' style='margin-left: -5px;'> -->
-                <img src='@/assets/imgs/xzfbt.png' alt />
+                <img src='@/assets/imgs/bjj.png' alt />
                 <!-- </p> -->
-            </el-tooltip>
-        </div>
+            </div>
+        </el-tooltip>
 
         <div class='edit_map' v-else>
             <!-- 备注编辑器 -->
@@ -57,21 +57,29 @@
             <!-- 新增分布图 -->
             <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length'>
                 <p class='tltk' style='margin-left: -5px;' @click='addFloor'>
-                    <img src='@/assets/imgs/xzfbt.png' alt />
+                    <img src='@/assets/imgs/bjj.png' alt />
                 </p>
             </el-tooltip>
             <!-- 编辑分布图 -->
+
+            <!-- 有修改权限 -->
             <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' :content='editTips' placement='left'>
-                <span class='edit-icon' @click='goToEditer'>
+                <span class='edit-icon corner-con' @click='goToEditer'>
                     <img src='@/assets/imgs/bjs.png' alt />
+                    <!-- 角标 -->
+                    <span v-if='draftNum' class='corner' :style='{lineHeight : draftNum > 99 ?"10px":"18px"}'>{{draftNum > 99 ? '...' : draftNum}}</span>
                 </span>
             </el-tooltip>
-            <span v-else class='edit-icon2'>
+
+            <!-- 无修改权限 -->
+            <span v-else class='edit-icon2 corner-con'>
                 <img src='@/assets/imgs/bjs.png' alt />
+                <!-- 角标 -->
+                <span v-if='draftNum' class='corner' :style='{lineHeight : draftNum > 99 ?"10px":"18px"}'>{{draftNum > 99 ? '...' : draftNum}}</span>
             </span>
         </div>
         <div class='select-floor' v-if='isFloor'>
-            <p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
+            <p class='p1'>{{`请选择需要创建"${categoryId=='FZQZL'?'分水器支路分布图':'消防泵房引出管路分布图'}"的楼层`}}</p>
             <p class='p2'>
                 <Select width='240' tipPlace='top' v-model='floor' caption='楼层:' size='mini' :selectdata='floorSelectAble' :placeholder='"请选择"'></Select>
             </p>
@@ -90,7 +98,7 @@ import legendRemarks from '@/components/legendremarks'
 import lengendEdit from '@/components/editLengend'
 import { mapGetters } from 'vuex'
 import bus from '@/utils/bus.js'
-import { queryStatis, updateStatis, queryRead } from '@/api/public.js'
+import { queryStatis, updateStatis, queryRead, queryDraftNum } from '@/api/public.js'
 
 export default {
     name: 'Legend',
@@ -98,8 +106,8 @@ export default {
         return {
             remarksText: '', //查询出来的备注
             text1:
-                '<p>1.主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
-            text2: '<p>2.图例后×的数字,代表此位置的数量</p>',
+                '<p>主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
+            text2: '<p>图例后×的数字,代表此位置的数量</p>',
             text2: '',
             show: true,
             show2: false,
@@ -119,7 +127,10 @@ export default {
             floor: '', //传的楼层
             floorName: '',
             planNum: '', //主要设备房
-            typeNum: ''
+            typeNum: '',
+            draftNum: null, //草稿箱数量, 编辑器修改icon右上角显示
+            interval: 10 * 60 * 1000, //定时器时长,默认 10分钟
+            timer: null //保存定时器
         }
     },
     computed: {
@@ -151,6 +162,33 @@ export default {
     },
     components: { lengendView, legendRemarks, lengendEdit },
     methods: {
+        /**
+         * @name getDraftNum
+         * @description 查询草稿箱数量
+         */
+        async getDraftNum() {
+            let res = null,
+                floorId = this.$cookie.get('floorMapId'),
+                data = {
+                    Distinct: true,
+                    Filters: `projectId='${this.plazaId}';isPub=false;floorId='${floorId}'`,
+                    PageNumber: 1,
+                    PageSize: 500,
+                    Projection: ['floorId']
+                }
+            try {
+                // 调用接口
+                res = await queryDraftNum(data)
+            } catch (error) {
+                console.error(error)
+            }
+            if (!res) {
+                this.draftNum = null
+                return false
+            }
+            // 草稿箱总条数使用 res.Total, 不使用 Content数组的长度
+            this.draftNum = res.Total || null
+        },
         formatFloor() {
             this.floorSelectAble = []
             this.floorSelectAble = this.floorSelect.filter(item => {
@@ -366,10 +404,20 @@ export default {
     },
     mounted() {
         this.init()
+        // 定时查询草稿箱数量
+        this.getDraftNum() //首次查询
+        this.timer = setInterval(() => {
+            this.getDraftNum()
+        }, this.interval)
+        // 页面销毁前,清除定时器
+        this.$once('hook:beforeDestroy', () => {
+            clearInterval(this.timer)
+        })
     }
 }
 </script>
 <style lang="less" scoped>
+@red: rgb(255, 0, 0); //红色
 .legend-container {
     position: relative;
     top: -15px;
@@ -462,9 +510,29 @@ export default {
             margin-top: -4px;
         }
     }
+
     .edit-icon {
         cursor: pointer;
     }
+    /** 右下角修改,角标样式 */
+    .corner-con {
+        position: relative;
+        .corner {
+            position: absolute;
+            right: -8px;
+            top: 0;
+            display: inline-block;
+            width: 18px;
+            height: 18px;
+            background: @red;
+            border-radius: 90px;
+            font-size: 12px;
+            text-align: center;
+            line-height: 18px;
+            color: #fff;
+        }
+    }
+
     .bjtk {
         width: 40px;
         height: 40px;
@@ -487,6 +555,7 @@ export default {
         margin-bottom: 10px;
         display: none;
         cursor: pointer;
+        border: 1px solid #eee;
     }
 }
 .edit_map:hover .tltk {
@@ -500,6 +569,17 @@ export default {
     bottom: 28px;
     right: 30px;
     z-index: 1;
+    width: 48px;
+    height: 48px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.2);
+    border-radius: 90px;
+    text-align: center;
+    img {
+        display: block;
+        margin-top: 12px;
+        margin-left: 12px;
+    }
     .select-floor {
         width: 288px;
         height: 220px;
@@ -518,9 +598,9 @@ export default {
     border-radius: 2px;
     border: 1px solid rgba(228, 229, 231, 1);
     position: fixed;
-    bottom: 40px;
-    right: 70px;
-    padding: 24px;
+    bottom: 26px;
+    right: 84px;
+    padding: 24px 24px 20px 24px;
     .p1 {
         font-size: 14px;
         font-family: MicrosoftYaHei;
@@ -566,7 +646,12 @@ export default {
     }
     .el-table td,
     .el-table th {
-        padding: 6px 0;
+        padding: 3px 0;
+    }
+    .el-checkbox__input.is-checked .el-checkbox__inner,
+    .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        border-radius: 2px;
     }
 }
 </style>

+ 2 - 1
src/components/editLengend.vue

@@ -54,7 +54,7 @@
                         <el-table-column prop label='单位'>
                             <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                         </el-table-column>
-                        <el-table-column prop label='图例'>
+                        <el-table-column prop label='图例' align='center'>
                             <template slot-scope='{row}'>
                                 <div v-if='row.Url' class='Url-img'>
                                     <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
@@ -229,6 +229,7 @@ export default {
         width: 20px;
         height: 22px;
         line-height: 20px;
+        margin: 0 auto;
         img {
             width: 100%;
             height: 100%;

+ 0 - 16
src/components/floorList.vue

@@ -76,15 +76,6 @@ export default {
     mounted() {
         this.init()
     },
-    watch: {
-        // 监听floorsArr的变化
-        // '$store.state.floorsArr': {
-        //     handler(newV, oldV) {
-        //         newV && this.init()
-        //     },
-        //     deep: true
-        // }
-    },
     methods: {
         mousedown() {
             this.startTime = new Date()
@@ -231,19 +222,12 @@ export default {
         padding: 6px 4px;
         text-align: center;
         .floor-out {
-            // max-height: 260px;
             overflow: hidden;
-            // overflow-y: auto;
             position: relative;
-            // &::-webkit-scrollbar {
-            //     display: none;
-            // }
 
             .floor-center {
                 transition: all linear 0.8s;
                 .floor-item {
-                    // border: 1px solid blue;
-                    // width: 36px;
                     line-height: 28px;
                     height: 28px;
                     cursor: pointer;

+ 44 - 71
src/components/floorListOther.vue

@@ -6,19 +6,21 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div v-if='floorsArr.length>5'>
-                <i
-                    class='el-icon-caret-top icon-top'
+            <div class='icon-top' v-if='floorsArr.length>8'>
+                <img
                     :class='{disabled:currentFloorId == floorsArr[0].seq }'
                     v-if='showT'
                     @click='changeFloor(1)'
                     @mousedown='mousedown'
                     @mouseup='mouseup'
-                ></i>
-                <i class='el-icon-caret-top icon-top' :class='{disabled:currentFloorId == floorsArr[0].seq }' v-else style='color:#ccc'></i>
+                    src='@/assets/imgs/iconBlackTop.png'
+                    alt
+                />
+                <img :class='{disabled:currentFloorId == floorsArr[0].seq }' v-else src='@/assets/imgs/iconLightTop.png' alt />
             </div>
             <div class='floor-out'>
-                <div class='floor-center' :style='{ marginTop : marginTop }'>
+                <!-- :style='{ marginTop : marginTop }' -->
+                <div class='floor-center'>
                     <div
                         class='floor-item'
                         :class='item.seq == currentFloorId?"isActive":""'
@@ -28,19 +30,15 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div v-if='floorsArr.length>5'>
-                <i
-                    class='el-icon-caret-bottom icon-bottom'
+            <div class='icon-bottom' v-if='floorsArr.length>8'>
+                <img
                     :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }'
                     v-if='showB'
                     @click='changeFloor(-1)'
-                ></i>
-                <i
-                    class='el-icon-caret-bottom icon-bottom'
-                    :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }'
-                    v-else
-                    style='color:#ccc'
-                ></i>
+                    src='@/assets/imgs/iconBlackBottom.png'
+                    alt
+                />
+                <img :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }' v-else src='@/assets/imgs/iconLightBottom.png' alt />
             </div>
         </div>
     </div>
@@ -70,38 +68,14 @@ export default {
     props: {
         floorsArr: {
             type: Array
-            /*  default: () => {
-                return [
-                    { name: '第6层', code: 'F6', gname: 'f6', gcode: '6F', seq: 600 },
-                    { name: '第5层', code: 'F5', gname: 'f5', gcode: '5F', seq: 500 },
-                    { name: '第4层', code: 'F4', gname: 'f4', gcode: '4F', seq: 400 },
-                    { name: '第3层', code: 'F3', gname: 'f3', gcode: '3F', seq: 300 },
-                    { name: '第2层', code: 'F2', gname: 'f2', gcode: '2F', seq: 200 },
-                    { name: '第1层', code: 'F1', gname: 'f1', gcode: '1F', seq: 100 },
-                    { name: '地下1层', code: 'B1', gname: 'b1', gcode: 'B1', seq: -100 },
-                    { name: '地下2层', code: 'B2', gname: 'b2', gcode: 'B2', seq: -200 },
-                    { name: '地下3层', code: 'B3', gname: 'b3', gcode: 'B3', seq: -300 },
-                    { name: '地下4层', code: 'B4', gname: 'b4', gcode: 'B4', seq: -400 }
-                ]
-            } */
         }
     },
     mounted() {
         this.init()
     },
-    watch: {
-        // 监听floorsArr的变化
-        // '$store.state.floorsArr': {
-        //     handler(newV, oldV) {
-        //         newV && this.init()
-        //     },
-        //     deep: true
-        // }
-    },
     methods: {
         mousedown() {
             this.startTime = new Date()
-            console.log()
         },
         mouseup() {
             this.endTime = new Date()
@@ -239,57 +213,56 @@ export default {
         box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
         border-radius: 2px;
         position: relative;
-        padding: 28px 4px;
+        padding: 6px 4px;
         text-align: center;
         .floor-out {
             overflow: hidden;
-            // overflow-y: auto;
             position: relative;
-            // &::-webkit-scrollbar {
-            //     display: none;
-            // }
-
             .floor-center {
                 transition: all linear 0.8s;
                 .floor-item {
-                    width: 36px;
-                    height: 32px;
+                    line-height: 28px;
+                    height: 28px;
                     cursor: pointer;
+                    position: relative;
+                    &::after {
+                        position: absolute;
+                        left: 50%;
+                        margin-left: -20%;
+                        bottom: -6px;
+                        content: '';
+                        width: 14px;
+                        height: 1px;
+                        background: rgba(195, 199, 203, 1);
+                        border: 0px solid rgba(228, 229, 231, 1);
+                    }
+                    & + .floor-item {
+                        margin-top: 10px;
+                    }
                 }
             }
         }
 
         .icon-top {
-            text-align: center;
-            font-size: 18px;
-            margin: 0 auto;
-            display: flex;
-            justify-content: center;
-            position: absolute;
-            top: 0;
-            right: 0;
-            width: 100%;
-            cursor: pointer;
-            line-height: 26px;
+            height: 18px;
+            img {
+                width: 18px;
+                height: 100%;
+                margin-top: -10px;
+            }
         }
         .icon-bottom {
-            text-align: center;
-            font-size: 18px;
-            margin: 0 auto;
-            display: flex;
-            justify-content: center;
-            position: absolute;
-            bottom: 0;
-            right: 0;
-            width: 100%;
-            cursor: pointer;
-            line-height: 26px;
+            height: 18px;
+            img {
+                width: 18px;
+                height: 100%;
+                margin-top: -10px;
+            }
         }
         .isActive {
             border-radius: 4px;
             color: #025baa;
             background: #e1f2ff;
-            line-height: 32px;
         }
     }
     .disabled {

+ 4 - 3
src/components/floorMap/canvasFun.vue

@@ -15,10 +15,10 @@
             <div class='small-block' @click='showText'>
                 <i>
                     <el-tooltip v-if='isShow' effect='dark' content='隐藏店铺名称' placement='top'>
-                        <img src='../../assets/imgs/er.png' alt />
+                        <img src='../../assets/imgs/yl.png' alt />
                     </el-tooltip>
                     <el-tooltip v-else effect='dark' content='显示店铺名称' placement='top'>
-                        <img src='../../assets/imgs/yl.png' alt />
+                        <img src='../../assets/imgs/er.png' alt />
                     </el-tooltip>
                 </i>
             </div>
@@ -102,7 +102,8 @@ export default {
             this.isShow = !this.isShow
             this.$emit('showText', this.isShow)
         }
-    }
+    },
+    mounted() {}
 }
 </script>
 <style lang="less" scoped>

+ 21 - 3
src/components/floorMap/index.vue

@@ -17,7 +17,7 @@ import { FloorView } from '@/lib/FloorView'
 import { FloorScene } from '@/lib/FloorScene'
 import RoomBox from '@/views/room/index'
 import canvasFun from '@/components/floorMap/canvasFun'
-import { readGroup, queryStatis } from '@/api/public'
+import { readGroup, queryStatis, queryBrand } from '@/api/public'
 import { STopologyParser } from '@/lib/parsers/STopologyParser'
 import { mapGetters, mapActions } from 'vuex'
 import { SImageItem } from '@saga-web/graph/lib'
@@ -61,14 +61,15 @@ export default {
     },
     components: { RoomBox, canvasFun },
     computed: {
-        ...mapGetters(['plazaId', 'fmapID', 'haveFengMap'])
+        ...mapGetters(['plazaId', 'fmapID', 'haveFengMap', 'bunkObj'])
     },
     methods: {
         ...mapActions(['getfmapID']),
         init(floorid) {
-            this.loading = true
+            // this.loading = true
             this.floorid = floorid
             this.mapSize()
+            this.$refs.canvasFun.isShow = false
             setTimeout(() => {
                 if (this.haveFengMap) {
                     this.clearGraphy()
@@ -81,6 +82,16 @@ export default {
                 }
             }, 100)
         },
+        // 铺位
+        query(arr) {
+            let data = {
+                plazaId: '1001145'
+            }
+            // let postParams = arr
+            queryBrand({ data }).then(res => {
+                console.log(res)
+            })
+        },
         parserData(floor) {
             if (floor == 'g80') {
                 // 屋顶
@@ -106,6 +117,11 @@ export default {
                         this.fParser.spaceList.forEach(t => {
                             //   t.selectable = true;
                             this.scene.addItem(t)
+                            if (t.data.Name && this.bunkObj[t.data.Name]) {
+                                t.name = this.bunkObj[t.data.Name].detailtype
+                            } else {
+                                t.name = ''
+                            }
                         })
                         this.fParser.wallList.forEach(t => this.scene.addItem(t))
                         this.fParser.virtualWallList.forEach(t => this.scene.addItem(t))
@@ -223,6 +239,7 @@ export default {
             let scale = this.view.scale
             this.view.scaleByPoint(val / scale, this.canvasWidth / 2, this.canvasHeight / 2)
         },
+        // 小眼睛控制显示铺位名称
         showText(val) {
             // this.topologyParser.zoneLegendList.forEach(t => {
             //     t.showText = val
@@ -302,6 +319,7 @@ export default {
     mounted() {
         this.mapSize()
         this.getEvent()
+        console.log('bunkObjbunkObjbunkObj', this.bunkObj)
     },
     created() {
         this.urlMsg = {

+ 1 - 2
src/components/legendremarks.vue

@@ -51,7 +51,6 @@ export default {
         },
         // 更新底图备注
         markUpdate(val) {
-            console.log(val)
             let params = {
                 postParams: {
                     graphId: this.$cookie.get('graphId'),
@@ -60,7 +59,7 @@ export default {
                 }
             }
             updateRead(params).then(res => {
-                console.log('更新备注', res)
+                // console.log('更新备注', res)
                 this.$message({
                     showClose: true,
                     message: '更新成功',

+ 2 - 2
src/components/menuList.vue

@@ -101,7 +101,7 @@ export default {
             let res = null,
                 data = {
                     Distinct: true,
-                    Filters: `projectId=${this.plazaId};isPub=false`,
+                    Filters: `projectId='${this.plazaId}';isPub=false`,
                     PageNumber: 1,
                     PageSize: 500,
                     Projection: ['floorId']
@@ -188,7 +188,7 @@ export default {
     font-size: 16px;
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
-    overflow: hidden;
+    // overflow: hidden;
     .home {
         width: 265px;
         height: 48px;

+ 7 - 6
src/components/viewLengend.vue

@@ -4,7 +4,7 @@
 *@info:图例展示状态
 */
 <template>
-    <div class='view'>
+    <div class='views'>
         <div v-if='systemName=="土建系统"'>
             <el-table
                 ref='dataTable'
@@ -18,7 +18,7 @@
                         <span>{{(row.Properties && row.Properties.ItemExplain)?row.Properties.ItemExplain:'--'}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop label='图例' width='60'>
+                <el-table-column prop label='图例' width='60' align='center'>
                     <template slot-scope='{row}'>
                         <div class='scpz-img' :style='`background:${row.Properties.FillColor};border:1px solid ${row.Properties.StrokeColor}`'></div>
                     </template>
@@ -35,7 +35,7 @@
                 @selection-change='handleSelectionChange'
                 :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
             >
-                <el-table-column type='selection' width='45'></el-table-column>
+                <el-table-column type='selection' width='45' align='center'></el-table-column>
                 <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
                     <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                 </el-table-column>
@@ -48,7 +48,7 @@
                 <el-table-column prop='Unit' label='单位' width='70'>
                     <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='Url' label='图例' width='55'>
+                <el-table-column prop='Url' label='图例' width='55' align='center'>
                     <template slot-scope='{row}'>
                         <div v-if='row.Url' class='Url-img'>
                             <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
@@ -114,7 +114,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.view {
+.views {
     .swich {
         display: flex;
         justify-content: flex-end;
@@ -151,6 +151,7 @@ export default {
         width: 20px;
         height: 22px;
         line-height: 20px;
+        margin: 0 auto;
         img {
             width: 100%;
             height: 100%;
@@ -159,7 +160,7 @@ export default {
 }
 </style>
 <style lang="less">
-.view {
+.views {
     .el-input--mini .el-input__inner {
         width: 50px;
     }

+ 23 - 1
src/lib/GraphView.js

@@ -2,7 +2,7 @@ import { SCanvasView, SColor } from "@saga-web/draw/lib";
 export class GraphView extends SCanvasView {
     constructor(id) {
         super(id);
-        // 0 :line 1:area
+        // 0 :line 1:area 2:img
         this._type = 0;
         // 线条颜色
         this._strokecolor = "";
@@ -12,6 +12,8 @@ export class GraphView extends SCanvasView {
         this._lineType = "";
         //线条粗细
         this._lineWidth = 1;
+        /** 图片地址 */
+        this._url = "";
     }
     get type() {
         return this._type;
@@ -48,6 +50,20 @@ export class GraphView extends SCanvasView {
         this._lineWidth = v;
         this.update();
     }
+    get url() {
+        return this._url;
+    }
+    set url(v) {
+        this._url = v;
+        this.img = new Image();
+        this.img.src = v;
+        this.img.onload = () => {
+            this.update();
+        };
+        this.img.onerror = (e) => {
+            this.update();
+        };
+    }
     onDraw(canvas) {
         canvas.clearRect(0, 0, this.width, this.height);
         canvas.pen.lineWidth = this.lineWidth;
@@ -65,5 +81,11 @@ export class GraphView extends SCanvasView {
         else if (this.type == 1) {
             canvas.drawRect(50, 28, 100, 57);
         }
+        else if (this.type == 2) {
+            if (this.img) {
+                console.log(this.img);
+                canvas.drawImage(this.img, 86, 43, 28, 28);
+            }
+        }
     }
 }

+ 26 - 3
src/lib/GraphView.ts

@@ -1,7 +1,7 @@
 import { SCanvasView, SColor, SPainter } from "@saga-web/draw/lib"
 
 export class GraphView extends SCanvasView {
-    // 0 :line 1:area
+    // 0 :line 1:area 2:img
     _type: number = 0;
     get type(): number {
         return this._type
@@ -41,7 +41,6 @@ export class GraphView extends SCanvasView {
     }
 
     //线条粗细
-
     private _lineWidth: number = 1;
     get lineWidth(): number {
         return this._lineWidth
@@ -51,6 +50,26 @@ export class GraphView extends SCanvasView {
         this.update()
     }
 
+    /** 图片dom */
+    img: CanvasImageSource | undefined;
+
+    /** 图片地址 */
+    private _url: string = "";
+    get url(): string {
+        return this._url;
+    }
+    set url(v: string) {
+        this._url = v;
+        this.img = new Image();
+        this.img.src = v;
+        this.img.onload = (): void => {
+            this.update();
+        };
+        this.img.onerror = (e): void => {
+            this.update();
+        };
+    }
+
     constructor(id: string) {
         super(id)
     }
@@ -69,8 +88,12 @@ export class GraphView extends SCanvasView {
         if (this.type == 0) {
             canvas.drawLine(80, 57, 120, 57);
         } else if (this.type == 1) {
-
             canvas.drawRect(50, 28, 100, 57);
+        } else if (this.type == 2) {
+            if (this.img) {
+                console.log(this.img)
+                canvas.drawImage(this.img, 86, 43, 28, 28)
+            }
         }
     }
 }

+ 1 - 0
src/main.js

@@ -44,6 +44,7 @@ router.beforeEach((to, from, next) => __awaiter(void 0, void 0, void 0, function
     if (!store.state.isrequestAuth) {
         yield store.dispatch('getUserInfo', username);
         yield store.dispatch('getFloors');
+        yield store.dispatch('getBrand');
     }
     next();
 }));

+ 1 - 0
src/main.ts

@@ -37,6 +37,7 @@ router.beforeEach(async (to, from, next) => {
     if (!store.state.isrequestAuth) {
         await store.dispatch('getUserInfo', username)
         await store.dispatch('getFloors')
+        await store.dispatch('getBrand')
     }
     next()
 })

+ 22 - 0
src/store/index.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import { login, queryFloor, queryfmapID } from '@/api/login.js'
+import { queryBrand } from '@/api/public.js'
+
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
@@ -22,6 +24,7 @@ export default new Vuex.Store({
         scpzTable: [], //土建系统图例展示
         legendTable: [], //除土建系统图例展示
         remarksText: '', //备注
+        bunkObj: {}, // 铺位名称
     },
     getters: {
         floorsArr: (state) => state.floorsArr,
@@ -34,6 +37,7 @@ export default new Vuex.Store({
         scpzTable: (state) => state.scpzTable,
         legendTable: (state) => state.legendTable,
         remarksText: (state) => state.remarksText,
+        bunkObj: (state) => state.bunkObj,
     },
     mutations: {
         // 设置是否登陆校验
@@ -79,6 +83,9 @@ export default new Vuex.Store({
         SETREMARKSTEXT(state, data) {
             state.remarksText = data
         },
+        SETBUNKOBJ(state, data) {
+            state.bunkObj = data
+        },
     },
     actions: {
         // 获取项目列表、userId
@@ -109,6 +116,21 @@ export default new Vuex.Store({
                 context.commit('SETMAPID', `${context.state.plazaId}_${res.mapVersion}`)
             })
         },
+        async getBrand(context) {
+            let data = {
+                plazaId: context.state.plazaId,
+            }
+            await queryBrand({ data }).then((res) => {
+                let obj = {}
+                if (res.data.data) {
+                    let Data = res.data.data
+                    Data.forEach((i) => {
+                        obj[i.bunkdesc] = i
+                    })
+                }
+                context.commit('SETBUNKOBJ', obj)
+            })
+        },
     },
     modules: {},
 })

+ 2 - 2
src/views/equipment/fenbuPic.vue

@@ -31,7 +31,7 @@ export default {
             loadName: '',
             type: '',
             floors: [],
-            modalHeight: 500,   //适配底图
+            modalHeight: 500 //适配底图
         }
     },
     props: ['typecode'],
@@ -88,7 +88,7 @@ export default {
                     })
                 }
                 this.floorInfo = this.floors[0]
-                this.init()
+                // this.init()
             })
         },
         init() {

+ 6 - 17
src/views/equipment/index.vue

@@ -20,7 +20,7 @@
                 <div class='eq-right-bottom'>
                     <div class='title-box'>
                         <div class='eq-title'>
-                            <span class="span1">{{floorInfo.code}}</span>
+                            <span class='span1'>{{floorInfo.code}}</span>
                         </div>
                     </div>
                     <div class='eq-content'>
@@ -54,7 +54,7 @@ import floorMap from '@/components/floorMap/index.vue'
 import eqDialog from './eqDialog'
 import editList from '@/components/edit.vue'
 import { system } from '@/utils/plugins/components.js'
-import { queryPic, queryBrand } from '@/api/public.js'
+import { queryPic } from '@/api/public.js'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -82,15 +82,6 @@ export default {
     },
     components: { floorList, eqDialog, floorMap, editList },
     methods: {
-        query() {
-            let data = {
-                plazaId: '1000423'
-            }
-            // let postParams = []
-            queryBrand({ data }).then(res => {
-                console.log(res)
-            })
-        },
         // 查询tab页
         tabSyatem(item) {
             this.systemId = item.id
@@ -134,9 +125,8 @@ export default {
                 plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
-                console.log('附加数据', res)
+                // console.log('附加数据', res)
                 this.fqPic = res.data
-                console.log(this.fqPic)
             })
         },
         init() {
@@ -161,7 +151,6 @@ export default {
         this.everySystem = this.system[0].children
         this.init()
         this.$refs.floorMap.init(this.floorInfo.gname)
-        this.query()
     },
     computed: {
         ...mapGetters(['floorsArr', 'plazaId'])
@@ -266,9 +255,9 @@ export default {
                             margin-right: 10px;
                             margin-top: 8px;
                         }
-                        .span1{
-                                position: absolute;
-                                top: 3px;
+                        .span1 {
+                            position: absolute;
+                            top: 3px;
                         }
                     }
                 }

+ 16 - 17
src/views/equipment/table/eqDetaileDialog.vue

@@ -13,20 +13,20 @@
                 clearable
                 @blur='queryTableList'
             ></el-input>
-            <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
+            <Select v-model='sbglgs' width='180' tipPlace='top' caption='管理归属' size='small' :selectdata='sbglgsOption' @change='queryTableList'></Select>
             <Select
                 width='146'
                 style='margin: 0 12px;'
                 v-model='status'
                 tipPlace='top'
-                caption='设备状态'
+                caption='设备状态'
                 size='small'
                 :selectdata='statusOption'
                 @change='queryTableList'
             ></Select>
             <el-input
                 placeholder='搜索品牌、型号'
-                style='width:192px;margin-right:12px'
+                style='width:180px;margin-right:12px'
                 size='small'
                 clearable
                 prefix-icon='el-icon-search'
@@ -34,7 +34,7 @@
                 @blur='queryTableList'
             ></el-input>
             <Select
-                width='120'
+                width='150'
                 style='margin-right:12px;'
                 v-model='floor'
                 tipPlace='top'
@@ -43,16 +43,16 @@
                 :selectdata='floorSelect'
                 @change='queryTableList'
             ></Select>
-            <el-input placeholder='搜索安装位置' clearable style='width:192px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='wzjc'></el-input>
+            <el-input placeholder='搜索安装位置' clearable style='width:180px;margin-right:12px' size='small' prefix-icon='el-icon-search' v-model='wzjc'></el-input>
             <!-- 多余的筛选 -->
             <input-dialog :type='1' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
-            <el-table-column type='index' label='序号' width='60' :index="indexMethod"></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width="150">
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable width="80">
+            <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='80'>
@@ -61,22 +61,22 @@
             <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sb_status' label='设备状态' width="80">
+            <el-table-column prop='sb_status' label='设备状态' width='80'>
                 <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width="80">
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width="80">
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
             <el-table-column prop='floor' sortable label='楼层' width='80'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width="150">
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width="150">
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
             <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable>
@@ -136,7 +136,6 @@ export default {
     },
     props: ['row', 'major'],
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
         this.queryTableList()
         this.tabFind()
     },
@@ -278,13 +277,13 @@ export default {
             },
             deep: true
         },
-        sbglgs(){
+        sbglgs() {
             this.queryTableList()
         },
-        status(){
+        status() {
             this.queryTableList()
         },
-        floor(){
+        floor() {
             this.queryTableList()
         }
     }

+ 1 - 1
src/views/equipment/table/eqListTable.vue

@@ -25,7 +25,7 @@
                 @cancel='getList'
                 v-model='floor'
                 style='margin-right:12px;'
-                width='120'
+                width='160'
                 tipPlace='top'
                 caption='楼层 :'
                 :selectdata='floorSelect'

+ 4 - 6
src/views/equipment/table/standTable.vue

@@ -25,7 +25,7 @@
                 @cancel='getList'
                 v-model='floor'
                 style='margin-right:12px;'
-                width='120'
+                width='160'
                 tipPlace='top'
                 caption='楼层 :'
                 :selectdata='floorSelect'
@@ -55,10 +55,10 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层' width='100'>
+            <el-table-column prop='floor' label='楼层' width='180'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width="300">
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -107,10 +107,9 @@ export default {
     },
     methods: {
         indexMethod(index) {
-            return (this.currentPage-1) * this.size + index +1
+            return (this.currentPage - 1) * this.size + index + 1
         },
         rowHandle(row) {
-            console.log(row)
             this.innerVisible = true
             this.row = row
         },
@@ -172,7 +171,6 @@ export default {
             }
         },
         floor(newV, oldV) {
-            console.log(newV, oldV)
             this.getList()
         }
     },

+ 4 - 4
src/views/equipment/table/wbTable.vue

@@ -24,9 +24,9 @@
                 @change='getList'
                 v-model='ischange'
                 style='margin-right:12px'
-                width='200'
+                width='220'
                 tipPlace='top'
-                caption='是否更换配件信息 :'
+                caption='是否更换:'
                 :selectdata='changeOption'
             ></Select>
             <!-- placeholder='选择填报时间' -->
@@ -99,10 +99,10 @@
                     <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='130'>
+            <el-table-column prop='reportdate' label='填报时间' width='140'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='130'>
+            <el-table-column prop='sjjssj' label='验收时间' width='140'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>

+ 5 - 5
src/views/equipment/table/wxTable.vue

@@ -24,9 +24,9 @@
                 @change='getList'
                 style='margin-right:12px;'
                 v-model='ischange'
-                width='200'
+                width='220'
                 tipPlace='top'
-                caption='是否更换配件信息 :'
+                caption='是否更换:'
                 :selectdata='changeOption'
             ></Select>
             <!-- placeholder='选择填报时间' -->
@@ -89,7 +89,7 @@
                 <el-table-column prop='cost' label='费用(万元)' width='80'>
                     <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width="100">
+                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>
                     <template slot-scope='{row}'>{{row.source || '--'}}</template>
                 </el-table-column>
             </el-table-column>
@@ -99,10 +99,10 @@
                     <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='130'>
+            <el-table-column prop='reportdate' label='填报时间' width='140'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='130'>
+            <el-table-column prop='sjjssj' label='验收时间' width='140'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>

+ 35 - 29
src/views/legendLibrary/addForm.vue

@@ -42,11 +42,7 @@
             <div v-show='ruleForm.Type=="Zone" || ruleForm.Type=="Image" || ruleForm.Type =="Line"'>
                 <div style='color:#646C73'>展示预览</div>
                 <div class='input-right' ref='graph'>
-                    <div v-show=' ruleForm.Type=="Image" && ruleForm.Url' class='input-right'>
-                        <img :key='key' :src='`/serve/topology-wanda/Picture/query/${ruleForm.Url}`' alt />
-                        <!-- {{ruleForm.Url}} -->
-                    </div>
-                    <canvas id='canvas' :width='canvasWidth' :height='canvasHeight' v-show='!(ruleForm.Type=="Image" && ruleForm.Url)'></canvas>
+                    <canvas id='canvas' :width='canvasWidth' :height='canvasHeight'></canvas>
                 </div>
             </div>
         </div>
@@ -105,7 +101,7 @@
         <div v-if='ruleForm.Type!="None"' class='form4'>
             <div class='form4-top'>
                 <span class='form4-span1'>专业/设备、位置类型</span>
-                <span class='form4-span3'>铺位可视化typeid</span>
+                <span class='form4-span3' v-if='ruleForm.Type!="Line"'>铺位可视化typeid</span>
             </div>
             <div class='form3-bottom'>
                 <span class='device-list'>
@@ -125,6 +121,7 @@
                     />
                 </span>
                 <TreeSelect
+                    v-if='ruleForm.Type!="Line"'
                     tipPlace='top'
                     width='200'
                     :notNull='true'
@@ -217,9 +214,9 @@ export default {
             view: null,
             scene: null,
             typeVisualization: [],
-
             // majorList: [], //专业
             deviceList: [],
+            formData: [], //上传乳品的formdata
             key: 1,
             InfoLocals: undefined, //工程信息化
             // InfoSystems: undefined, //工程信息化专业/系统
@@ -240,23 +237,14 @@ export default {
             // console.log(file, fileList, 'file')
             this.ruleForm.Url = ''
         },
+        //获取上传图片的信息 canvas得到图的url
         getFile(file) {
-            // let imgSrc = document.querySelector('.input-right>img')
-            // console.log(imgSrc)
             this.file = file.file
-            var formData = new FormData()
-            formData.append('file', file.file)
-            if (this.ruleForm.Url) {
-                formData.append('uid', this.ruleForm.Url)
+            var reader = new FileReader()
+            reader.readAsDataURL(this.file)
+            reader.onload = e => {
+                this.view.url = e.target.result
             }
-            let postParams = formData
-            uploadImg({ postParams }).then(res => {
-                if (res.Result == 'success') {
-                    this.key++
-                    this.$set(this.ruleForm, 'Url', res.EntityList[0])
-                    this.$message.success('图标上传成功!')
-                }
-            })
         },
         create() {
             //新增
@@ -315,6 +303,12 @@ export default {
             this.view.strokecolor = this.ruleForm.Color
             this.view.lineType = this.ruleForm.LineDash
             this.view.lineWidth = this.ruleForm.LineWidth
+            if (this.ruleForm.Url && type == 2) {
+                let url = `/serve/topology-wanda/Picture/query/${this.ruleForm.Url}`
+                this.view.url = url
+            } else {
+                this.view.url = ''
+            }
         },
         initGraph() {
             if (this.ruleForm.Type == 'Zone' || this.ruleForm.Type == 'Line' || this.ruleForm.Type == 'Image') {
@@ -449,12 +443,17 @@ export default {
             }
             return new File([u8arr], filename, { type: mime })
         },
+        // 把canvas图保存到图片服务器
         saveImg() {
             let vm = this
             if (this.view) {
                 let data = this.view.canvasView.toDataURL('image/png')
                 var formData = new FormData()
-                formData.append('file', this.base64ToFile(data))
+                if (this.ruleForm.Type == 'Zone' || this.ruleForm.Type == 'Line') {
+                    formData.append('file', this.base64ToFile(data))
+                } else {
+                    formData.append('file', this.file)
+                }
                 let postParams = formData
                 uploadImg({ postParams }).then(res => {
                     if (res.Result == 'success') {
@@ -468,8 +467,7 @@ export default {
                             this.update()
                             this.$emit('updateSuccess')
                             this.view.canvas.clearRect(0, 0, this.width, this.height)
-                        } else {
-                        }
+                        } 
                     }
                 })
             }
@@ -547,11 +545,19 @@ export default {
             this.initGraph()
         }
     },
-    updated() {
-        if (this.title == '修改图例库') {
-            this.changeLineWidth(this.ruleForm.LineWidth)
-            this.changeLineType(this.ruleForm.LineDash)
-            this.initGraph()
+    watch:{
+        'ruleForm.Id':{
+            handler(){
+                this.initQueryDeviceAndPOsition()
+                this.visualization()
+                if (this.title == '修改图例库') {
+                    if (this.ruleForm.Type != 'Image') {
+                        this.changeLineWidth(this.ruleForm.LineWidth)
+                        this.changeLineType(this.ruleForm.LineDash)
+                    }
+                    this.initGraph()
+                }
+            }
         }
     }
 }

+ 13 - 15
src/views/legendLibrary/addLegend.vue

@@ -43,7 +43,6 @@ export default {
             dialogVisible: false,
             InfoTypeIdList: [],
             InfosList: [],
-
             info: {
                 Name: '',
                 Type: 'None',
@@ -114,7 +113,6 @@ export default {
                 this.info = row
                 this.InfosList = []
                 this.InfoTypeIdList = []
-
                 // this.InfosList = [...row.InfoLocal.map(({ id }) => id), ...row.InfoSystem]
                 this.InfosList = row.InfoLocal ? [...row.InfoLocal.map(({ id }) => id)] : []
                 this.InfoTypeIdList = row.InfoTypeId
@@ -145,8 +143,8 @@ export default {
             }
             this.InfoTypeIdList = []
             this.InfosList = []
-
             this.$refs.add.fileList = []
+            this.$emit('cancal', this.info)
         },
         mesg() {
             this.$emit('mesg')
@@ -158,27 +156,27 @@ export default {
             this.$emit('addSuccess')
             this.cancal()
         },
+        isCreateOrUpdate(){
+            if (this.title == '添加图例库') {
+                this.$refs.add.create()
+                this.$emit('addSuccess')
+            } else if (this.title == '修改图例库') {
+                this.$refs.add.update()
+                this.$emit('updateSuccess')
+            }
+        },
         save() {
             // FillColor,Color,Name
             if (this.info.Name == '') {
                 this.$message.info('请填写图例名称')
                 return false
             } else {
-                if (this.info.Type != 'Image' && this.info.Type != 'None') {
+                if (this.info.Type != 'None') {
                     this.$refs.add.saveImg()
-                } else {
-                    if (this.title == '添加图例库') {
-                        this.$refs.add.create()
-                        this.$emit('addSuccess')
-                    } else if (this.title == '修改图例库') {
-                        this.$refs.add.update()
-                        this.$emit('updateSuccess')
-                    }
+                }else{
+                    this.isCreateOrUpdate()
                 }
                 this.dialogVisible = false
-                // if (!this.title || this.info.Type == 'None') {
-                //     this.$refs.add.create()
-                // }
             }
         },
 

+ 11 - 4
src/views/legendLibrary/index.vue

@@ -104,7 +104,7 @@
                     @clear='keyword = ""'
                 ></el-input>
             </div>
-            <el-table :data='tableData' :key='key' :border='true' style='width: 100%'>
+            <el-table :data='tableData' v-loading='loading' :key='key' :border='true' style='width: 100%'>
                 <el-table-column prop='Name' label='图例名称' width='120'>
                     <template slot-scope='{row}'>{{row.Name }}</template>
                 </el-table-column>
@@ -160,7 +160,7 @@
                 ></el-pagination>
             </div>
         </div>
-        <add-legend ref='addLegend' @updateSuccess='updateSuccess' @addSuccess='addSuccess'></add-legend>
+        <add-legend ref='addLegend' @updateSuccess='updateSuccess' @addSuccess='addSuccess' @cancal='cancal'></add-legend>
         <Modal :show='modalStatusTip' title='确定要作废图例吗?' mode='tip' type='error' @close='modalStatusTip=false'>
             <template #content>作废后则不可更改</template>
             <template #handle>
@@ -267,6 +267,7 @@ export default {
     components: { addLegend, Select },
     data() {
         return {
+            loading: true,
             deleteObject: {},
             modalStatusTip: false,
             tableData: [],
@@ -288,7 +289,6 @@ export default {
                 { id: '0', name: '图例库管理' },
                 { id: '1', name: '图例绘制规则' }
             ],
-
             typeOptions: [
                 {
                     id: 'all',
@@ -318,7 +318,6 @@ export default {
             currentPage: 1,
             state: '1',
             position: [],
-
             positionSelect: [],
             keyword: undefined,
             typeVisualization: [],
@@ -359,6 +358,12 @@ export default {
                 this.positionSelect = res.Content && res.Content.map(i => this.getTree(i))
             })
         },
+        //监听取消 修改的时候取消会导致表格不刷新
+        cancal(info) {
+            console.log(info)
+            this.key++
+            this.getTableList()
+        },
         dumpRules() {
             this.$router.push('/home/legendRules')
         },
@@ -467,6 +472,7 @@ export default {
             let data = {}
             queryRelation({ data, postParams }).then(res => {
                 this.tableData = res.data.Content
+                this.loading = false
                 this.total = res.Total
             })
         },
@@ -497,6 +503,7 @@ export default {
                         }
                         return i
                     })
+                this.loading = false
                 console.log(this.tableData)
             })
         },

+ 3 - 0
src/views/legendRules/index.vue

@@ -325,6 +325,9 @@ export default {
     .el-tree {
         background: rgba(247, 249, 250, 1);
     }
+    /deep/.ant-tree li .ant-tree-node-content-wrapper {
+        width: 90%;
+    }
     .is-current {
         background: #e1f2ff !important;
         border-radius: 4px;

+ 2 - 2
src/views/other/gcfz1.vue

@@ -9,8 +9,8 @@
         show-summary
         border
     >
-        <el-table-column label='序号' type='index' width="60"></el-table-column>
-        <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable >
+        <el-table-column label='序号' type='index' width='60'></el-table-column>
+        <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
         <el-table-column prop='beforekf' label='总间数'>

+ 4 - 1
src/views/other/gcfz2.vue

@@ -43,7 +43,7 @@
                 style='width: 100%'
                 border
             >
-                <el-table-column label='序号' type='index' width='50'></el-table-column>
+                <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
                 <el-table-column prop label='楼层' width='130'>
                     <template slot-scope='{row}'>{{row.floor||'--'}}</template>
                 </el-table-column>
@@ -116,6 +116,9 @@ export default {
         },
         changelc() {
             this.$emit('changeEmit', this.cg)
+        },
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
         }
     }
 }

+ 37 - 15
src/views/other/index.vue

@@ -19,17 +19,17 @@
             <div class='other-right' v-if='matterId!=1'>
                 <floor-list-other v-if='floorData.length>0' :floorsArr='floorData' @emitFloor='emitFloor' :type='2'></floor-list-other>
             </div>
-            <!-- 图例 -->
-            <!-- <div class='legend-boxs' v-if='matterId!=1'>
-                <Legend></Legend>
-            </div>-->
         </div>
         <other-dialog ref='dialog' :systemName='systemName'></other-dialog>
         <!-- 综合事项管理 -->
         <zhsx-other v-if='matterId==1&&everySystem.length>0' :everySystem='everySystem'></zhsx-other>
         <!-- 辅助用房管理 -->
         <div class='qtfugl' v-if='matterId==2'>
-            <div class='fzyfImg'>
+            <div v-if='floorData.length==0' class='fzyfwtp'>
+                <img src='@/assets/imgs/wtp.png' alt />
+                <p class='fjt'>暂无附加数据图片</p>
+            </div>
+            <div class='fzyfImg' v-else>
                 <img :src='picFloorImg' alt />
             </div>
         </div>
@@ -87,7 +87,6 @@ export default {
             queryPic({ getParams }).then(res => {
                 //console.log('库房管理图', res)
                 this.picFloorImg = res.data[0].url ? res.data[0].url : ''
-                //console.log('this.picFloorImg', this.picFloorImg)
             })
         },
         // 查询哪几个楼层有库房图
@@ -132,10 +131,6 @@ export default {
                 this.floorData = []
                 let data = res.data.data
                 data.forEach(el => {
-                    //console.log(el)
-                    // gcode: "4F"
-                    // name: "第4层"
-                    // seq: 400
                     if (el.count > 0) {
                         let obj = {
                             gname: el.params.floor,
@@ -150,11 +145,9 @@ export default {
                                     ? el.params.floor.substring(1, 2) + '00'
                                     : -el.params.floor.substring(1, 2) + '00'
                         }
-                        //console.log(obj)
                         this.floorData.push(obj)
                     }
                 })
-                //console.log('查询哪几层楼有图', this.floorData)
             })
         }
     },
@@ -163,7 +156,6 @@ export default {
     },
     mounted() {
         this.everySystem = this.matter[0].children
-        // this.queryPicter()
         this.tabSize()
     }
 }
@@ -249,8 +241,38 @@ export default {
             margin: 0 auto;
             margin-top: 93px;
             img {
-                width: 100%;
-                height: 100%;
+                max-width: 100%;
+                max-height: 100%;
+                display: block;
+                margin: 0 auto;
+            }
+        }
+        .fzyfwtp {
+            width: 1035px;
+            height: 544px;
+            margin: 0 auto;
+            margin-top: 93px;
+            position: relative;
+            img {
+                width: 126px;
+                height: 121px;
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                margin-top: -60px;
+                margin-left: -63px;
+            }
+            .fjt {
+                margin-top: 7px;
+                font-size: 16px;
+                font-family: MicrosoftYaHei;
+                color: rgba(100, 108, 115, 1);
+                line-height: 21px;
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                margin-top: 65px;
+                margin-left: -60px;
             }
         }
     }

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

@@ -9,7 +9,7 @@
                 <p>4.广场安全质量第三方检测过程中列出的整改事项</p>
                 <div class='bottom-table'>
                     <el-table :data='tableData' height='480' style='width:100%;' :span-method='objectSpanMethod' border v-if='tableData.length>0'>
-                        <el-table-column label='序号' type='index' width='50'></el-table-column>
+                        <el-table-column label='序号' type='index' width='60'></el-table-column>
                         <el-table-column prop='jcsx' label='检测事项' :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column prop='zgbm' label='主管部门' :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column prop='jlsx' label='记录事项' :show-overflow-tooltip='true'></el-table-column>

+ 7 - 4
src/views/other/zhsxOtherTable1.vue

@@ -25,7 +25,7 @@
                 style='margin-right:12px'
                 v-if='department.length>0'
                 :selectdata='department'
-                :placeholder='"选择政府部门"'
+                :placeholder='""'
             ></Select>
             <el-input clearable placeholder='搜索记录事项' @change='getZhjl' size='small' prefix-icon='el-icon-search' v-model='ssjlsx' style='width:200px'></el-input>
         </div>
@@ -37,14 +37,14 @@
             :data='zhjlTable'
             style='width: 100%;margin-top:12px'
         >
-            <el-table-column label='序号' type='index' width='60'></el-table-column>
-            <el-table-column prop sortable label='日期' width='90' resizable>
+            <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
+            <el-table-column prop sortable label='日期' width='100' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='政府部门' width='80'>
                 <template slot-scope='{row}'>{{row.department||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' width='700'>
+            <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='700'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='工作要求' width='160'>
@@ -119,6 +119,9 @@ export default {
         changeData(val) {
             //console.log(val)
         },
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
+        },
         // 综合记录
         getZhjl() {
             let getParams = {

+ 6 - 4
src/views/other/zhsxOtherTable2.vue

@@ -55,14 +55,14 @@
             :data='dsfTable'
             style='width: 100%;margin-top:12px'
         >
-            <el-table-column label='序号' type='index' width='60'></el-table-column>
-            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width="540">
+            <el-table-column label='序号' type='index' width='60' :index='indexMethod'></el-table-column>
+            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width='540'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='状态' width='90'>
                 <template slot-scope='{row}'>{{row.status||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='部门' width='90' :show-overflow-tooltip='true'>
+            <el-table-column prop label='部门' width='260' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.zgbm||'--'}}</template>
             </el-table-column>
             <el-table-column prop :show-overflow-tooltip='true' label='检测结论'>
@@ -107,6 +107,9 @@ export default {
     },
     components: { Select },
     methods: {
+        indexMethod(index) {
+            return (this.page - 1) * this.size + index + 1
+        },
         // 第三方
         dsfjc() {
             let getParams = {
@@ -167,7 +170,6 @@ export default {
                         this.status2.push(obj)
                     })
                 }
-                //console.log(this.status2)
                 if (zgbm.length > 0) {
                     zgbm.forEach(el => {
                         let obj = {

+ 7 - 3
src/views/room/index.vue

@@ -275,6 +275,7 @@
                                 style='margin-right:12px;width:220px;'
                             ></el-input>
                             <Select
+                                @change='Index4'
                                 width='220'
                                 tipPlace='top'
                                 v-model='statuSelect5'
@@ -491,7 +492,7 @@ export default {
             rwwcrq: '',
             ycgdtbsj: '',
             ycgdyssj: '',
-            smsxtArr: { smsx: '1001' }
+            smsxtArr: { smsx: '1001', smsxtname: '供电系统' }
         }
     },
     components: {
@@ -529,9 +530,12 @@ export default {
                 typename: '位置布置图',
                 location: '1809',
                 module: '1002',
-                system: system,
+                // system: system,
                 plazaId: this.plazaId
             }
+            if (system) {
+                getParams.system = system
+            }
             queryPic({ getParams }).then(res => {
                 //console.log('机房布置图', res)
                 this.tableImg = res.data ? res.data : []
@@ -843,7 +847,7 @@ export default {
             } else if (name.type == 'system') {
                 let floor = this.$cookie.get('floorNow')
                 this.content = `查看${floor}层楼层功能图`
-                this.init()
+                this.Index(null)
             }
         },
         // 机房右上角的跳转 如果是在楼层功能打开的机房则要跳转到设备设施对应的系统\楼层 反之亦然

+ 3 - 2
src/views/room/room5.vue

@@ -20,7 +20,8 @@
                 </el-table-column>
                 <el-table-column prop label='现场照片' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>
-                        <div v-if="row.glsmsImage"
+                        <div
+                            v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
                             @click='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
@@ -56,7 +57,7 @@
                     <el-table-column prop label='异常工单编号' :show-overflow-tooltip='true' min-width='110'>
                         <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='描述' :show-overflow-tooltip='true' min-width='320'>
+                    <el-table-column prop label='描述' :show-overflow-tooltip='true' width='900'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='130'>