YaolongHan пре 4 година
родитељ
комит
8ca04ec796

+ 4 - 4
package.json

@@ -8,11 +8,11 @@
         "lint": "vue-cli-service lint"
     },
     "dependencies": {
-        "@saga-web/base": "2.1.20",
-        "@saga-web/big": "1.0.43",
-        "@saga-web/draw": "2.1.96",
+        "@saga-web/base": "2.1.22",
+        "@saga-web/big": "1.0.48",
+        "@saga-web/draw": "2.1.98",
         "@saga-web/feng-map": "1.0.11",
-        "@saga-web/graph": "2.1.86",
+        "@saga-web/graph": "2.1.91",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 1 - 0
public/systemConf.js

@@ -23,6 +23,7 @@ var __systemConf = {
     // 系统编码
     systemCode: 'wandaBmGuide',
     conf: {
+        // 阿里云
         editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
         wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
     },

+ 7 - 4
src/components/Legend/src/legend.vue

@@ -274,7 +274,10 @@ export default {
             })
         },
         saveNum(val) {
-            if (val) {
+            if (val.length > 0) {
+                val.forEach(element => {
+                    element.Modify = element.IsModify
+                })
                 this.queryEdit(val)
                 this.isShow2()
             } else {
@@ -282,7 +285,6 @@ export default {
             }
         },
         addFloor() {
-            console.log(111111)
             this.isFloor = true
         },
         // 新增楼层取消
@@ -326,7 +328,8 @@ export default {
         .legend-table {
             padding: 16px;
             height: 546px;
-            width: 420px;
+            width: 385px;
+            // width: 420px;
             overflow: auto;
             overflow: hidden;
             overflow-y: auto;
@@ -345,7 +348,7 @@ export default {
     position: fixed;
     bottom: 28px;
     z-index: 1;
-     right: 28px;
+    right: 28px;
     .edit-icon,
     .edit-icon2 {
         width: 48px;

+ 10 - 7
src/components/editLengend.vue

@@ -15,16 +15,17 @@
                         height='430px'
                         :data='editTable'
                         tooltip-effect='dark'
+                        width='100%'
                         @selection-change='handleSelectionChange'
                     >
-                        <el-table-column prop label='项目' :show-overflow-tooltip='true' width='100'>
+                        <el-table-column prop label='项目' :show-overflow-tooltip='true'>
                             <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                         </el-table-column>
                         <el-table-column prop label='数量'>
                             <template slot-scope='{row}'>
                                 <div v-if='row.IsModify'>
                                     <div v-if='row.Num!=row.RealNum ' class='redData'>
-                                        <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Num} 与平面图中的不一致,平面图中为xx`' placement='top'>
+                                        <el-tooltip class='item' effect='dark' :content='`当前图例 ${row.Name} 与平面图中的不一致,平面图中为xx`' placement='top'>
                                             <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
                                         </el-tooltip>
                                     </div>
@@ -42,7 +43,7 @@
                                         v-if='!row.IsModify'
                                         class='item'
                                         effect='dark'
-                                        :content='`当前图例 ${row.Num},从平面图中直接获取,如需编辑请修改平面图`'
+                                        :content='`当前图例 ${row.Name},从平面图中直接获取,如需编辑请修改平面图`'
                                         placement='top'
                                     >
                                         <div class='dataTwo'>{{row.Num}}</div>
@@ -50,7 +51,7 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop label='单位' width='60'>
+                        <el-table-column prop label='单位'>
                             <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                         </el-table-column>
                         <el-table-column prop label='图例'>
@@ -192,9 +193,11 @@ export default {
         position: absolute;
         top: -44px;
         right: 44px;
+        width: 385px;
+        // width: 420px;
         height: 535px;
-        min-width: 350px;
-        width: auto;
+        // min-width: 350px;
+        // width: auto;
         background: rgba(255, 255, 255, 1);
         box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
         border-radius: 2px;
@@ -205,7 +208,7 @@ export default {
             .legend-table2 {
                 padding: 16px 10px;
                 height: 430px;
-                width: 345px;
+                width: 100%;
             }
         }
     }

+ 247 - 271
src/components/floorMap/index.vue

@@ -1,294 +1,270 @@
+
 <!-- 底图 -->
 <template>
-  <div id="floor_base" v-loading="loading" ref="graphy">
-    <div :id="`fengMap${id}`" class="fengMap"></div>
-    <canvas :id="`canvas${id}`" :width="canvasWidth" :height="canvasHeight" tabindex="0"></canvas>
-    <!-- 地图底部操作按钮 -->
-    <div class="strip-bottom">
-      <canvasFun
-        @fit="fit"
-        @savePng="savePng"
-        @saveSvg="saveSvg"
-        @saveJson="saveJson"
-        @scale="scale"
-        ref="canvasFun"
-      ></canvasFun>
+    <div id='floor_base' v-loading='loading' ref='graphy'>
+        <div :id='`fengMap${id}`' class='fengMap'></div>
+        <canvas :id='`canvas${id}`' :width='canvasWidth' :height='canvasHeight' tabindex='0'></canvas>
+        <!-- 地图底部操作按钮 -->
+        <div class='strip-bottom'>
+            <canvasFun @fit='fit' @savePng='savePng' @saveSvg='saveSvg' @saveJson='saveJson' @scale='scale' ref='canvasFun'></canvasFun>
+        </div>
+        <room-box ref='boxRoom'></room-box>
     </div>
-    <room-box ref="boxRoom"></room-box>
-  </div>
 </template>
 <script>
-import { SFengParser } from "@saga-web/feng-map";
-import { SFloorParser } from "@saga-web/big";
-import { FloorView } from "@/lib/FloorView";
-import { FloorScene } from "@/lib/FloorScene";
-import RoomBox from "@/views/room/index";
-import canvasFun from "@/components/floorMap/canvasFun";
-import { readGroup } from "@/api/public";
-import { STopologyParser } from "@/lib/parsers/STopologyParser";
-import { mapGetters, mapActions } from "vuex";
-import { SImageItem } from "@saga-web/graph/lib";
+import { SFengParser } from '@saga-web/feng-map'
+import { SFloorParser } from '@saga-web/big'
+import { FloorView } from '@/lib/FloorView'
+import { FloorScene } from '@/lib/FloorScene'
+import RoomBox from '@/views/room/index'
+import canvasFun from '@/components/floorMap/canvasFun'
+import { readGroup } from '@/api/public'
+import { STopologyParser } from '@/lib/parsers/STopologyParser'
+import { mapGetters, mapActions } from 'vuex'
+import { SImageItem } from '@saga-web/graph/lib'
 // import { uuid } from "@/components/mapClass/until";
-let fengmap = null;
+let fengmap = null
 
 export default {
-  data() {
-    return {
-      appName: "万达可视化系统",
-      key: "23f30a832a862c58637a4aadbf50a566",
-      mapServerURL: `/wdfn`,
-      canvasWidth: 1100,
-      canvasHeight: 800,
-      loading: false, // 限制重复查询
-      view: null,
-      urlMsg: {},
-      canvasID: "canvas"
-      // fmapID:'1001012_42',
-    };
-  },
-  props: {
-    id: {
-      default: "1",
-      type: String
+    data() {
+        return {
+            appName: '万达可视化系统',
+            key: '23f30a832a862c58637a4aadbf50a566',
+            mapServerURL: `/wdfn`,
+            canvasWidth: 1100,
+            canvasHeight: 800,
+            loading: false, // 限制重复查询
+            view: null,
+            urlMsg: {},
+            canvasID: 'canvas'
+            // fmapID:'1001012_42',
+        }
     },
-    loadName: null,
-    type: null
-  },
-  components: { RoomBox, canvasFun },
-  computed: {
-    ...mapGetters(["plazaId", "fmapID"])
-  },
-  methods: {
-    ...mapActions(["getfmapID"]),
-    init(floorid) {
-      if (this.loading) {
-        //console.log('正在查询...')
-        return;
-      }
-      this.loading = true;
-      if (!this.fmapID) {
-        this.getfmapID().then(() => {
-          this.urlMsg.fmapID = this.fmapID;
-          this.getMap(floorid);
-        });
-        return;
-      }
-      this.getMap(floorid);
+    props: {
+        id: {
+            default: '1',
+            type: String
+        },
+        loadName: null,
+        type: null
     },
-    getMap(floorid) {
-      this.clearGraphy();
-      this.scene = new FloorScene();
-      this.scene.selectContainer.connect("listChange", this, this.listChange);
-      if (!fengmap || this.canvasID != `canvas${this.id}`) {
-        this.canvasID = `canvas${this.id}`;
-        fengmap = new SFengParser(
-          `fengMap${this.id}`,
-          `${this.mapServerURL}/fmap/${this.fmapID}`,
-          this.key,
-          this.appName,
-          null
-        );
-        fengmap.loadMap(this.fmapID, () => {
-          this.parserData(floorid);
-          this.readGroup(floorid).then(data => {
-            if (data.Data.length > 0) {
-              //console.log(data.data.Data[0].ID)
-              this.$cookie.set("graphId", data.Data[0].ID, 3);
-            }
-            const parserData = new STopologyParser(null);
-            parserData.parseData(data.Data[0].Elements);
-            // 多边形
-            parserData.zoneLegendList.forEach(t => {
-              this.scene.addItem(t);
-            });
-            // 增加文字
-            parserData.textMarkerList.forEach(t => {
-              this.scene.addItem(t);
-            });
-            // 增加图片
-            parserData.imageMarkerList.forEach(t => {
-              this.scene.addItem(t);
-            });
-            // 增加直线
-            parserData.lineMarkerList.forEach(t => {
-              this.scene.addItem(t);
-            });
-            // 增加图标类图例
-            parserData.imageLegendList.forEach(t => {
-              this.scene.addItem(t);
-            });
-            // 增加管线类
-            // 增加图标类图例
-            parserData.relationList.forEach(t => {
-              this.scene.addItem(t);
-            });
-            this.view.fitSceneToView();
-          });
-        });
-        // 获取主题数据
-        fengmap
-          .loadTheme(
-            `${this.mapServerURL}/webtheme/${this.fmapID}/${this.fmapID}.theme`
-          )
-          .then(res => {
-            //console.log('获取rf成功', res)
-          });
-      } else {
-        this.parserData(floorid);
-      }
+    components: { RoomBox, canvasFun },
+    computed: {
+        ...mapGetters(['plazaId', 'fmapID'])
     },
-    parserData(floor) {
-      if (floor == "g80") {
-        // 屋顶
-        if (fengmap.frImg) {
-          let imgItem = new SImageItem(
-            null,
-            `${this.mapServerURL}/webtheme/${this.fmapID}/${fengmap.frImg}`
-          );
-          this.scene.addItem(imgItem);
-          this.view.scene = this.scene;
-          this.view.fitSceneToView();
-          console.log('this.view',this.view)
-          this.view.minScale = this.view.scale;
-          if (this.$refs.canvasFun) {
-            this.$refs.canvasFun.everyScale = this.view.scale;
-          }
-          this.loading = false;
-        }
-      } else {
-        if (fengmap.gnameToGid[floor]) {
-          fengmap.parseData(fengmap.gnameToGid[floor], res => {
-            if (res.err) {
-              //console.log(res.err)
-              return;
+    methods: {
+        ...mapActions(['getfmapID']),
+        init(floorid) {
+            if (this.loading) {
+                //console.log('正在查询...')
+                return
+            }
+            this.loading = true
+            if (!this.fmapID) {
+                this.getfmapID().then(() => {
+                    this.urlMsg.fmapID = this.fmapID
+                    this.getMap(floorid)
+                })
+                return
+            }
+            this.getMap(floorid)
+        },
+        getMap(floorid) {
+            this.clearGraphy()
+            this.scene = new FloorScene()
+            this.scene.selectContainer.connect('listChange', this, this.listChange)
+            if (!fengmap || this.canvasID != `canvas${this.id}`) {
+                this.canvasID = `canvas${this.id}`
+                fengmap = new SFengParser(`fengMap${this.id}`, `${this.mapServerURL}/fmap/${this.fmapID}`, this.key, this.appName, null)
+                fengmap.loadMap(this.fmapID, () => {
+                    this.parserData(floorid)
+                    this.readGroup(floorid).then(data => {
+                        if (data.Data.length > 0) {
+                            //console.log(data.data.Data[0].ID)
+                            this.$cookie.set('graphId', data.Data[0].ID, 3)
+                        }
+                        const parserData = new STopologyParser(null)
+                        parserData.parseData(data.Data[0].Elements)
+                        // 多边形
+                        parserData.zoneLegendList.forEach(t => {
+                            this.scene.addItem(t)
+                        })
+                        // 增加文字
+                        parserData.textMarkerList.forEach(t => {
+                            this.scene.addItem(t)
+                        })
+                        // 增加图片
+                        parserData.imageMarkerList.forEach(t => {
+                            this.scene.addItem(t)
+                        })
+                        // 增加直线
+                        parserData.lineMarkerList.forEach(t => {
+                            this.scene.addItem(t)
+                        })
+                        // 增加图标类图例
+                        parserData.imageLegendList.forEach(t => {
+                            this.scene.addItem(t)
+                        })
+                        // 增加管线类
+                        // 增加图标类图例
+                        parserData.relationList.forEach(t => {
+                            this.scene.addItem(t)
+                        })
+                        this.view.fitSceneToView()
+                    })
+                })
+                // 获取主题数据
+                fengmap.loadTheme(`${this.mapServerURL}/webtheme/${this.fmapID}/${this.fmapID}.theme`).then(res => {
+                    //console.log('获取rf成功', res)
+                })
+            } else {
+                this.parserData(floorid)
             }
-            const fParser = new SFloorParser(null);
-            fParser.parseData(res);
-            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.view.scene = this.scene;
-            this.view.fitSceneToView();
-            this.view.minScale = this.view.scale;
-            if (this.$refs.canvasFun) {
-              this.$refs.canvasFun.everyScale = this.view.scale;
+        },
+        parserData(floor) {
+            if (floor == 'g80') {
+                // 屋顶
+                if (fengmap.frImg) {
+                    let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${fengmap.frImg}`)
+                    this.scene.addItem(imgItem)
+                    this.view.scene = this.scene
+                    this.view.fitSceneToView()
+                    this.view.minScale = this.view.scale
+                    if (this.$refs.canvasFun) {
+                        this.$refs.canvasFun.everyScale = this.view.scale
+                    }
+                    this.loading = false
+                }
+            } else {
+                if (fengmap.gnameToGid[floor]) {
+                    fengmap.parseData(fengmap.gnameToGid[floor], res => {
+                        if (res.err) {
+                            //console.log(res.err)
+                            return
+                        }
+                        const fParser = new SFloorParser(null)
+                        fParser.parseData(res)
+                        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.view.scene = this.scene
+                        this.view.fitSceneToView()
+                        this.view.minScale = this.view.scale
+                        if (this.$refs.canvasFun) {
+                            this.$refs.canvasFun.everyScale = this.view.scale
+                        }
+                        this.loading = false
+                        //console.log('success')
+                    })
+                } else {
+                    //console.log('楼层不正确')
+                }
+            }
+        },
+        clearGraphy() {
+            if (this.view) {
+                this.view.scene = null
+                return
+            }
+            this.view = new FloorView(`canvas${this.id}`)
+        },
+        listChange(item, ev) {
+            let name = ev[0][0].data.Name
+            if (name.slice(name.length - 2, name.length) == '机房') {
+                this.$refs.boxRoom.open({ name: name, type: this.type })
+            }
+        },
+        // 适配底图到窗口
+        fit() {
+            this.view.fitSceneToView()
+        },
+        // 保存为png
+        savePng() {
+            this.view.saveImage(`${this.loadName}.png`, 'png')
+            //console.log(`${this.loadName}.png`)
+        },
+        // 保存为svg
+        saveSvg() {
+            this.view.saveSceneSvg(`${this.loadName}.svg`, 6400, 4800)
+        },
+        // 保存为json
+        saveJson() {
+            this.view.saveFloorJson(`${this.loadName}.json`)
+        },
+        // 缩放
+        scale(val) {
+            if (!this.view) {
+                return
+            }
+            let scale = this.view.scale
+            console.log(val / scale, this.canvasWidth / 2, this.canvasHeight / 2)
+            this.view.scaleByPoint(val / scale, this.canvasWidth / 2, this.canvasHeight / 2)
+        },
+        // 读取数据
+        readGroup(FloorID) {
+            const data = {
+                BuildingID: '1',
+                FloorID: FloorID,
+                categoryId: this.$cookie.get('categoryId'),
+                projectId: this.urlMsg.ProjectID
+            }
+            return readGroup(data)
+        },
+        // 地图尺寸
+        mapSize() {
+            if (window.screen.height == '768') {
+                this.canvasWidth = this.$refs.graphy.offsetWidth
+                this.canvasHeight = this.$refs.graphy.offsetHeight - 100
+            } else {
+                this.canvasWidth = this.$refs.graphy.offsetWidth
+                this.canvasHeight = 900
             }
-            this.loading = false;
-            //console.log('success')
-          });
-        } else {
-          //console.log('楼层不正确')
         }
