guoxiaohuan 4 years ago
parent
commit
d559dc2ab9

+ 4 - 4
public/systemConf.js

@@ -24,11 +24,11 @@ var __systemConf = {
     systemCode: 'wandaBmGuide',
     conf: {
         // 阿里云
-        // editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        // wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
+        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
         // http://glsms.wanda-dev.cn/ 测试服
-        editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
+        // editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
+        // wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
         // editerUrl: 'http://localhost:8091/wandaEditer/', // 编辑器地址
         // wandaBmGuideUrl: 'http://localhost:8090/wandaBmGuide/', //管理书地址
     },

+ 2 - 2
src/api/equipmentList.js

@@ -2,12 +2,12 @@ import httputils from '@/api/httputils'
 
 // 设备设施-主要设备清单
 export function queryEquipmentList({ data, postParams }) {
-    return httputils.fetchJson(`/sms/queryStatistics`, data, postParams)
+    return httputils.fetchJson(`/data/sms_asset/queryStatistics`, data, postParams)
 }
 
 // 设备设施-主要设备清单详情
 export function queryAsset({ data, postParams }) {
-    return httputils.fetchJson(`/sms/query`, data, postParams)
+    return httputils.fetchJson(`/data/sms_asset/query`, data, postParams)
 }
 // 设备设施-主要材料清单
 export function queryMaterialList({ getParams }) {

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

@@ -10,7 +10,7 @@
             <!-- 图里展示状态组件 -->
             <el-collapse-transition v-if='(type==1 || floors.length>0)&& isMessage && legendTable.length>0 '>
                 <div class='legend-tab' v-if='showView===1'>
-                    <div class='legend-table2' v-if='systemName=="土建系统"'>
+                    <div class='legend-table2' v-if='systemName=="土建装饰"'>
                         <lengend-view @changeSwitch='handleSwich' :remarksText='remarksText' ref='viewLengend' :systemName='systemName'></lengend-view>
                     </div>
                     <div class='legend-table' v-else>
@@ -47,12 +47,12 @@
         <div class='edit_map' v-else>
             <!-- 备注编辑器 -->
             <el-tooltip effect='dark' content='编辑备注' placement='left'>
-                <span v-if='systemName != "土建系统" && isMessage' class='bjtk' @click='legendClik'>备注</span>
+                <span v-if='systemName != "土建装饰" && isMessage' class='bjtk' @click='legendClik'>备注</span>
             </el-tooltip>
             <!-- 编辑图例 -->
             <el-tooltip effect='dark' content='编辑图例' placement='left'>
-                <span class='bjtk' v-if='systemName != "土建系统" && isMessage' @click='editTl'>图例</span>
-                <!-- <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk-1'> -->
+                <span class='bjtk' v-if='systemName != "土建装饰" && isMessage' @click='editTl'>图例</span>
+                <!-- <p v-if='systemName != "土建装饰" && isMessage' @click='editTl' class='tltk-1'> -->
                 <!-- <img src='@/assets/imgs/bjtl.png' alt /> -->
                 <!-- </p> -->
             </el-tooltip>
@@ -99,7 +99,7 @@
             </p>
         </div>
 
-        <legend-remarks @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
+        <legend-remarks @queryView='queryView' @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
     </div>
 </template>
 <script>
@@ -118,7 +118,6 @@ export default {
             text1:
                 '<p>主要设备房包括:冷源机房,热源机房,开闭站,配变电所(室),发电机房,消防水泵房,消防高位水箱间,生活水泵房,慧云机房,垃圾房</p>',
             text2: '<p>图例后×的数字,代表此位置的数量</p>',
-            text2: '',
             loading: true,
             loading1: true,
             viewTable: [],
@@ -270,12 +269,12 @@ export default {
                         // 返回有备注
                         remarksText = Res
                     } else {
-                        if (this.planNum > 0 && this.typeNum > 1) {
-                            remarksText = `${this.text1}${this.text2}${Res}`
-                        } else if (this.planNum > 0) {
-                            remarksText = `${this.text1}${Res}`
-                        } else if (this.typeNum > 1) {
-                            remarksText = `${this.text2}${Res}`
+                        if (this.planNum && this.typeNum) {
+                            remarksText = `${this.text1}${this.text2}`
+                        } else if (this.planNum) {
+                            remarksText = `${this.text1}`
+                        } else if (this.typeNum) {
+                            remarksText = `${this.text2}`
                         } else {
                             remarksText = ''
                         }
@@ -338,7 +337,6 @@ export default {
             // this.show2 = !this.show2
         },
         handleSwich(val) {
-            console.log(val)
             this.queryView(!val)
         },
         // 默认隐藏为0的项目
@@ -363,6 +361,8 @@ export default {
             queryStatis({ data, postParams }).then(res => {
                 this.loading = false
                 let viewTable = []
+                this.planNum = ''
+                this.typeNum = ''
                 viewTable = res.data.Data ? res.data.Data : []
                 this.$store.commit('SETLEGENDTABLE', viewTable)
                 if (viewTable.length > 0) {
@@ -370,11 +370,22 @@ export default {
                         if (el.Name == '主要设备房') {
                             this.planNum = el.Num
                         }
-                        if (el.type == 'Image') {
+                        if (el.Type == 'Image' && el.Num > 1) {
                             this.typeNum = el.Num
                         }
                     })
                 }
+                let remarksTexts = ''
+                if (this.planNum && this.typeNum) {
+                    remarksTexts = `${this.text1}${this.text2}`
+                } else if (this.planNum) {
+                    remarksTexts = `${this.text1}`
+                } else if (this.typeNum) {
+                    remarksTexts = `${this.text2}`
+                } else {
+                    remarksTexts = ''
+                }
+                this.$store.commit('SETREMARKSTEXT', remarksTexts)
                 this.$nextTick(() => {
                     if (this.$refs.viewLengend) {
                         this.$refs.viewLengend.setSelected()
@@ -488,16 +499,17 @@ export default {
                     // 返回有备注
                     remarksText = res
                 } else {
-                    if (this.planNum > 0 && this.typeNum > 1) {
+                    if (this.planNum && this.typeNum) {
                         remarksText = `${this.text1}${this.text2}${res}`
-                    } else if (this.planNum > 0) {
+                    } else if (this.planNum) {
                         remarksText = `${this.text1}${res}`
-                    } else if (this.typeNum > 1) {
+                    } else if (this.typeNum) {
                         remarksText = `${this.text2}${res}`
                     } else {
                         remarksText = ''
                     }
                 }
+                console.log(remarksText)
                 this.$store.commit('SETREMARKSTEXT', remarksText)
             })
         }

+ 2 - 2
src/components/floorMap/index.vue

@@ -151,7 +151,7 @@ export default {
                 } else {
                     bus.$emit('queryRemarksMethods', '')
                 }
-                //土建系统的图例展示
+                //土建装饰的图例展示
                 if (this.$cookie.get('categoryId') == 'SCPZ') {
                     let scpzTable = []
                     scpzTable = data.Data[0].Elements.Nodes || []
@@ -161,7 +161,7 @@ export default {
                 this.$cookie.set('graphId', data.Data[0].ID, 3)
                 if (this.$cookie.get('graphId')) {
                     // 得到graphId 就请求图例
-                    // 除土建系统之外的图例展示 包括楼层功能
+                    // 除土建装饰之外的图例展示 包括楼层功能
                     bus.$emit('queryViewMethods')
                 }
                 this.topologyParser = new STopologyParser(null)

+ 3 - 0
src/components/legendremarks.vue

@@ -73,6 +73,9 @@ export default {
         },
         // val为传过来的备注
         showModal() {
+            this.$emit('queryView', false)
+            // this.$emit('')
+            // return
             this.visible = true
             this.remarksTexts = this.remarksText
         },

+ 2 - 2
src/components/menuList.vue

@@ -162,10 +162,10 @@ export default {
         clickEventAcitve(item) {
             if (item.name == '楼层功能') {
                 this.$cookie.set('categoryId', 'LCGN', 3)
-                store.commit('SETCATEGORYID', 'LCGN')
+                // store.commit('SETCATEGORYID', 'LCGN')
             } else {
                 this.$cookie.set('categoryId', 'GDXT', 3)
-                store.commit('SETCATEGORYID', 'GDXT')
+                // store.commit('SETCATEGORYID', 'GDXT')
             }
             this.list.forEach(ele => {
                 ele.state = false

+ 1 - 1
src/components/viewLengend.vue

@@ -5,7 +5,7 @@
 */
 <template>
     <div class='views'>
-        <div v-if='systemName=="土建系统"'>
+        <div v-if='systemName=="土建装饰"'>
             <el-table
                 ref='dataTable'
                 :data='scpzTable'

+ 2 - 2
src/store/index.js

@@ -28,8 +28,8 @@ export default new Vuex.Store({
         fmapID: '',
         haveFengMap: false, //是否有蜂鸟地图的数据
         isMessage: true, //是否有发布的图
-        scpzTable: [], //土建系统图例展示
-        legendTable: [], //除土建系统图例展示
+        scpzTable: [], //土建装饰图例展示
+        legendTable: [], //除土建装饰图例展示
         remarksText: '', //备注
         bunkObj: {}, // 铺位名称
         currentFloor: {}, //当前选中的楼层信息

File diff suppressed because it is too large
+ 369 - 368
src/utils/plugins/components.js


+ 388 - 414
src/views/Device/Dnav.vue

@@ -1,449 +1,423 @@
 <template>
-  <div>
-    <div class="nav">
-      <div
-        v-for="(item,index) in navList"
-        :key="index"
-        class="nav-item"
-        :class='{"icon-active":active[index]}'
-        @click="handleClick(item,index)"
-      >
-        <img
-          class="icon"
-          :src="item.src"
-        />
-        <span class="nav-text">{{item.text}}</span>
-        <div
-          class="nav-sec"
-          v-if="index==2 && isGeneralShow"
-        >
-          <div
-            class="nav-item "
-            v-for="(item,i) in generalList"
-            :class='{"sec-active":secActive[i]}'
-            :key="i"
-            @click="handleOpen(item.name)"
-            @mouseover="handSecMouseOver(i,2)"
-            @mouseleave="handSecMouseLeave"
-          >
-            <span class="nav-radio"></span>
-            <span class="nav-text">{{item.text}}</span>
-
-          </div>
-
-        </div>
-        <div
-          class="nav-sec"
-          v-if="index==3 && isFireShow"
-        >
-          <div
-            class="nav-item "
-            v-for="(item,i) in fireList"
-            :class='{"sec-active":secActive[i]}'
-            :key="i"
-            @click="handleOpen(item.name)"
-            @mouseover="handSecMouseOver(i,1)"
-            @mouseleave="handSecMouseLeave"
-          >
-            <span class="nav-radio"></span>
-            <span class="nav-text">{{item.text}}</span>
-
-          </div>
-
+    <div>
+        <div class='nav'>
+            <div
+                v-for='(item,index) in navList'
+                :key='index'
+                class='nav-item'
+                :class='{"icon-active":active[index]}'
+                @click='handleClick(item,index)'
+            >
+                <img class='icon' :src='item.src' />
+                <span class='nav-text'>{{item.text}}</span>
+                <div class='nav-sec' v-if='index==2 && isGeneralShow'>
+                    <div
+                        class='nav-item'
+                        v-for='(item,i) in generalList'
+                        :class='{"sec-active":secActive[i]}'
+                        :key='i'
+                        @click='handleOpen(item.name)'
+                        @mouseover='handSecMouseOver(i,2)'
+                        @mouseleave='handSecMouseLeave'
+                    >
+                        <span class='nav-radio'></span>
+                        <span class='nav-text'>{{item.text}}</span>
+                    </div>
+                </div>
+                <div class='nav-sec' v-if='index==3 && isFireShow'>
+                    <div
+                        class='nav-item'
+                        v-for='(item,i) in fireList'
+                        :class='{"sec-active":secActive[i]}'
+                        :key='i'
+                        @click='handleOpen(item.name)'
+                        @mouseover='handSecMouseOver(i,1)'
+                        @mouseleave='handSecMouseLeave'
+                    >
+                        <span class='nav-radio'></span>
+                        <span class='nav-text'>{{item.text}}</span>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
 
+        <img v-show='isFireShow||isGeneralShow' src='../../assets/images/device/nav-bg.png' alt='nav-bg' class='nav-bg' />
     </div>
-
-    <img
-      v-show="isFireShow||isGeneralShow"
-      src="../../assets/images/device/nav-bg.png"
-      alt="nav-bg"
-      class="nav-bg"
-    >
-  </div>
-
 </template>
 <script>
 export default {
-  name: "Dnav",
-  props: {
-    routerName: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      navList: [
-        {
-          text: "全部",
-          src: require("../../assets/images/device/icon1.png")
-        },
-        {
-          text: "供电系统",
-          src: require("../../assets/images/device/icon2.png")
-        },
-        {
-          text: "暖通系统",
-          src: require("../../assets/images/device/icon3-active.png")
-        },
-        {
-          text: "消防系统",
-          src: require("../../assets/images/device/icon4.png")
-        },
-        {
-          text: "弱电系统",
-          src: require("../../assets/images/device/icon5.png")
-        },
-        {
-          text: "给排水",
-          src: require("../../assets/images/device/icon6.png")
-        },
-        {
-          text: "电梯系统",
-          src: require("../../assets/images/device/icon7.png")
-        },
-        {
-          text: "燃气系统",
-          src: require("../../assets/images/device/icon8.png")
-        },
-        {
-          text: "土建系统",
-          src: require("../../assets/images/device/icon9.png")
-        }
-      ],
-      fireList: [
-        {
-          text: "消防系统原理图",
-          name: "fire-system"
-        },
-        {
-          text: "主要设备清单",
-          name: "fire-mainlist"
-        },
-        {
-          text: "维修维保事项(内)",
-          name: "fire-inner"
-        },
-        {
-          text: "维修维保事项(外)",
-          name: "fire-outer"
-        },
-        {
-          text: "专项维修及其他事项",
-          name: "fire-other"
+    name: 'Dnav',
+    props: {
+        routerName: {
+            type: String
         }
-      ],
-      generalList: [
-        {
-          text: "空调系统原理图",
-          name: "air-system"
-        },
-        {
-          text: "分水器支路分布明细",
-          name: "water-layout"
-        },
-        {
-          text: "主要设备清单",
-          name: "main-list"
-        },
-        {
-          text: "维修维保事项(内)",
-          name: "maintain-inner"
-        },
-        {
-          text: "维修维保事项(外)",
-          name: "maintain-outer"
-        },
-        {
-          text: "专项维修及其他事项",
-          name: "maintain-other"
-        }
-      ],
-      active: [false, false, true, false, false, false, false, false],
-      secActive: [],
-      isFireShow: false,
-      isGeneralShow: true
-    };
-  },
-  mounted() {},
-  methods: {
-    handleOpen(name) {
-      if (
-        name == "air-system" ||
-        name == "buseiness" ||
-        name == "main-list" ||
-        name == "buseiness" ||
-        name == "fire-system" ||
-        name == "buseiness" ||
-        name == "buseiness"
-      ) {
-        this.$emit("handleEmit", { show: true, src: name, istab: true });
-      } else {
-        this.$emit("handleEmit", { show: true, src: name, istab: false });
-      }
     },
-    mouseOver(index) {
-      this.navList = [
-        {
-          text: "全部",
-          src: require("../../assets/images/device/icon1.png")
-        },
-        {
-          text: "供电系统",
-          src: require("../../assets/images/device/icon2.png")
-        },
-        {
-          text: "暖通系统",
-          src: require("../../assets/images/device/icon3.png")
-        },
-        {
-          text: "消防系统",
-          src: require("../../assets/images/device/icon4.png")
-        },
-        {
-          text: "弱电系统",
-          src: require("../../assets/images/device/icon5.png")
-        },
-        {
-          text: "给排水",
-          src: require("../../assets/images/device/icon6.png")
-        },
-        {
-          text: "电梯系统",
-          src: require("../../assets/images/device/icon7.png")
-        },
-        {
-          text: "燃气系统",
-          src: require("../../assets/images/device/icon8.png")
-        },
-        {
-          text: "土建系统",
-          src: require("../../assets/images/device/icon9.png")
-        }
-      ];
-      this.isFireShow = false;
-      this.isGeneralShow = false;
-      this.active = [false, false, false, false, false, false, false, false];
-      this.navList = this.navList.map((item, i) => {
-        if (i == index) {
-          item = {
-            text: item.text,
-            src: require("../../assets/images/device/icon" +
-              (index + 1) +
-              "-active.png")
-          };
+    data() {
+        return {
+            navList: [
+                {
+                    text: '全部',
+                    src: require('../../assets/images/device/icon1.png')
+                },
+                {
+                    text: '供电系统',
+                    src: require('../../assets/images/device/icon2.png')
+                },
+                {
+                    text: '暖通系统',
+                    src: require('../../assets/images/device/icon3-active.png')
+                },
+                {
+                    text: '消防系统',
+                    src: require('../../assets/images/device/icon4.png')
+                },
+                {
+                    text: '弱电系统',
+                    src: require('../../assets/images/device/icon5.png')
+                },
+                {
+                    text: '给排水',
+                    src: require('../../assets/images/device/icon6.png')
+                },
+                {
+                    text: '电梯系统',
+                    src: require('../../assets/images/device/icon7.png')
+                },
+                {
+                    text: '燃气系统',
+                    src: require('../../assets/images/device/icon8.png')
+                },
+                {
+                    text: '土建装饰',
+                    src: require('../../assets/images/device/icon9.png')
+                }
+            ],
+            fireList: [
+                {
+                    text: '消防系统原理图',
+                    name: 'fire-system'
+                },
+                {
+                    text: '主要设备清单',
+                    name: 'fire-mainlist'
+                },
+                {
+                    text: '维修维保事项(内)',
+                    name: 'fire-inner'
+                },
+                {
+                    text: '维修维保事项(外)',
+                    name: 'fire-outer'
+                },
+                {
+                    text: '专项维修及其他事项',
+                    name: 'fire-other'
+                }
+            ],
+            generalList: [
+                {
+                    text: '空调系统原理图',
+                    name: 'air-system'
+                },
+                {
+                    text: '分水器支路分布明细',
+                    name: 'water-layout'
+                },
+                {
+                    text: '主要设备清单',
+                    name: 'main-list'
+                },
+                {
+                    text: '维修维保事项(内)',
+                    name: 'maintain-inner'
+                },
+                {
+                    text: '维修维保事项(外)',
+                    name: 'maintain-outer'
+                },
+                {
+                    text: '专项维修及其他事项',
+                    name: 'maintain-other'
+                }
+            ],
+            active: [false, false, true, false, false, false, false, false],
+            secActive: [],
+            isFireShow: false,
+            isGeneralShow: true
         }
-        return item;
-      });
-      this.$set(this.active, index, true);
-      if (index == 2) {
-        this.isGeneralShow = true;
-      }
-      if (index == 3) {
-        this.isFireShow = true;
-      }
     },
+    mounted() {},
+    methods: {
+        handleOpen(name) {
+            if (
+                name == 'air-system' ||
+                name == 'buseiness' ||
+                name == 'main-list' ||
+                name == 'buseiness' ||
+                name == 'fire-system' ||
+                name == 'buseiness' ||
+                name == 'buseiness'
+            ) {
+                this.$emit('handleEmit', { show: true, src: name, istab: true })
+            } else {
+                this.$emit('handleEmit', { show: true, src: name, istab: false })
+            }
+        },
+        mouseOver(index) {
+            this.navList = [
+                {
+                    text: '全部',
+                    src: require('../../assets/images/device/icon1.png')
+                },
+                {
+                    text: '供电系统',
+                    src: require('../../assets/images/device/icon2.png')
+                },
+                {
+                    text: '暖通系统',
+                    src: require('../../assets/images/device/icon3.png')
+                },
+                {
+                    text: '消防系统',
+                    src: require('../../assets/images/device/icon4.png')
+                },
+                {
+                    text: '弱电系统',
+                    src: require('../../assets/images/device/icon5.png')
+                },
+                {
+                    text: '给排水',
+                    src: require('../../assets/images/device/icon6.png')
+                },
+                {
+                    text: '电梯系统',
+                    src: require('../../assets/images/device/icon7.png')
+                },
+                {
+                    text: '燃气系统',
+                    src: require('../../assets/images/device/icon8.png')
+                },
+                {
+                    text: '土建装饰',
+                    src: require('../../assets/images/device/icon9.png')
+                }
+            ]
+            this.isFireShow = false
+            this.isGeneralShow = false
+            this.active = [false, false, false, false, false, false, false, false]
+            this.navList = this.navList.map((item, i) => {
+                if (i == index) {
+                    item = {
+                        text: item.text,
+                        src: require('../../assets/images/device/icon' + (index + 1) + '-active.png')
+                    }
+                }
+                return item
+            })
+            this.$set(this.active, index, true)
+            if (index == 2) {
+                this.isGeneralShow = true
+            }
+            if (index == 3) {
+                this.isFireShow = true
+            }
+        },
 
-    handSecMouseOver(i, type) {
-      if (type == 2) {
-        this.secActive = this.generalList.map((item, index) => {
-          if (index == i) {
-            return true;
-          }
-          return false;
-        });
-      }
-      this.secActive = this.fireList.map((item, index) => {
-        if (index == i) {
-          return true;
+        handSecMouseOver(i, type) {
+            if (type == 2) {
+                this.secActive = this.generalList.map((item, index) => {
+                    if (index == i) {
+                        return true
+                    }
+                    return false
+                })
+            }
+            this.secActive = this.fireList.map((item, index) => {
+                if (index == i) {
+                    return true
+                }
+                return false
+            })
+        },
+        handSecMouseLeave() {
+            this.secActive = []
+        },
+        handleNav(index) {
+            this.navList = this.navList.map((item, i) => {
+                if (i == index) {
+                    item = {
+                        text: item.text,
+                        src: require('../../assets/images/device/icon' + (index + 1) + '-active.png')
+                    }
+                }
+                return item
+            })
+            this.$set(this.active, index, true)
+        },
+        handleClick(item, index) {
+            this.navList = [
+                {
+                    text: '全部',
+                    src: require('../../assets/images/device/icon1.png')
+                },
+                {
+                    text: '供电系统',
+                    src: require('../../assets/images/device/icon2.png')
+                },
+                {
+                    text: '暖通系统',
+                    src: require('../../assets/images/device/icon3.png')
+                },
+                {
+                    text: '消防系统',
+                    src: require('../../assets/images/device/icon4.png')
+                },
+                {
+                    text: '弱电系统',
+                    src: require('../../assets/images/device/icon5.png')
+                },
+                {
+                    text: '给排水',
+                    src: require('../../assets/images/device/icon6.png')
+                },
+                {
+                    text: '电梯系统',
+                    src: require('../../assets/images/device/icon7.png')
+                },
+                {
+                    text: '燃气系统',
+                    src: require('../../assets/images/device/icon8.png')
+                },
+                {
+                    text: '土建装饰',
+                    src: require('../../assets/images/device/icon9.png')
+                }
+            ]
+            this.isFireShow = false
+            this.isGeneralShow = false
+            this.active = [false, false, false, false, false, false, false, false]
+            this.navList = this.navList.map((item, i) => {
+                if (i == index) {
+                    item = {
+                        text: item.text,
+                        src: require('../../assets/images/device/icon' + (index + 1) + '-active.png')
+                    }
+                }
+                return item
+            })
+            this.$set(this.active, index, true)
+            if (index == 2) {
+                this.isGeneralShow = true
+            }
+            if (index == 3) {
+                this.isFireShow = true
+            }
+            if (item.text == '消防系统') {
+                this.$emit('handleEmit', { show: true, src: 'Fire', istab: true })
+            }
+            if (item.text == '暖通系统') {
+                this.$emit('handleEmit', { show: true, src: 'General', istab: true })
+            }
         }
-        return false;
-      });
     },
-    handSecMouseLeave() {
-      this.secActive = [];
-    },
-    handleNav(index) {
-      this.navList = this.navList.map((item, i) => {
-        if (i == index) {
-          item = {
-            text: item.text,
-            src: require("../../assets/images/device/icon" +
-              (index + 1) +
-              "-active.png")
-          };
+    watch: {
+        routerName(val) {
+            if (val == 'device') {
+                this.handleClick(
+                    {
+                        text: '暖通系统',
+                        src: require('../../assets/images/device/icon3-active.png')
+                    },
+                    2
+                )
+            }
         }
-        return item;
-      });
-      this.$set(this.active, index, true);
-    },
-    handleClick(item, index) {
-      this.navList = [
-        {
-          text: "全部",
-          src: require("../../assets/images/device/icon1.png")
-        },
-        {
-          text: "供电系统",
-          src: require("../../assets/images/device/icon2.png")
-        },
-        {
-          text: "暖通系统",
-          src: require("../../assets/images/device/icon3.png")
-        },
-        {
-          text: "消防系统",
-          src: require("../../assets/images/device/icon4.png")
-        },
-        {
-          text: "弱电系统",
-          src: require("../../assets/images/device/icon5.png")
-        },
-        {
-          text: "给排水",
-          src: require("../../assets/images/device/icon6.png")
-        },
-        {
-          text: "电梯系统",
-          src: require("../../assets/images/device/icon7.png")
-        },
-        {
-          text: "燃气系统",
-          src: require("../../assets/images/device/icon8.png")
-        },
-        {
-          text: "土建系统",
-          src: require("../../assets/images/device/icon9.png")
-        }
-      ];
-      this.isFireShow = false;
-      this.isGeneralShow = false;
-      this.active = [false, false, false, false, false, false, false, false];
-      this.navList = this.navList.map((item, i) => {
-        if (i == index) {
-          item = {
-            text: item.text,
-            src: require("../../assets/images/device/icon" +
-              (index + 1) +
-              "-active.png")
-          };
-        }
-        return item;
-      });
-      this.$set(this.active, index, true);
-      if (index == 2) {
-        this.isGeneralShow = true;
-      }
-      if (index == 3) {
-        this.isFireShow = true;
-      }
-      if (item.text == "消防系统") {
-        this.$emit("handleEmit", { show: true, src: "Fire", istab: true });
-      }
-      if (item.text == "暖通系统") {
-        this.$emit("handleEmit", { show: true, src: "General", istab: true });
-      }
     }
-  },
-  watch: {
-    routerName(val) {
-      if (val == "device") {
-        this.handleClick(
-          {
-            text: "暖通系统",
-            src: require("../../assets/images/device/icon3-active.png")
-          },
-          2
-        );
-      }
-    }
-  }
-};
+}
 </script>
 <style lang="less" scoped>
 .nav {
-  position: absolute;
-  top: 188px;
-  left: 0;
-  z-index: 1000;
-  // border: 1px solid yellow;
-  .nav-item {
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    height: 50px;
-    padding-right: 40px;
-    font-size: 16px;
-    color: #fff;
+    position: absolute;
+    top: 188px;
+    left: 0;
+    z-index: 1000;
+    // border: 1px solid yellow;
+    .nav-item {
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        height: 50px;
+        padding-right: 40px;
+        font-size: 16px;
+        color: #fff;
 
-    .nav-text {
-      margin-left: 22px;
+        .nav-text {
+            margin-left: 22px;
+        }
     }
-  }
 }
 .nav-bg {
-  position: absolute;
-  top: 62px;
-  left: 0;
+    position: absolute;
+    top: 62px;
+    left: 0;
 }
 .nav-sec {
-  position: absolute;
-  width: 244px;
-  z-index: 1000;
-  // border: 1px solid red;
-  top: 0;
-  left: 100%;
-  // display: none;
-  // border: 1px solid blue;
-  .nav-radio {
-    width: 5px;
-    height: 5px;
-    background: red;
-    border-radius: 50%;
-  }
-  .nav-item {
-    font-size: 14px;
-    margin-bottom: 25px;
-    padding-right: 0;
-    &:nth-child(1) {
-      margin-left: 36px;
-    }
-    &:nth-child(2) {
-      margin-left: 54px;
-    }
-    &:nth-child(3) {
-      margin-left: 60px;
-    }
-    &:nth-child(4) {
-      margin-left: 58px;
-    }
-    &:nth-child(5) {
-      margin-left: 48px;
-    }
-    &:nth-child(6) {
-      margin-left: 28px;
+    position: absolute;
+    width: 244px;
+    z-index: 1000;
+    // border: 1px solid red;
+    top: 0;
+    left: 100%;
+    // display: none;
+    // border: 1px solid blue;
+    .nav-radio {
+        width: 5px;
+        height: 5px;
+        background: red;
+        border-radius: 50%;
     }
-    .nav-text {
-      margin-left: 12px;
+    .nav-item {
+        font-size: 14px;
+        margin-bottom: 25px;
+        padding-right: 0;
+        &:nth-child(1) {
+            margin-left: 36px;
+        }
+        &:nth-child(2) {
+            margin-left: 54px;
+        }
+        &:nth-child(3) {
+            margin-left: 60px;
+        }
+        &:nth-child(4) {
+            margin-left: 58px;
+        }
+        &:nth-child(5) {
+            margin-left: 48px;
+        }
+        &:nth-child(6) {
+            margin-left: 28px;
+        }
+        .nav-text {
+            margin-left: 12px;
+        }
     }
-  }
-  .sec-active {
-    font-size: 16px;
-    color: #fff;
-    .nav-radio {
-      width: 8px;
-      height: 8px;
+    .sec-active {
+        font-size: 16px;
+        color: #fff;
+        .nav-radio {
+            width: 8px;
+            height: 8px;
+        }
     }
-  }
 }
 
 .icon {
-  width: 18px;
-  height: 14px;
-  margin-left: 30px;
+    width: 18px;
+    height: 14px;
+    margin-left: 30px;
 }
 .icon-active {
-  background: url("../../assets/images/device/active.png");
+    background: url('../../assets/images/device/active.png');
 }
 </style>

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

@@ -21,7 +21,7 @@
                 <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;overflow:auto;height:100%;margin:0 auto'>
                     <rotation type='3' :rotationImg='rotationImg'></rotation>
                 </div>
-                <!-- 土建系统主要材料清单 -->
+                <!-- 土建装饰主要材料清单 -->
                 <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
                 <!-- 主要设备清单 标准设备表格 -->
                 <!-- 内部设备清单 -->
@@ -196,7 +196,7 @@ export default {
                 case '燃气系统':
                     getParams.system = '1007'
                     break
-                case '土建系统':
+                case '土建装饰':
                     getParams.system = '1008'
                     break
             }

+ 1 - 1
src/views/equipment/index.vue

@@ -104,7 +104,7 @@ export default {
             this.systemName = item.name
             this.smsxt = item.smsxt
             this.$cookie.set('categoryId', item.categoryId, 3)
-            store.commit('SETCATEGORYID', item.categoryId)
+            // store.commit('SETCATEGORYID', item.categoryId)
             this.$refs.floorMap.init(this.floorInfo.gname)
             this.querySmsxt()
             this.viewLengend()

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

@@ -82,6 +82,9 @@
             <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable width='200'>
                 <template slot-scope='{row}'>{{row.fws || '--'}}</template>
             </el-table-column>
+            <el-table-column prop label='相关资料' show-overflow-tooltip resizable width='100'>
+                <template slot-scope='{row}'>{{ '--'}}</template>
+            </el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination

+ 7 - 7
src/views/equipment/table/lookPageTable.vue

@@ -3,7 +3,7 @@
     <div class='look-page'>
         <div class='eq-list-top'>
             <el-input
-                placeholder='搜索生产厂商'
+                placeholder='搜索文件名'
                 size='small'
                 @change='getList'
                 clearable
@@ -12,26 +12,26 @@
                 style='width:192px;margin-right:12px'
             ></el-input>
             <Select @change='getList' v-model='floor' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
-            <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型:' :selectdata='files'></Select>
+            <!-- <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型:' :selectdata='files'></Select> -->
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='lb' label='分类' width='160' show-overflow-tooltip resizable>
+            <el-table-column prop='lb' label='分类' width='300' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='文件名称' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='文件类型' show-overflow-tooltip resizable>
+            <el-table-column prop='assetnum' label='文件类型' width='70' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='文件大小(M)'>
+            <el-table-column prop='assetnum' label='上传文件名'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column label='操作'>
+            <el-table-column label='操作' width='70'>
                 <template slot-scope='{row}'>
                     <el-button type='text' size='mini' @click='handleDown(row)'>
-                        <i class='el-icon-download'></i>下载
+                        <i class='el-icon-download'></i>预览
                     </el-button>
                 </template>
             </el-table-column>

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

@@ -66,7 +66,7 @@ export default {
             // } else if (major.slice(0, 2) == 'NT') {
             //     this.major = '暖通系统'
             // } else if (major.slice(0, 2) == 'TJ') {
-            //     this.major = '土建系统'
+            //     this.major = '土建装饰'
             // }
             this.visible = true
             this.getRecordList(smsxt)