Bladeren bron

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

shaun-sheep 4 jaren geleden
bovenliggende
commit
51ae9c75f4
42 gewijzigde bestanden met toevoegingen van 526 en 340 verwijderingen
  1. 1 1
      package.json
  2. 1 1
      src/App.vue
  3. 8 0
      src/api/public.js
  4. 15 6
      src/assets/css/rotation.css
  5. 12 5
      src/assets/css/rotation.less
  6. BIN
      src/assets/imgs/bjs.png
  7. BIN
      src/assets/imgs/iconBlackBottom.png
  8. BIN
      src/assets/imgs/iconBlackTop.png
  9. BIN
      src/assets/imgs/iconLightBottom.png
  10. BIN
      src/assets/imgs/iconLightTop.png
  11. 53 12
      src/components/Legend/src/legend.vue
  12. 2 1
      src/components/Select/Select.vue
  13. 1 1
      src/components/editLengend.vue
  14. 45 45
      src/components/floorList.vue
  15. 3 3
      src/components/floorMap/canvasFun.vue
  16. 21 22
      src/components/floorMap/index.vue
  17. 43 6
      src/components/menuList.vue
  18. 40 10
      src/components/viewLengend.vue
  19. 13 1
      src/lib/FloorScene.js
  20. 13 2
      src/store/index.js
  21. 5 6
      src/utils/plugins/components.js
  22. 11 0
      src/views/equipment/eqDialog.vue
  23. 40 20
      src/views/equipment/index.vue
  24. 9 6
      src/views/equipment/table/djspTable.vue
  25. 21 11
      src/views/equipment/table/eqDetaileDialog.vue
  26. 15 13
      src/views/equipment/table/eqListTable.vue
  27. 13 11
      src/views/equipment/table/inputDIalog.vue
  28. 10 7
      src/views/equipment/table/otherTable.vue
  29. 6 5
      src/views/equipment/table/recordDialog.vue
  30. 24 10
      src/views/equipment/table/standTable.vue
  31. 5 5
      src/views/equipment/table/tjTable.vue
  32. 21 17
      src/views/equipment/table/wbTable.vue
  33. 20 24
      src/views/equipment/table/wxTable.vue
  34. 24 15
      src/views/equipment/table/zwTable.vue
  35. 2 45
      src/views/floorFunc/index.vue
  36. 5 5
      src/views/legendLibrary/index.vue
  37. 2 2
      src/views/other/gcfz1.vue
  38. 3 3
      src/views/other/zhsxOtherTable1.vue
  39. 1 1
      src/views/other/zhsxOtherTable2.vue
  40. 5 5
      src/views/room/room3.vue
  41. 10 10
      src/views/room/room4.vue
  42. 3 3
      src/views/room/room5.vue

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
         "axios": "^0.19.2",
         "core-js": "^3.4.4",
         "element-ui": "^2.13.2",
-        "meri-design": "^1.2.8",
+        "meri-design": "^1.3.2",
         "moment": "^2.24.0",
         "quill": "^1.3.7",
         "vue": "^2.6.10",

+ 1 - 1
src/App.vue