-      }
-    },
-    clearGraphy() {
-      if (this.view) {
-        this.view.scene = null;
-        return;
-      }
-      this.view = new FloorView(`canvas${this.id}`);
     },
-    listChange(item, ev) {
-      let name = ev[0][0].data.Name;
-      if (name.slice(name.length - 2, name.length) == "机房") {
-        this.$refs.boxRoom.open({ name: name, type: this.type });
-      }
-    },
-    // 适配底图到窗口
-    fit() {
-      this.view.fitSceneToView();
-    },
-    // 保存为png
-    savePng() {
-      this.view.saveImage(`${this.loadName}.png`, "png");
-      //console.log(`${this.loadName}.png`)
-    },
-    // 保存为svg
-    saveSvg() {
-      this.view.saveSceneSvg(`${this.loadName}.svg`, 6400, 4800);
-    },
-    // 保存为json
-    saveJson() {
-      this.view.saveFloorJson(`${this.loadName}.json`);
-    },
-    // 缩放
-    scale(val) {
-      if (!this.view) {
-        return;
-      }
-      let scale = this.view.scale;
-      console.log(val / scale, this.canvasWidth / 2, this.canvasHeight / 2);
-      this.view.scaleByPoint(
-        val / scale,
-        this.canvasWidth / 2,
-        this.canvasHeight / 2
-      );
+    watch: {
+        'view.scale': {
+            handler(n) {
+                if (this.$refs.canvasFun) {
+                    let s = (n * 10) / this.view.minScale
+                    this.$refs.canvasFun.sliderVal = s > 1000 ? 1000 : s
+                }
+            }
+        }
     },
-    // 读取数据
-    readGroup(FloorID) {
-      const data = {
-        BuildingID: "1",
-        FloorID: FloorID,
-        categoryId: this.$cookie.get("categoryId"),
-        projectId: this.urlMsg.ProjectID
-      };
-      return readGroup(data);
+    mounted() {
+        this.mapSize()
     },
-    // 地图尺寸
-    mapSize() {
-      if (window.screen.height == "768") {
-        this.canvasWidth = this.$refs.graphy.offsetWidth;
-        this.canvasHeight = this.$refs.graphy.offsetHeight - 100;
-      } else {
-        this.canvasWidth = this.$refs.graphy.offsetWidth;
-        this.canvasHeight = 900;
-      }
-    }
-  },
-  watch: {
-    "view.scale": {
-      handler(n) {
-        if (this.$refs.canvasFun) {
-          let s = (n * 10) / this.view.minScale;
-          this.$refs.canvasFun.sliderVal = s > 1000 ? 1000 : s;
+    created() {
+        this.urlMsg = {
+            categoryId: this.$cookie.get('categoryId'),
+            ProjectID: this.plazaId,
+            BuildingID: '1',
+            FloorID: this.$cookie.get('floorMapId') || 'f1',
+            fmapID: this.fmapID
         }
-      }
     }
-  },
-  mounted() {
-    this.mapSize();
-  },
-  created() {
-    this.urlMsg = {
-      categoryId: this.$cookie.get("categoryId"),
-      ProjectID: this.plazaId,
-      BuildingID: "1",
-      FloorID: this.$cookie.get("floorMapId") || "f1",
-      fmapID: this.fmapID
-    };
-  }
-};
+}
 </script>
 <style lang="less" scoped>
 #floor_base {
-  position: relative;
-  .fengMap {
-    position: fixed;
-    width: 100px;
-    height: 100px;
-    z-index: -1;
-  }
-  .strip-bottom {
-    position: absolute;
-    right: 0;
-    bottom: 40px;
-    width: 100%;
-  }
+    position: relative;
+    .fengMap {
+        position: fixed;
+        width: 100px;
+        height: 100px;
+        z-index: -1;
+    }
+    .strip-bottom {
+        position: absolute;
+        right: 0;
+        bottom: 40px;
+        width: 100%;
+    }
 }
-</style>
+</style>

+ 1 - 1
src/components/viewLengend.vue

@@ -52,7 +52,7 @@
                 <el-table-column prop='Unit' label='单位' width='70'>
                     <template slot-scope='{row}'>{{row.Unit||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='Url' label='图例'>
+                <el-table-column prop='Url' label='图例' width='55'>
                     <template slot-scope='{row}'>
                         <div v-if='row.Url' class='Url-img'>
                             <img :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />

+ 2 - 1
src/views/legendLibrary/addForm.vue

@@ -208,7 +208,8 @@ export default {
             })
         },
         handleRemove(file, fileList) {
-            // //console.log(file, fileList, 'file')
+            console.log(file, fileList, 'file')
+            this.ruleForm.Url = ''
         },
         getFile(file) {
             // let imgSrc = document.querySelector('.input-right>img')

+ 18 - 3
src/views/legendLibrary/index.vue

@@ -4,7 +4,7 @@
             <img class='img-menu' src='@/assets/imgs/menu.png' alt />
             <el-divider direction='vertical'></el-divider>
             <img class='img-logo' src='@/assets/imgs/logo_tu.png' alt />
-            <span style='color:#1F2329'>万达管理说明书</span>
+            <span class='nav-span1'>万达管理说明书</span>
             <span class='circular'></span>
             <!-- <span style='color:#1F2329'>图例库管理</span>
             <i class='el-icon-caret-bottom'></i>-->
@@ -426,30 +426,45 @@ export default {
         width: 100%;
         background: #fff;
         margin-left: 17px;
+        display: flex;
+        align-items: center;
         .img-menu {
             margin-right: 9px;
         }
         .img-logo {
             margin: 0 9px;
         }
+        .nav-span1 {
+            height: 26px;
+            font-size: 14px;
+            font-family: MicrosoftYaHei;
+            color: rgba(31, 35, 41, 1);
+            line-height: 26px;
+        }
         .circular {
             display: inline-block;
             width: 4px;
             height: 4px;
             background: rgba(195, 198, 203, 1);
             border-radius: 50%;
-            margin: 0 8px 3px 8px;
+            margin: 0 8px 0px 8px;
         }
     }
+    /deep/ .p-drop {
+        height: 48px;
+    }
     /deep/ .p-drop .p-drop-title .p-drop-triangle {
         margin-top: -5px;
     }
     .legend-library-top {
-        height: 48px;
+        height: 45px;
         background: rgba(247, 249, 250, 1);
         text-align: center;
         line-height: 48px;
         color: #1f2329;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: rgba(31, 36, 41, 1);
         .library-btn {
             float: right;
             margin-right: 16px;

+ 5 - 4
src/views/legendRules/index.vue

@@ -156,9 +156,9 @@ export default {
                     let upDate = _this.tableData[index - 1]
                     _this.tableData.splice(index - 1, 1)
                     _this.tableData.splice(index, 0, upDate)
+                    let ids = _this.tableData.map(({ Id }) => Id)
+                    _this.upDateGraphy(ids)
                 }
-                let ids = _this.tableData.map(({ Id }) => Id)
-                _this.upDateGraphy(ids)
             }
 
             function down() {
@@ -168,9 +168,9 @@ export default {
                     let downDate = _this.tableData[index + 1]
                     _this.tableData.splice(index + 1, 1)
                     _this.tableData.splice(index, 0, downDate)
+                    let ids = _this.tableData.map(({ Id }) => Id)
+                    _this.upDateGraphy(ids)
                 }
-                let ids = _this.tableData.map(({ Id }) => Id)
-                _this.upDateGraphy(ids)
             }
         },
         // 更新图例关系信息
@@ -180,6 +180,7 @@ export default {
                 GraphElementIds: ids,
                 Move: true
             }
+
             graphElementUpdate({ posParams }).then(res => {
                 this.getData()
             })

+ 6 - 6
src/views/room/detail.vue

@@ -111,13 +111,13 @@
             :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 prop='sbjc' label='设备名称' :show-overflow-tooltip='true' resizable>
+            <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbbh' label='设备编号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbbh||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' :show-overflow-tooltip='true'>
+            <el-table-column prop='sl' label='数量' width='70' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sl||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbglgs' label='管理归属' :show-overflow-tooltip='true'>
@@ -132,16 +132,16 @@
             <el-table-column prop='sbxh' label='型号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层' :show-overflow-tooltip='true'>
+            <el-table-column prop='floor' label='楼层' width='70' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.floor||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzqy' label='安装位置' :show-overflow-tooltip='true'>
+            <el-table-column prop='wzqy' label='安装位置' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.wzqy||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' :show-overflow-tooltip='true'>
+            <el-table-column prop='manufacturer' label='生产厂商' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='fws' label='服务商' :show-overflow-tooltip='true'>
+            <el-table-column prop='fws' label='服务商' min-width='150' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.fws||'--'}}</template>
             </el-table-column>
         </el-table>

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