@@ -17,7 +17,7 @@ export default {
       canvasID: "",
       key: "23f30a832a862c58637a4aadbf50a566",
       appName: "万达可视化系统",
-      mapServerURL: `/wdfn`
+      mapServerURL: `http://map.wanda.cn/editor`
     };
   },
   mounted() {

+ 8 - 0
src/api/public.js

@@ -41,3 +41,11 @@ export function updateRead({ postParams }) {
 export function readGroup(postParams) {
     return httputils.postJson(`/serve/topology-wanda/graph/read`, postParams)
 }
+// 查询草稿箱数量
+export function queryDraftNum(data) {
+    return httputils.postJson(`/serve/topology-wanda/graph/query`, data)
+}
+// 查询铺位名称
+export function queryBrand({ data, postParams }) {
+    return httputils.fetchJson(`/data/data/tb_brand_intentiondetail/query`, data, postParams)
+}

+ 15 - 6
src/assets/css/rotation.css

@@ -1,7 +1,7 @@
 .overview {
   background: #f2f5f7;
   padding: 16px 20px 20px 20px;
-  height: 100%;
+  height: calc(100% - 48px);
   width: 100%;
 }
 .overview .view-title {
@@ -27,7 +27,6 @@
   font-family: MicrosoftYaHeiSemibold;
   font-weight: bold;
   color: #1f2429;
-  line-height: 21px;
 }
 .overview .view-title .view-button {
   font-family: PingFangSC-Regular, PingFang SC;
@@ -42,6 +41,7 @@
   align-items: center;
   justify-content: center;
   cursor: pointer;
+  border-radius: 4px;
 }
 .overview .view-title .view-button img {
   display: inline-block;
@@ -62,11 +62,13 @@
 }
 .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;
 }
 .overview .view-box .view-left .lb-left img {
   width: 100%;
@@ -75,11 +77,12 @@
   z-index: 99;
   position: absolute;
   top: 0;
-  right: 2px;
+  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;
@@ -88,6 +91,7 @@
   position: absolute;
   top: 8px;
   right: 10px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-bottom {
   height: 34%;
@@ -101,6 +105,7 @@
   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;
@@ -116,7 +121,6 @@
   font-family: MicrosoftYaHeiSemibold;
   font-weight: bold;
   color: #025baa;
-  line-height: 19px;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 {
   height: 24px;
@@ -130,6 +134,7 @@
   width: 16px;
   height: 16px;
   margin-right: 3px;
+  margin-top: -3px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 {
   margin: 16px 0;
@@ -191,20 +196,23 @@
 }
 .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;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-icon {
   z-index: 99;
   position: absolute;
   top: 0;
-  right: 2px;
+  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;
@@ -213,6 +221,7 @@
   position: absolute;
   top: 8px;
   right: 10px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
   height: 53%;
@@ -227,6 +236,7 @@
   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;
@@ -242,7 +252,6 @@
   font-family: MicrosoftYaHeiSemibold;
   font-weight: bold;
   color: #025baa;
-  line-height: 19px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom .view-right-bottom {
   overflow: auto;

+ 12 - 5
src/assets/css/rotation.less

@@ -25,7 +25,6 @@
                 font-family: MicrosoftYaHeiSemibold;
                 font-weight: bold;
                 color: #1f2429;
-                line-height: 21px;
             }
         }
         .view-button {
@@ -41,6 +40,7 @@
             align-items: center;
             justify-content: center;
             cursor: pointer;
+            border-radius: 4px;
             img {
                 display: inline-block;
                 height: 16px;
@@ -69,6 +69,7 @@
                 margin-bottom: 10px;
                 position: relative;
                 border: 1px solid #ccc;
+                border-radius: 4px;
                 img {
                     width: 100%;
                     // height: 100%;
@@ -77,11 +78,12 @@
                     z-index: 99;
                     position: absolute;
                     top: 0;
-                    right: 2px;
+                    right: 0px;
                     width: 32px;
                     height: 32px;
                     background: rgba(0, 0, 0, 0.6);
                     border-radius: 0px 4px 0px 4px;
+                    cursor: pointer;
                 }
                 .lb-img {
                     z-index: 101;
@@ -90,6 +92,7 @@
                     position: absolute;
                     top: 8px;
                     right: 10px;
+                    cursor: pointer;
                 }
             }
             .lb-bottom {
@@ -103,6 +106,7 @@
                     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;
                     span:nth-of-type(1) {
                         width: 2px;
                         height: 16px;
@@ -117,7 +121,6 @@
                         font-family: MicrosoftYaHeiSemibold;
                         font-weight: bold;
                         color: #025baa;
-                        line-height: 19px;
                     }
                 }
                 .place-p1 {
@@ -131,6 +134,7 @@
                         width: 16px;
                         height: 16px;
                         margin-right: 3px;
+                        margin-top: -3px;
                     }
                 }
                 .place-p2 {
@@ -199,15 +203,17 @@
                     margin-bottom: 10px;
                     position: relative;
                     border: 1px solid #ccc;
+                    border-radius: 4px;
                     .lb-icon {
                         z-index: 99;
                         position: absolute;
                         top: 0;
-                        right: 2px;
+                        right: 0px;
                         width: 32px;
                         height: 32px;
                         background: rgba(0, 0, 0, 0.6);
                         border-radius: 0px 4px 0px 4px;
+                        cursor: pointer;
                     }
                     .lb-img {
                         z-index: 101;
@@ -216,6 +222,7 @@
                         position: absolute;
                         top: 8px;
                         right: 10px;
+                        cursor: pointer;
                     }
                 }
                 .lb-right-bottom {
@@ -230,6 +237,7 @@
                         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;
                         span:nth-of-type(1) {
                             width: 2px;
                             height: 16px;
@@ -244,7 +252,6 @@
                             font-family: MicrosoftYaHeiSemibold;
                             font-weight: bold;
                             color: #025baa;
-                            line-height: 19px;
                         }
                     }
                     .view-right-bottom {

BIN
src/assets/imgs/bjs.png


BIN
src/assets/imgs/iconBlackBottom.png


BIN
src/assets/imgs/iconBlackTop.png


BIN
src/assets/imgs/iconLightBottom.png


BIN
src/assets/imgs/iconLightTop.png


+ 53 - 12
src/components/Legend/src/legend.vue

@@ -6,8 +6,9 @@
 <template>
     <div>
         <div class='legend-container'>
-            <div class='legend' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage'>图例</div>
-            <el-collapse-transition>
+            <div v-show='!show' class='legend' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage'>图例</div>
+            <div v-show='show' class='legend2' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage'>图例</div>
+            <el-collapse-transition v-if='(type==1 || floors.length>0)&& isMessage'>
                 <div class='legend-tab' v-if='show'>
                     <div class='legend-table'>
                         <lengend-view
@@ -65,13 +66,13 @@
                 </p>
             </el-tooltip>
             <!-- 编辑分布图 -->
-            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' content='编辑分布图' placement='left'>
+            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' :content='editTips' placement='left'>
                 <span class='edit-icon' @click='goToEditer'>
-                    <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
+                    <img src='@/assets/imgs/bjs.png' alt />
                 </span>
             </el-tooltip>
             <span v-else class='edit-icon2'>
-                <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
+                <img src='@/assets/imgs/bjs.png' alt />
             </span>
         </div>
         <div class='select-floor' v-if='isFloor'>
@@ -102,8 +103,9 @@ export default {
             remarksText: '', //查询出来的备注
             text1:
                 '<p>1.主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房。</p>',
-            text2: '<p>2.图例后×的数字,代表此位置的数量。</p>',
-            show: false,
+            // text2: '<p>2.图例后×的数字,代表此位置的数量。</p>',
+            text2: '',
+            show: true,
             show2: false,
             loading: true,
             loading1: true,
@@ -119,7 +121,9 @@ export default {
             editPmt: true, //是否有跳转道图例库的权限
             floorSelectAble: [],
             floor: '', //传的楼层
-            floorName: ''
+            floorName: '',
+            planNum: '', //主要设备房
+            typeNum: ''
         }
     },
     computed: {
@@ -143,6 +147,10 @@ export default {
         categoryId: {
             default: '',
             type: String
+        },
+        editTips: {
+            type: String,
+            default: ''
         }
     },
     components: { lengendView, legendRemarks, lengendEdit },
@@ -171,6 +179,12 @@ export default {
             queryRead({ data, postParams }).then(res => {
                 if (res.data.Data && res.data.Data[0].Note) {
                     let note = res.data.Data[0].Note
+                    if (this.planNum > 0) {
+                        this.remarksText = `${this.text1}${note}`
+                    }
+                    if (this.typeNum > 1) {
+                        this.remarksText = `${this.text2}${note}`
+                    }
                     if (note.search(this.text1) != -1 && note.search(this.text2) != -1) {
                         this.remarksText = `${note}`
                     } else if (note.search(this.text1) != -1) {
@@ -191,7 +205,6 @@ export default {
             if (this.show) {
                 this.show2 = false
             }
-            this.queryView(false)
         },
         cance() {
             this.show2 = false
@@ -221,8 +234,6 @@ export default {
                 { editerUrl } = conf
             let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}`
-            console.log('data', data)
-            console.log('this.categoryId', this.categoryId, this.$cookie.get('categoryId'))
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
         },
@@ -248,6 +259,14 @@ export default {
                 this.loading = false
                 //console.log('图例', res)
                 this.viewTable = res.data.Data ? res.data.Data : []
+                if (this.viewTable.length > 0) {
+                    this.viewTable.forEach(el => {
+                        console.log(el)
+                        if (el.Name == '主要设备房') {
+                            this.planNum = el.Num
+                        }
+                    })
+                }
                 this.$nextTick(() => {
                     if (this.$refs.viewLengend) {
                         this.$refs.viewLengend.setSelected()
@@ -318,7 +337,9 @@ export default {
             this.goToEditer()
         }
     },
-    mounted() {}
+    mounted() {
+        this.queryView(false)
+    }
 }
 </script>
 <style lang="less" scoped>
@@ -340,6 +361,20 @@ export default {
         line-height: 44px;
         text-align: center;
     }
+    .legend2 {
+        text-align: center;
+        line-height: 44px;
+        cursor: pointer;
+        line-height: 44px;
+        text-align: center;
+        width: 44px;
+        height: 44px;
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        border-radius: 2px;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: rgba(255, 255, 255, 1);
+    }
 
     .legend-tab {
         position: absolute;
@@ -379,6 +414,12 @@ export default {
         text-align: center;
         line-height: 48px;
         display: inline-block;
+        img {
+            line-height: 48px;
+            width: 20px;
+            height: 20px;
+            margin-top: -4px;
+        }
     }
     .edit-icon {
         cursor: pointer;

+ 2 - 1
src/components/Select/Select.vue

@@ -29,7 +29,7 @@
                     v-html="fakePlaceholder">
                 </span>
             </span>
-            <Triangle v-show="!clearable" :class="triangleClass"></Triangle>
+            <Triangle v-show="!clearable" :class="triangleClass" @click="handleInput"></Triangle>
             <Remove class="p-select-clear" @click.stop="clearAll" v-show="!hideClear && clearable"></Remove>
         </div>
     </div>
@@ -482,6 +482,7 @@ export default {
         * params event事件对象
         */
         handleInput (event) {
+            console.log(event)
             this.query = event.target.value || event.data || ''
             this.showPlaceholder = !this.query
             if (!this.dropInstance) return

+ 1 - 1
src/components/editLengend.vue

@@ -251,7 +251,7 @@ export default {
     }
     .legend-container .el-table td,
     .legend-container .el-table th {
-        padding: 6px 0 !important;
+        padding: 3px 0 !important;
     }
     .nullData {
         .el-input__inner {

+ 45 - 45
src/components/floorList.vue

@@ -6,16 +6,17 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div v-if='floorsArr.length>8'>
-                <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'>
                 <!-- :style='{ marginTop : marginTop }' -->
@@ -29,19 +30,15 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div v-if='floorsArr.length>8'>
-                <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>
@@ -77,7 +74,6 @@ export default {
         }
     },
     mounted() {
-        console.log(this.floorsArr)
         this.init()
     },
     watch: {
@@ -92,7 +88,6 @@ export default {
     methods: {
         mousedown() {
             this.startTime = new Date()
-            console.log()
         },
         mouseup() {
             this.endTime = new Date()
@@ -170,7 +165,6 @@ export default {
         handleCookie() {
             // return true
             let currentFloor = this.floorsArr.filter(item => item.seq == this.currentFloorId)[0]
-            console.log(currentFloor)
             if (currentFloor) {
                 this.$cookie.set('floorNow', currentFloor.code || '', 3)
                 this.$cookie.set('floorMapId', currentFloor.gname, 3)
@@ -234,10 +228,10 @@ 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 {
-            max-height: 260px;
+            // max-height: 260px;
             overflow: hidden;
             // overflow-y: auto;
             position: relative;
@@ -248,44 +242,50 @@ export default {
             .floor-center {
                 transition: all linear 0.8s;
                 .floor-item {
-                    width: 36px;
-                    height: 32px;
+                    // border: 1px solid blue;
+                    // width: 36px;
+                    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 {

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

@@ -22,7 +22,7 @@
                     </el-tooltip>
                 </i>
             </div>
-            <div class='small-block' @click='showText'>
+            <div class='small-block' @click='fitToWindow'>
                 <i>
                     <img src='../../assets/imgs/qp.png' alt />
                 </i>
@@ -46,10 +46,10 @@ export default {
             sliderVal: 1, // 滑块值
             active: '',
             min: 1,
-            max: 1000,
+            max: 200,
             everyScale: 1, // 每份的放大倍数
             isSwitch: false, // 是否开启吸附
-            isShow: true
+            isShow: false
         }
     },
 

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

@@ -30,7 +30,7 @@ export default {
         return {
             appName: '万达可视化系统',
             key: '23f30a832a862c58637a4aadbf50a566',
-            mapServerURL: `/wdfn`,
+            mapServerURL: `http://map.wanda.cn/editor`,
             canvasWidth: 600,
             canvasHeight: 800,
             loading: false, // 限制重复查询
@@ -38,7 +38,8 @@ export default {
             urlMsg: {},
             canvasID: 'canvas',
             floorid: '', //楼层id
-            topologyParser: null // 解析器数据
+            topologyParser: null, // 解析器数据
+            fParser: null // 底图解析器
         }
     },
     props: {
@@ -100,24 +101,23 @@ export default {
                             console.log('errr', res.err)
                             return
                         }
-                        const fParser = new SFloorParser(null)
-                        fParser.parseData(res)
-                        fParser.spaceList.forEach(t => {
+                        this.fParser = new SFloorParser(null)
+                        this.fParser.parseData(res)
+                        this.fParser.spaceList.forEach(t => {
                             //   t.selectable = true;
                             this.scene.addItem(t)
                         })
-                        fParser.wallList.forEach(t => this.scene.addItem(t))
-                        fParser.virtualWallList.forEach(t => this.scene.addItem(t))
-                        fParser.doorList.forEach(t => this.scene.addItem(t))
-                        fParser.columnList.forEach(t => this.scene.addItem(t))
-                        fParser.casementList.forEach(t => this.scene.addItem(t))
+                        this.fParser.wallList.forEach(t => this.scene.addItem(t))
+                        this.fParser.virtualWallList.forEach(t => this.scene.addItem(t))
+                        this.fParser.doorList.forEach(t => this.scene.addItem(t))
+                        this.fParser.columnList.forEach(t => this.scene.addItem(t))
+                        this.fParser.casementList.forEach(t => this.scene.addItem(t))
                         this.view.scene = this.scene
                         this.view.minScale = this.view.scale
                         if (this.$refs.canvasFun) {
                             this.$refs.canvasFun.everyScale = this.view.scale
                         }
                         this.view.fitSceneToView()
-                        //console.log('success')
                     })
                 } else {
                     console.log('楼层不正确')
@@ -126,23 +126,19 @@ export default {
             this.readGroup(this.floorid).then(data => {
                 this.loading = false
                 if (data.Result == 'failure') {
-                    // 取消 失败时的提示: 图不存在
-                    /* this.$message({
-                        message: data.Message,
-                        type: 'warning'
-                    }) */
                     this.$store.commit('SETISMESSAGE', false)
                     return
-                    //    一会回来存这个
                 } else {
                     this.$store.commit('SETISMESSAGE', true)
                 }
-                // FIXME:   Cannot read property '0' of undefined
                 // 无返回Data处理
                 if (!(data.Data && data.Data.length)) {
                     return false
-                    //console.log(data.data.Data[0].ID)
-                    // this.$cookie.set('graphId', data.Data[0].ID, 3)
+                }
+                if (this.$cookie.get('categoryId') == 'SCPZ') {
+                    let scpzTable = []
+                    scpzTable = data.Data[0].Elements.Nodes || []
+                    this.$store.commit('SETSCPZTABLE', scpzTable)
                 }
                 // 放到后边 $cookie graphId
                 this.$cookie.set('graphId', data.Data[0].ID, 3)
@@ -215,8 +211,11 @@ export default {
             this.view.scaleByPoint(val / scale, this.canvasWidth / 2, this.canvasHeight / 2)
         },
         showText(val) {
-            this.topologyParser.zoneLegendList.forEach(t => {
-                t.showText = val
+            // this.topologyParser.zoneLegendList.forEach(t => {
+            //     t.showText = val
+            // })
+            this.fParser.spaceList.forEach(t => {
+                t.showBaseName = val
             })
         },
         // 读取数据

+ 43 - 6
src/components/menuList.vue

@@ -25,8 +25,8 @@
             <span @click='toDrafts' class='span-out'>
                 <img class='img2' src='../assets/imgs/cgx.png' alt />
                 <span class='span2'>草稿箱</span>
-                <span class='span2-num' v-if='value<=99'>{{value}}</span>
-                <span class='span2-num' style='line-height:10px' v-else>...</span>
+                <span class='span2-num' v-if='draftNum && draftNum <= 99'>{{draftNum}}</span>
+                <span class='span2-num' style='line-height:10px' v-else-if='draftNum && draftNum > 99'>...</span>
             </span>
             <span>
                 <img class='img3' src='../assets/imgs/clock.png' alt />
@@ -40,6 +40,7 @@
 import { formatTime } from '@/utils/format.js'
 import { mapGetters } from 'vuex'
 import moment from 'moment'
+import { queryDraftNum } from '../../src/api/public'
 export default {
     data() {
         return {
@@ -55,7 +56,9 @@ export default {
             times: `${new Date().getFullYear()}.${formatTime(new Date().getMonth() + 1)}.${formatTime(new Date().getDate())} ${formatTime(
                 new Date().getHours()
             )}:${formatTime(new Date().getMinutes())}`,
-            value: 190,
+            draftNum: null, //草稿箱数量
+            interval: 10 * 60 * 1000, //定时器时长,默认 10分钟
+            timer: null, //保存定时器
             // 路由词典
             dict: {
                 first: 1,
@@ -77,12 +80,45 @@ export default {
         this.currentTime()
     },
     mounted() {
-        window.vm = this
         this.handleRoute(this.$route)
-        console.log(this.fmapID)
+        // console.log(this.fmapID)
+        // 定时查询草稿箱数量
+        this.getDraftNum() //首次查询
+        this.timer = setInterval(() => {
+            this.getDraftNum()
+        }, this.interval)
+        // 页面销毁前,清除定时器
+        this.$once('hook:beforeDestroy', () => {
+            clearInterval(this.timer)
+        })
     },
-
     methods: {
+        /**
+         * @name getDraftNum
+         * @description 查询草稿箱数量
+         */
+        async getDraftNum() {
+            let res = null,
+                data = {
+                    Distinct: true,
+                    Filters: `projectId=${this.plazaId};isPub=false`,
+                    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
+        },
         //入草稿箱
         toDrafts() {
             const { conf } = window.__systemConf,
@@ -207,6 +243,7 @@ export default {
             float: left;
             width: 80px;
             height: 48px;
+            margin: 0 10px;
             cursor: pointer;
             transition: all 0.2s;
         }

+ 40 - 10
src/components/viewLengend.vue

@@ -5,26 +5,22 @@
 */
 <template>
     <div class='view'>
-        <div v-if='systemName=="土建系统"'>
+        <div v-if='systemName=="土建系统"' style='height:300px'>
             <el-table
-                v-loading='loading'
                 ref='dataTable'
-                :data='viewTable'
+                :data='scpzTable'
                 tooltip-effect='dark'
                 style='width:100%;'
                 :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 prop label='说明'>
                     <template slot-scope='{row}'>
-                        <span>{{'--'}}</span>
+                        <span>{{(row.Properties && row.Properties.ItemExplain)?row.Properties.ItemExplain:'--'}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop label='图例' width='60'>
                     <template slot-scope='{row}'>
-                        <div v-if='row.Url' class='Url-img'>
-                            <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
-                        </div>
-                        <div v-else>{{'--'}}</div>
+                        <div class='scpz-img' :style='`background:${row.Properties.FillColor};border:1px solid ${row.Properties.StrokeColor}`'></div>
                     </template>
                 </el-table-column>
             </el-table>
@@ -73,7 +69,8 @@
     </div>
 </template>
 <script>
-import bus from "@/utils/bus.js"
+import bus from '@/utils/bus.js'
+import { mapGetters } from 'vuex'
 export default {
     props: ['viewTable', 'loading', 'remarksText', 'systemName'],
     data() {
@@ -99,6 +96,9 @@ export default {
             })
         }
     },
+    computed: {
+        ...mapGetters(['scpzTable'])
+    },
     mounted() {}
 }
 </script>
@@ -115,6 +115,10 @@ export default {
             margin-left: 8px;
         }
     }
+    .scpz-img {
+        width: 32px;
+        height: 16px;
+    }
     .remark {
         font-size: 12px;
         font-family: MicrosoftYaHeiSemibold;
@@ -142,4 +146,30 @@ export default {
         }
     }
 }
-</style>
+</style>
+<style lang="less">
+.view {
+    .el-input--mini .el-input__inner {
+        width: 50px;
+    }
+    .el-input__inner {
+        padding: 0 5px;
+    }
+    /deep/ .legend-container .el-table td,
+    .legend-container .el-table th {
+        padding: 3px 0 !important;
+    }
+    .nullData {
+        .el-input__inner {
+            color: #ccc !important;
+        }
+    }
+    .redData {
+        .el-input__inner {
+            border: 1px solid rgba(255, 77, 79, 0.5) !important;
+        }
+    }
+}
+</style>
+
+

+ 13 - 1
src/lib/FloorScene.js

@@ -1,2 +1,14 @@
 import { SGraphScene } from "@saga-web/graph/lib"
-export class FloorScene extends SGraphScene {}
+import { ItemColor } from "@saga-web/big";
+import { SColor } from '@saga-web/draw/lib';
+export class FloorScene extends SGraphScene {
+  constructor(){
+    super()
+    ItemColor.spaceColor = new SColor("#A4ABB22B")
+    ItemColor.wallColor = new SColor("#A7AEB3FF")
+    ItemColor.columnColor = new SColor("#A7AEB3FF")
+    ItemColor.virtualWallColor = new SColor("#A7AEB3FF")
+    ItemColor.selectColor = new SColor("#84A0BB2B")
+    ItemColor.spaceBorderColor = new SColor("#A7AEB3FF")
+  }
+}

+ 13 - 2
src/store/index.js

@@ -12,13 +12,15 @@ export default new Vuex.Store({
             orgCode: '',
             username: 'lengqiang', //账户名称
         },
-        plazaId: '1000423',
+        plazaId: '1000423', //项目Id
         projectName: '', //全局项目名称
         floorsArr: [], //楼层数组
         floorSelect: [], //楼层下拉框
         fmapID: '',
         haveFengMap: false, //是否有蜂鸟地图的数据
-        isMessage: true,
+        isMessage: true, //是否有发布的图
+        scpzTable: [], //土建系统图例展示
+        legendTable: [], //除土建系统图例展示
     },
     getters: {
         floorsArr: (state) => state.floorsArr,
@@ -28,6 +30,8 @@ export default new Vuex.Store({
         fmapID: (state) => state.fmapID,
         haveFengMap: (state) => state.haveFengMap,
         isMessage: (state) => state.isMessage,
+        scpzTable: (state) => state.scpzTable,
+        legendTable: (state) => state.legendTable,
     },
     mutations: {
         // 设置是否登陆校验
@@ -63,6 +67,13 @@ export default new Vuex.Store({
         SETHAVEFENGMAP(state) {
             state.haveFengMap = true
         },
+        // 土建的图例
+        SETSCPZTABLE(state, data) {
+            state.scpzTable = data
+        },
+        SETLEGENDTABLE(state, data) {
+            state.legendTable = data
+        },
     },
     actions: {
         // 获取项目列表、userId

+ 5 - 6
src/utils/plugins/components.js

@@ -325,16 +325,15 @@ var system = [
                             label: "门禁管理",
                             id: "RDQD2",
                             param: { tab_code: "rd01" },
-                        },
-                        {
-                            label: "BA楼宇智能化",
-                            id: "RDQD1",
-                            param: { tab_code: "rd02" },
-                        },
+                        }, 
                         {
                             label: "视频监控",
                             id: "RDQD3",
                             param: { tab_code: "rd03" },
+                        },{
+                            label: "BA楼宇智能化",
+                            id: "RDQD1",
+                            param: { tab_code: "rd02" },
                         },
                     ],
                 },

+ 11 - 0
src/views/equipment/eqDialog.vue

@@ -9,6 +9,7 @@
                     v-if='dialogInfo.id.slice(2,4)!="QD" && dialogInfo.id.slice(2,4)!="YL" && dialogInfo.id.slice(0,4)!="GJSP"'
                     src='../../assets/imgs/zy1.png'
                     @click='visibalBox'
+                    style='margin-top:-4px;'
                     alt
                 />
             </div>
@@ -257,8 +258,11 @@ export default {
     .title-name {
         font-size: 16px;
         padding-right: 6px;
+        padding-left: 24px;
         color: #000;
         font-weight: bold;
+        color: #646a73;
+        font-weight: normal;
     }
 }
 .top {
@@ -312,6 +316,13 @@ export default {
         color: rgba(31, 36, 41, 1);
         border: 1px solid rgba(195, 199, 203, 1);
     }
+
+    /deep/ .el-tabs__item:last-child {
+        border-radius: 0px 4px 4px 0px;
+    }
+    /deep/ .el-tabs__item:nth-child(2) {
+        border-radius: 4px 0px 0px 4px;
+    }
     .el-tab-pane {
         height: 100% !important;
     }

+ 40 - 20
src/views/equipment/index.vue

@@ -25,15 +25,18 @@
                     </div>
                     <div class='eq-content'>
                         <div class='legend-boxs'>
-                            <Legend :systemName='systemName' :floors='floorsArr' type='1'></Legend>
+                            <Legend :systemName='systemName' :floors='floorsArr' type='1' :editTips='`编辑${floorInfo.code}层${systemName}平面图`'></Legend>
                         </div>
                         <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
+                        <!--  -->
                         <div class='additional-box' v-if='fqPic.length>0'>
                             <div class='additional' @click='additionalColl'>
                                 <img src='../../assets/imgs/bg.png' alt />
                             </div>
                             <el-collapse-transition>
-                                <div v-if='show' class='add-img'>图</div>
+                                <div v-if='show' class='add-img'>
+                                    <img :src='fqPic[0].url' alt />
+                                </div>
                             </el-collapse-transition>
                         </div>
                     </div>
@@ -51,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 } from '@/api/public.js'
+import { queryPic, queryBrand } from '@/api/public.js'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -70,7 +73,7 @@ export default {
             dialogInfo: {},
             brand: [], //品牌
             manufacturer: [],
-            show: false,
+            show: true,
             fqPic: [],
             loadName: '',
             type: '',
@@ -79,19 +82,30 @@ export default {
     },
     components: { floorList, eqDialog, floorMap, editList },
     methods: {
+        query() {
+            let data = {
+                plazaId: '1000423'
+            }
+            let postParams = []
+            queryBrand({ data, postParams }).then(res => {
+                console.log(res)
+            })
+        },
         // 查询tab页
         tabSyatem(item) {
-            console.log(item)
             this.systemId = item.id
             this.everySystem = item.children
             this.systemName = item.name
             this.smsxt = item.smsxt
             this.$cookie.set('categoryId', item.categoryId, 3)
             this.$refs.floorMap.init(this.floorInfo.gname)
+            this.querySmsxt()
+        },
+        querySmsxt() {
+            // 目前消防和弱电下面有特殊的数据表格
             if (this.smsxt == '1003' || this.smsxt == '1004') {
-                this.Index()
+                this.queryTable(this.smsxt)
             }
-            this.init()
         },
         //判断有没有原理图,如果没有则不出现系统原理图列表li
         emitCount(objCount) {
@@ -101,6 +115,7 @@ export default {
             this.floorInfo = item
             this.$refs.floorMap.init(this.floorInfo.gname)
             this.init()
+            this.querySmsxt()
         },
         dialogVisible(eve) {
             this.$refs.dialog.showModal(eve)
@@ -108,19 +123,20 @@ export default {
         additionalColl() {
             this.show = !this.show
         },
-        Index() {
+        // 查询附加数据图片
+        queryTable(system) {
+            this.fqPic = []
             let picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 module: '1003',
                 floor: picFloor,
-                plazaId: this.$store.state.plazaId
-            }
-            if (this.smsxt) {
-                getParams.system = this.smsxt
+                system: system,
+                plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
-                //console.log('分区图', res)
+                console.log('附加数据', res)
                 this.fqPic = res.data
+                console.log(this.fqPic)
             })
         },
         init() {
@@ -129,11 +145,9 @@ export default {
         // 从设备设施进入的机房
         queryType(val) {
             this.type = val
-            console.log(this.type)
         }
     },
     mounted() {
-        console.log('smsxtsmsxtsmsxt', this.$route.query.smsxt)
         if (this.$route.query.smsxt) {
             this.smsxt = this.$route.query.smsxt
             this.system.forEach(el => {
@@ -147,9 +161,10 @@ export default {
         this.everySystem = this.system[0].children
         this.init()
         this.$refs.floorMap.init(this.floorInfo.gname)
+        this.query()
     },
     computed: {
-        ...mapGetters(['floorsArr'])
+        ...mapGetters(['floorsArr', 'plazaId'])
     }
 }
 </script>
@@ -159,6 +174,7 @@ export default {
     display: flex;
     flex: 1;
     overflow: hidden;
+    color: #1f2429;
     .eq-top {
         margin-left: 260px;
         padding-top: 24px;
@@ -203,13 +219,13 @@ export default {
             .circle {
                 width: 6px;
                 height: 6px;
-                background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+                background: linear-gradient(180deg, rgba(54, 156, 247, 0.6) 0%, rgba(2, 91, 170, 0.6) 100%);
                 border-radius: 50%;
                 display: inline-block;
                 margin-right: 10px;
             }
             .hanzi {
-                padding: 10px 2px;
+                padding: 10px 6px;
                 width: 200px;
                 display: inline-block;
                 &:hover {
@@ -270,7 +286,7 @@ export default {
                             border-radius: 2px;
                             position: fixed;
                             right: 32px;
-                            top: 420px;
+                            top: 471px;
                             z-index: 2;
                             display: flex;
                             justify-content: center;
@@ -291,8 +307,12 @@ export default {
                             border: 1px solid #e4e5e7;
                             position: absolute;
                             right: 77px;
-                            top: 93px;
+                            bottom: 421px;
                             z-index: 2;
+                            img {
+                                width: 100%;
+                                height: 100%;
+                            }
                         }
                     }
                 }

+ 9 - 6
src/views/equipment/table/djspTable.vue

@@ -22,25 +22,25 @@
             ></el-input>
             <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' :span-method='objectSpanMethod' border style='width: 100%' @row-click='innerVisible = true'>
-            <el-table-column prop='floor' label='楼层' width='200'>
+        <el-table :data='tableData' :span-method='objectSpanMethod' :border='true' style='width: 100%' @row-click='innerVisible = true'>
+            <el-table-column prop='floor' label='楼层' width='50'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='welldes' label='电井间'>
+            <el-table-column prop='welldes' label='电井间' width="120">
                 <template slot-scope='{row}'>{{row.welldes || '--'}}</template>
             </el-table-column>
             <el-table-column prop='meterbox' label='商铺电表数' width='200'>
                 <template slot-scope='{row}'>{{row.meterbox || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='shopsnum' label='商铺编号' width='200'>
-                <template slot-scope='{row}'>{{row.shopsnum || '--'}}</template>
+            <el-table-column prop='shopsnum' label='商铺编号' >
+                <template slot-scope='{row}'>{{row.shopsnumList || '--'}}</template>
             </el-table-column>
         </el-table>
         <div class='foot'></div>
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryShops } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -130,6 +130,9 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(){
+            this.getList()
         }
     },
     mounted() {

+ 21 - 11
src/views/equipment/table/eqDetaileDialog.vue

@@ -48,35 +48,35 @@
             <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='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></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>
+            <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='100'>
+            <el-table-column prop='sl' label='数量' width='80'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
             <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='设备状态'>
+            <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>
+            <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>
+            <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='100'>
+            <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>
+            <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>
+            <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>
@@ -97,7 +97,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
@@ -136,6 +136,7 @@ export default {
     },
     props: ['row', 'major'],
     mounted() {
+        this.floor = this.$cookie.get('floorMapId')
         this.queryTableList()
         this.tabFind()
     },
@@ -272,6 +273,15 @@ export default {
                 this.tabFind()
             },
             deep: true
+        },
+        sbglgs(){
+            this.queryTableList()
+        },
+        status(){
+            this.queryTableList()
+        },
+        floor(){
+            this.queryTableList()
         }
     }
 }

+ 15 - 13
src/views/equipment/table/eqListTable.vue

@@ -20,7 +20,7 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' @cancel='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
             <el-input
                 placeholder='搜索生产厂商'
                 clearable
@@ -32,20 +32,20 @@
             ></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='50'></el-table-column>
-            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable >
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' >
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌'>
+            <el-table-column prop='brand' label='品牌' width='120'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+            <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='floorcode' label='楼层' >
+            <el-table-column prop='floorcode' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
@@ -73,7 +73,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -85,7 +85,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
+            size: 11,
             innerVisible: false, //详情弹框
             keyword: '',
             manufacturer: '',
@@ -119,11 +119,9 @@ export default {
                 major: this.major
             }
             //下拉
-            if (this.floor) {
-                console.log(this.floor)
+            if (this.floor) {             
                 postParams.gname = this.floor
             }
-            console.log(this.floor)
             //输入框搜索
             data.keyword = ''
             if (this.keyword) {
@@ -138,7 +136,6 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
-
             queryEquipmentList({ data, postParams }).then(res => {
                 //console.log(res)
                 this.tableData = res.data.data
@@ -152,9 +149,14 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(newV, oldV) {
+            console.log(newV, oldV)
+            this.getList()
         }
     },
     mounted() {
+        this.floor = this.$cookie.get('floorMapId')
         this.getList()
         console.log(this.param)
     }

+ 13 - 11
src/views/equipment/table/inputDIalog.vue

@@ -2,23 +2,25 @@
     <div class='input-dialog'>
         <div
             @click='show'
-            style='color: #c3c7cb;cursor: pointer;position:absolute;right:32px;z-index:9999'
-            :class='`top:${type === 1 ? "40px" : "0"};`'
+            style='color: #1F2429;cursor: pointer;position:absolute;z-index:9999;'
+            :style='`right:${type === 1 ? "48px" : "12px"};top:${type === 1 ? "102px" : "0px"};`'
+            
         >
             <img src='@/assets/imgs/select.png' />
-            筛选
+            <span>筛选</span>
         </div>
         <div
             v-if='dialogFormVisible'
             style='width:280px;height:250px;background:rgba(255,255,255,1);margin-top:40px;
             box-shadow:0px 2px 10px 0px rgba(31,35,41,0.1);border:1px solid rgba(228,229,231,1);z-index:9999;
-            position:absolute;right:0px;'
+            position:absolute;'
+             :style='`right:${type === 1 ? "40px" : "0"};`'
         >
             <el-form style=' padding:20px 24px;' v-if='type==1'>
                 <p style='margin:0 0 8px 0'>生产厂商</p>
                 <el-input
                     placeholder='搜索生产厂商'
-                    style='width:192px;margin-right:12px'
+                    style='width:232px;margin-right:12px'
                     size='small'
                     clearable
                     prefix-icon='el-icon-search'
@@ -28,7 +30,7 @@
                 <el-input
                     placeholder='搜索服务商'
                     clearable
-                    style='width:192px;margin-right:12px'
+                    style='width:232px;margin-right:12px'
                     size='small'
                     prefix-icon='el-icon-search'
                     v-model='inputForm.fws'
@@ -36,20 +38,20 @@
             </el-form>
             <el-form style=' padding: 20px 24px;' v-if='type==2'>
                 <p style='margin:0 0 8px 0'>任务编号</p>
-                <el-input placeholder='搜索任务编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.gzglid' style='width:192px;'></el-input>
+                <el-input placeholder='搜索任务编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.gzglid' style='width:232px;'></el-input>
             </el-form>
             <el-form style=' padding: 20px 24px;' v-if='type==3'>
                 <p style='margin:0 0 8px 0'>工单编号</p>
-                <el-input placeholder='搜索工单编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.wonum' style='width:192px;'></el-input>
+                <el-input placeholder='搜索工单编号' clearable size='small' prefix-icon='el-icon-search' v-model='inputForm.wonum' style='width:232px;'></el-input>
             </el-form>
             <el-form style=' padding: 20px 24px;' v-if='type==4'>
                 <p style='margin:0 0 8px 0'>验收结果</p>
-                <el-select v-model='inputForm.status' placeholder='请选择' size='small' style='width:220px'>
+                <el-select v-model='inputForm.status' placeholder='请选择' size='small' style='width:232px'>
                     <el-option v-for='item in statusOption' :key='item.id' :label='item.name' :value='item.id'></el-option>
                 </el-select>
                 <p style='margin:16px 0 8px 0'>验收日期</p>
                 <el-date-picker
-                    style='width:220px'
+                    style='width:232px'
                     v-model='inputForm.yssjwcsj'
                     value-format='yyyyMMdd'
                     type='daterange'
@@ -59,7 +61,7 @@
                     end-placeholder
                 ></el-date-picker>
             </el-form>
-            <div style='position:absolute;bottom:20px;right:47px;z-index:9999'>
+            <div style='position:absolute;bottom:24px;right:24px;z-index:9999'>
                 <el-button @click='dialogFormVisible = false' size='small'>取 消</el-button>
                 <el-button type='primary' @click='confirm' size='small'>确 定</el-button>
             </div>

+ 10 - 7
src/views/equipment/table/otherTable.vue

@@ -26,7 +26,6 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
-
             <Select
                 width='180'
                 tipPlace='top'
@@ -38,7 +37,7 @@
             ></Select>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
             <el-table-column prop='lb' label='其他事项详情' show-overflow-tooltip resizable>
                 <el-table-column prop='zlwfwe' label='记录事项' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.jlsx || '--'}}</template>
@@ -49,23 +48,23 @@
                 <el-table-column prop='content' label='内容' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.content || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量'>
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='zfje' label='金额(万元)'>
+            <el-table-column prop='zfje' label='金额(万元)' width='80'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='handledate' label='处理日期'>
+            <el-table-column prop='handledate' label='处理日期' width='130'>
                 <template slot-scope='{row}'>{{row.handledate?formatter(row.handledate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable>
+            <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable width='100'>
                 <template slot-scope='{row}'>{{row.handleresults || '--'}}</template>
             </el-table-column>
             <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='recordtime' label='记录日期'>
+            <el-table-column prop='recordtime' label='记录日期' width='140'>
                 <template slot-scope='{row}'>{{row.createdate?formatter(row.createdate): '--'}}</template>
             </el-table-column>
         </el-table>
@@ -87,6 +86,7 @@ import { queryQtsx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { formatter, number_format } from '@/utils/format.js'
 import { querySelect } from '@/api/public.js'
+import { Select } from 'meri-design'
 export default {
     data() {
         return {
@@ -201,6 +201,9 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        handleresults(){
+            this.getList()
         }
     },
     mounted() {

+ 6 - 5
src/views/equipment/table/recordDialog.vue

@@ -1,10 +1,10 @@
 <template>
     <!-- 记录事项 -->
     <div class='detail-dialog'>
-        <el-dialog :title='`${major}${tabName}记录事项`' width='70%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
-            <div class='bottom-table' style='height:520px'>
-                <el-table :data='tableData' height='500' :border='true' style='width: 100%;margin-bottom:12px;' :span-method='objectSpanMethod'>
-                    <el-table-column label='位置' prop width='140' show-overflow-tooltip resizable>
+        <el-dialog :title='`${major}${tabName}记录事项`' width='80%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
+            <div class='bottom-table' style='height:600px'>
+                <el-table :data='tableData' height='560' :border='true' style='width: 100%;margin-bottom:12px;' :span-method='objectSpanMethod'>
+                    <el-table-column label='位置' prop width='120' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.smswz || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='system' label='设备' width='200' show-overflow-tooltip resizable>
@@ -109,7 +109,8 @@ export default {
     .el-dialog__wrapper {
         overflow: hidden !important;
     }
-    .el-dialog {
+   /deep/.el-dialog {
+        margin-top: 7vh !important;
         overflow-y: scroll !important;
     }
 }

+ 24 - 10
src/views/equipment/table/standTable.vue

@@ -20,7 +20,16 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select
+                @change='getList'
+                @cancel='getList'
+                v-model='floor'
+                style='margin-right:12px;'
+                width='120'
+                tipPlace='top'
+                caption='楼层 :'
+                :selectdata='floorSelect'
+            ></Select>
             <el-input
                 clearable
                 placeholder='搜索生产厂商'
@@ -32,21 +41,21 @@
             ></el-input>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='300'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
             <!-- sbjc -->
-            <el-table-column prop='sl' label='数量' >
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌'>
+            <el-table-column prop='brand' label='品牌' width='200'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+            <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='楼层' >
+            <el-table-column prop='floor' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>
@@ -73,9 +82,9 @@
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import EqDetail from './eqDetaileDialog'
-import Select from '@/components/Select/Select.vue'
-import { mapGetters } from 'vuex'
 
+import { mapGetters } from 'vuex'
+import { Select } from 'meri-design'
 export default {
     data() {
         return {
@@ -84,7 +93,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 13,
             keyword: '',
             floor: '',
             row: {},
@@ -159,9 +168,14 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(newV, oldV) {
+            console.log(newV, oldV)
+            this.getList()
         }
     },
     mounted() {
+        this.floor = this.$cookie.get('floorMapId')
         this.getList()
     }
 }

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

@@ -13,12 +13,12 @@
             ></el-input>
             <el-input clearable placeholder='搜索品牌' size='small' @blur='getList' prefix-icon='el-icon-search' v-model='brand' style='width:192px'></el-input>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='category' label='类别' width='160'>
+        <el-table :data='tableData' style='width: 100%' :border='true'>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='category' label='类别'  show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.category || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' width='100'>
+            <el-table-column prop='sl' label='数量' >
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌'>
@@ -51,7 +51,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 13,
             lb: '',
             brand: ''
         }

+ 21 - 17
src/views/equipment/table/wbTable.vue

@@ -24,7 +24,7 @@
                 @change='getList'
                 v-model='ischange'
                 style='margin-right:12px'
-                width='190'
+                width='200'
                 tipPlace='top'
                 caption='是否更换配件信息 :'
                 :selectdata='changeOption'
@@ -63,48 +63,49 @@
             <input-dialog :type='2' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
+            <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='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换'>
+                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
                     <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='130' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' width='100' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量'>
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)'>
+                <el-table-column prop='cost' label='费用(万元)' width='80'>
                     <template slot-scope='{row}'>{{row.cost || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
+                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{number_format(row.source,2) || '--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='brand' label='现场照片'>
+            <el-table-column prop='brand' label='现场照片' width='70'>
                 <template slot-scope='{row}'>
-                    <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
+                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='140'>
+            <el-table-column prop='reportdate' label='填报时间' width='130'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='140'>
+            <el-table-column prop='sjjssj' label='验收时间' width='130'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable>
+            <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>{{row.wb_gzglid || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -125,7 +126,7 @@
 <script>
 import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import inputDialog from './inputDIalog'
 import { formatter, number_format } from '@/utils/format.js'
 export default {
@@ -135,7 +136,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
+            size: 11,
             sjjssj: '',
             reportdate: '',
             ischange: '',
@@ -241,6 +242,9 @@ export default {
                 // this.tabFind()
                 this.getList()
             }
+        },
+        ischange() {
+            this.getList()
         }
     },
     mounted() {

+ 20 - 24
src/views/equipment/table/wxTable.vue

@@ -24,7 +24,7 @@
                 @change='getList'
                 style='margin-right:12px;'
                 v-model='ischange'
-                width='180'
+                width='200'
                 tipPlace='top'
                 caption='是否更换配件信息 :'
                 :selectdata='changeOption'
@@ -61,58 +61,51 @@
                 ></el-date-picker>
             </div>
             <input-dialog :type='3' @confirm='confirm'></input-dialog>
-            <!-- <el-input
-                placeholder='搜索工单编号'
-                size='small'
-                @blur='getList'
-                prefix-icon='el-icon-search'
-                v-model='wonum'
-                style='width:192px;margin-right:12px'
-            ></el-input>-->
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
+            <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='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换'>
+                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
                     <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='130' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' width='100' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量'>
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)'>
+                <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>
                     <template slot-scope='{row}'>{{row.source || '--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='brand' label='现场照片'>
+            <el-table-column prop='brand' label='现场照片' width='80'>
                 <template slot-scope='{row}'>
-                    <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
+                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div v-else>{{'---'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='140'>
+            <el-table-column prop='reportdate' label='填报时间' width='130'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='140'>
+            <el-table-column prop='sjjssj' label='验收时间' width='130'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable>
+            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.wonum || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -134,7 +127,7 @@
 import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import { formatter, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
@@ -143,7 +136,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
+            size: 11,
             reportdate: '',
             sjjssj: '',
             ischange: '',
@@ -248,6 +241,9 @@ export default {
                 // this.tabFind()
                 this.getList()
             }
+        },
+        ischange() {
+            this.getList()
         }
     },
     mounted() {

+ 24 - 15
src/views/equipment/table/zwTable.vue

@@ -11,9 +11,9 @@
                 @change='getList'
                 style='width:180px;margin-right:12px'
             ></el-date-picker>
-            <Select width='146' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
+            <Select width='160' tipPlace='top' v-model='lb' caption='类别:' :selectdata='lbOption' :placeholder='"请选择"' @change='getList'></Select>
             <Select
-                width='120'
+                width='160'
                 tipPlace='top'
                 size='small'
                 v-model='xm'
@@ -26,7 +26,7 @@
                 placeholder='搜索实施方案说明'
                 prefix-icon='el-icon-search'
                 size='small'
-                style='width:192px;margin-right:12px'
+                style='width:192px'
                 v-model='ssfasm'
                 clearable
                 @blur='getList'
@@ -61,26 +61,26 @@
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号'></el-table-column>
-            <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.nd || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable>
+            <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.qs || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable>
+            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.lb || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable>
+            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.xm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable>
+            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable>
+            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable>
+            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
             </el-table-column>
             <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='140'>
@@ -89,13 +89,13 @@
             <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='140'>
                 <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable>
+            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>{{row.status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable>
+            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
             </el-table-column>
-            <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable>
+            <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width="100">
                 <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -129,7 +129,7 @@ export default {
             yssjwcsj: '',
             lxsjwcsj: '',
             ssfasm: '',
-            size: 10,
+            size: 11,
             keyword: '',
             nd: '',
             lb: '',
@@ -289,6 +289,15 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        sxjd(){
+            this.getList()
+        },
+        xm(){
+            this.getList()
+        },
+        lb(){
+            this.getList()
         }
     },
     mounted() {

+ 2 - 45
src/views/floorFunc/index.vue

@@ -5,17 +5,9 @@
         </div>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend :floors='floorsArr' type='1'></Legend>
+            <Legend :floors='floorsArr' type='1' :editTips='`编辑${floorInfo.code}层楼层功能平面图`'></Legend>
         </div>
         <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' :type='1' @emitFloor='emitFloor' :id='"floor"'></floor-list>
-        <!-- <div class='additional-box'>
-            <div class='additional' @click='additionalColl'>
-                <img src='../../assets/imgs/bg.png' alt />
-            </div>
-            <el-collapse-transition>
-                <div v-if='show' class='add-img'>我是放附加数据图片哒。。。</div>
-            </el-collapse-transition>
-        </div>-->
         <floorMap ref='floorMap' :loadName='loadName' :type='"floor"'></floorMap>
     </div>
 </template>
@@ -28,7 +20,7 @@ export default {
     components: { floorMap, floorList },
     data() {
         return {
-            show: false,
+            show: true,
             floorInfo: {
                 gname: 'f1',
                 code: 'F1'
@@ -91,40 +83,5 @@ export default {
         right: 32px;
         top: 155px;
     }
-    .additional-box {
-        position: relative;
-        .additional {
-            width: 44px;
-            height: 44px;
-            background: rgba(255, 255, 255, 1);
-            box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
-            border-radius: 2px;
-            position: fixed;
-            right: 32px;
-            top: 420px;
-            z-index: 2;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            cursor: pointer;
-            img {
-                width: 20px;
-                height: 20px;
-            }
-        }
-        .add-img {
-            width: 560px;
-            height: 325px;
-            background: #ffffff;
-            -webkit-box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
-            box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
-            border-radius: 2px;
-            border: 1px solid #e4e5e7;
-            position: absolute;
-            right: 77px;
-            top: 93px;
-            z-index: 2;
-        }
-    }
 }
 </style>

+ 5 - 5
src/views/legendLibrary/index.vue

@@ -99,15 +99,15 @@
                 <el-input size='small' @change='getTableList' prefix-icon='el-icon-search' v-model='keyword' style='width:192px;margin-right:12px;'></el-input>
             </div>
             <el-table :data='tableData' :key='key' :border='true' style='width: 100%'>
-                <el-table-column prop='Name' label='图例名称'>
+                <el-table-column prop='Name' label='图例名称' width='120'>
                     <template slot-scope='{row}'>{{row.Name }}</template>
                 </el-table-column>
-                <el-table-column prop='style' label='图例样式'>
+                <el-table-column prop='style' label='图例样式' width='150'>
                     <template slot-scope='{row}'>
                         <img class='img' :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
                     </template>
                 </el-table-column>
-                <el-table-column prop='Unit' label='单位'>
+                <el-table-column prop='Unit' label='单位' width='120'>
                     <template slot-scope='{row}'>{{row.Unit}}</template>
                 </el-table-column>
                 <el-table-column prop='position' label='对应广场说明书的位置' show-overflow-tooltip>
@@ -116,12 +116,12 @@
                     </template>
                 </el-table-column>
                 <el-table-column label='对应工程信息化' align='center'>
-                    <el-table-column prop='type' label='位置/设备分类' width='240' show-overflow-tooltip>
+                    <el-table-column prop='type' label='位置/设备分类' show-overflow-tooltip>
                         <template slot-scope='{row}'>
                             <span v-for='item in row.InfoLocal ' :key='item.name'>{{item.name}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop='system' label='专业' show-overflow-tooltip>
+                    <el-table-column prop='system' label='专业' show-overflow-tooltip width='120'>
                         <template slot-scope='{row}'>
                             <span v-for='(item,index) in row.InfoSystems ' :key='index'>{{item.Name}}</span>
                         </template>

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

@@ -9,8 +9,8 @@
         show-summary
         border
     >
-        <el-table-column label='序号' type='index'></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='总间数'>

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

@@ -37,7 +37,7 @@
             :data='zhjlTable'
             style='width: 100%;margin-top:12px'
         >
-            <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 sortable label='日期' width='90' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
@@ -47,10 +47,10 @@
             <el-table-column prop label='记录事项' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='工作要求'>
+            <el-table-column prop label='工作要求' width="160">
                 <template slot-scope='{row}'>{{row.workyq||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='整改要求'>
+            <el-table-column prop label='整改要求' width="160">
                 <template slot-scope='{row}'>{{row.zgyq||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='附件' width='80'>

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

@@ -55,7 +55,7 @@
             :data='dsfTable'
             style='width: 100%;margin-top:12px'
         >
-            <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 :show-overflow-tooltip='true' sortable label='任务名称'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>

+ 5 - 5
src/views/room/room3.vue

@@ -9,20 +9,20 @@
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
-                <el-table-column type='index' label='序号' width='50'></el-table-column>
+                <el-table-column type='index' label='序号' width='60'></el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.classqc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='70'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='品牌' :show-overflow-tooltip='true'>
+                <el-table-column prop label='品牌' :show-overflow-tooltip='true' width="120">
                     <template slot-scope='{row}'>{{row.brand||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='型号' :show-overflow-tooltip='true'>
+                <el-table-column prop label='型号' :show-overflow-tooltip='true' width="150">
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='70'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='100'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='150'>

+ 10 - 10
src/views/room/room4.vue

@@ -8,41 +8,41 @@
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
-                <el-table-column type='index' label='序号' width='50'></el-table-column>
+                <el-table-column type='index' label='序号' width='60'></el-table-column>
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备编号' show-overflow-tooltip resizable>
+                <el-table-column prop label='设备编号' show-overflow-tooltip resizable width="80"> 
                     <template slot-scope='{row}'>{{row.location||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='重要事项记录' width='130' show-overflow-tooltip resizable>
+                <el-table-column prop label='重要事项记录'  show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='描述' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.description||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>
-                    <el-table-column prop label='是/否更换' show-overflow-tooltip resizable>
+                    <el-table-column prop label='是/否更换' show-overflow-tooltip resizable width="80">
                         <template slot-scope='{row}'>
                             <div v-if='row.ismodel==0'>否</div>
                             <div v-else-if='row.ismodel==1'>是</div>
                             <div v-else>'--'</div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop label='配件名称型号' width='130' min-width='110' show-overflow-tooltip resizable>
+                    <el-table-column prop label='配件名称型号'  min-width='100' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.model||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='数量' show-overflow-tooltip resizable>
+                    <el-table-column prop label='数量' show-overflow-tooltip resizable width="80">
                         <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='费用(万元)' min-width='100' show-overflow-tooltip resizable>
+                    <el-table-column prop label='费用(万元)' min-width='80' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.cost?number_format(row.cost):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='费用出处' show-overflow-tooltip resizable>
+                    <el-table-column prop label='费用出处' show-overflow-tooltip resizable width="80">
                         <template slot-scope='{row}'>{{row.source||'--'}}</template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='现场照片' show-overflow-tooltip resizable>
+                <el-table-column prop label='现场照片' show-overflow-tooltip resizable width="80">
                     <template slot-scope='{row}'>{{row.pics || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
@@ -51,7 +51,7 @@
                 <el-table-column prop label='验收时间' show-overflow-tooltip width='130' resizable>
                     <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='工单编号' show-overflow-tooltip resizable>
+                <el-table-column prop label='工单编号' show-overflow-tooltip resizable width="80">
                     <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                 </el-table-column>
             </el-table>

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

@@ -8,17 +8,17 @@
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
-                <el-table-column type='index' label='序号' width='50'></el-table-column>
+                <el-table-column type='index' label='序号' width='60'></el-table-column>
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备编号' :show-overflow-tooltip='true'>
+                <el-table-column prop label='设备编号' :show-overflow-tooltip='true' width="80">
                     <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='150'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='现场照片' :show-overflow-tooltip='true'>
+                <el-table-column prop label='现场照片' :show-overflow-tooltip='true' width="80">
                     <template slot-scope='{row}'>
                         <div
                             style='cursor:pointer;color: #0091ff;'