@@ -10,10 +10,10 @@
                 :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 prop :show-overflow-tooltip='true' label='设备简称' resizable>
+                <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'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='70'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='品牌' :show-overflow-tooltip='true'>
@@ -22,10 +22,10 @@
                 <el-table-column prop label='型号' :show-overflow-tooltip='true'>
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层' :show-overflow-tooltip='true'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='70'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商'>
+                <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='150'>
                     <template slot-scope='{row}'>{{row.manufacturer||'--'}}</template>
                 </el-table-column>
             </el-table>

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

@@ -9,7 +9,7 @@
                 :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 prop label='设备名称' show-overflow-tooltip resizable>
+                <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>
@@ -18,7 +18,7 @@
                 <el-table-column prop label='重要事项记录' width='130' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='描述' show-overflow-tooltip resizable>
+                <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>

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

@@ -9,13 +9,13 @@
                 :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 prop label='设备名称' show-overflow-tooltip resizable>
+                <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'>
                     <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='130'>
+                <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'>
@@ -32,7 +32,7 @@
                             <div style='cursor:pointer;color: #0091ff;'>{{row.wb_gzglid||'--'}}</div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop label='维保任务名称' :show-overflow-tooltip='true' min-width='100'>
+                    <el-table-column prop label='维保任务名称' :show-overflow-tooltip='true' min-width='150'>
                         <template slot-scope='{row}'>{{row.wbrwmc || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='任务状态' :show-overflow-tooltip='true'>
@@ -55,7 +55,7 @@
                     <el-table-column prop label='异常工单编号' :show-overflow-tooltip='true' min-width='110'>
                         <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='描述' :show-overflow-tooltip='true'>
+                    <el-table-column prop label='描述' :show-overflow-tooltip='true' min-width='150'>
                         <template slot-scope='{row}'>{{row.description||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='填报时间' :show-overflow-tooltip='true' width='130'>