소스 검색

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

YaolongHan 4 년 전
부모
커밋
522db02d74

BIN
public/imgs/xzfbt.png


+ 3 - 4
public/systemConf.js

@@ -23,10 +23,9 @@ var __systemConf = {
     // 系统编码
     systemCode: 'wandaBmGuide',
     conf: {
-        // TODO: 修改为对应的地址
-        // 开发环境地址 ip+port
-        editerUrl: 'http://192.168.200.1:8091/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://192.168.200.1:8090/wandaBmGuide/', // 管理书地址
+        // 阿里云
+        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
+        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
     },
 }
 window.__systemConf = __systemConf

BIN
src/assets/imgs/bj.png


BIN
src/assets/imgs/wtp.png


BIN
src/assets/imgs/xzfbt.png


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

@@ -37,7 +37,7 @@
                 </div>
             </el-collapse-transition>
         </div>
-        <div class='edit_map'>
+        <div class='edit_map' v-if='1!=1'>
             <!-- 备注编辑器 -->
             <el-tooltip effect='dark' content='编辑备注' placement='left'>
                 <span v-if='systemName != "土建系统"' class='bjtk' @click='legendClik'>备注</span>
@@ -48,8 +48,14 @@
                     <img src='@/assets/imgs/bjtl.png' alt />
                 </p>
             </el-tooltip>
-            <!-- 编辑平面图 -->
-            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' content='编辑平面图' placement='left'>
+            <!-- 新增分布图 -->
+            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+                <p class='tltk' style='margin-left: -5px;'>
+                    <img src='@/assets/imgs/xzfbt.png' alt />
+                </p>
+            </el-tooltip>
+            <!-- 编辑分布图 -->
+            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' content='编辑分布图' placement='left'>
                 <span class='edit-icon' @click='goToEditer'>
                     <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
                 </span>
@@ -58,6 +64,25 @@
                 <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
             </span>
         </div>
+        <!-- 单独展示新增分布图 -->
+        <div class='edit_map1' v-else @click='addFloor'>
+            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+                <!-- <p class='tltk' style='margin-left: -5px;'> -->
+                <img src='@/assets/imgs/xzfbt.png' alt />
+                <!-- </p> -->
+            </el-tooltip>
+        </div>
+        <div class='select-floor' v-if='isFloor'>
+            <p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
+            <p class='p2'>
+                <Select width='240' tipPlace='top' caption='楼层:' size='mini' :selectdata='floorSelect' :placeholder='"请选择"'></Select>
+            </p>
+            <p class='p3'>
+                <span @click='cancel'>取消</span>
+                <span @click='determine'>确定</span>
+            </p>
+        </div>
+
         <legend-remarks @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
     </div>
 </template>
@@ -88,11 +113,12 @@ export default {
             multipleSelection: [],
             editText: '',
             editSwitch: false,
+            isFloor: false,
             editPmt: true //是否有跳转道图例库的权限
         }
     },
     computed: {
-        ...mapGetters(['plazaId', 'fmapID'])
+        ...mapGetters(['plazaId', 'fmapID', 'floorSelect'])
     },
     props: ['systemName'],
     components: { lengendView, legendRemarks, lengendEdit },
@@ -236,6 +262,18 @@ export default {
             } else {
                 this.isShow2()
             }
+        },
+        addFloor() {
+            console.log(111111)
+            this.isFloor = true
+        },
+        // 新增楼层取消
+        cancel() {
+            this.isFloor = false
+        },
+        // 新增楼层确定
+        determine() {
+            this.isFloor = false
         }
     },
     mounted() {}
@@ -331,6 +369,68 @@ export default {
 .edit_map:hover .bjtk {
     display: block;
 }
+.edit_map1 {
+    position: fixed;
+    bottom: 28px;
+    z-index: 1;
+    .select-floor {
+        width: 288px;
+        height: 220px;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
+        border-radius: 2px;
+        border: 1px solid rgba(228, 229, 231, 1);
+        position: relative;
+        right: 0;
+    }
+}
+.select-floor {
+    width: 288px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
+    border-radius: 2px;
+    border: 1px solid rgba(228, 229, 231, 1);
+    position: fixed;
+    bottom: 40px;
+    right: 70px;
+    padding: 24px;
+    .p1 {
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        color: rgba(31, 36, 41, 1);
+        line-height: 19px;
+    }
+    .p2 {
+        margin-top: 8px;
+        margin-bottom: 68px;
+    }
+    .p3 {
+        display: flex;
+        justify-content: flex-end;
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        line-height: 22px;
+        text-align: center;
+        span:nth-of-type(1) {
+            width: 58px;
+            height: 24px;
+            background: rgba(255, 255, 255, 1);
+            border: 1px solid rgba(195, 199, 203, 1);
+            margin-right: 12px;
+            border-radius: 2px;
+            cursor: pointer;
+        }
+        span:nth-of-type(2) {
+            width: 58px;
+            height: 24px;
+            background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+            border-radius: 2px;
+            color: rgba(255, 255, 255, 1);
+            border-radius: 2px;
+            cursor: pointer;
+        }
+    }
+}
 </style>
 <style lang="less">
 .legend-container {

+ 229 - 241
src/components/menuList.vue

@@ -1,277 +1,265 @@
 <template>
-  <!-- 顶部路由 -->
-  <div class="menu">
-    <div class="home" @click="$emit('update:modelNum', 0)">
-      <div class="downright"></div>
-      <div class="home-box">
-        <img src="@/assets/imgs/logo.png" alt />
-        <span>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
-      </div>
-    </div>
-    <div>
-      <div
-        v-for="(item, index) in list"
-        :key="index"
-        :class="{ 'is-active': item.state }"
-        @click="clickEventAcitve(item, index)"
-      >{{ item.name }}</div>
-    </div>
-    <div class="home-right">
-      <span @click="dumpLegend">
-        <img class="img1" src="../assets/imgs/scj.png" alt />
-        <span class="span1">图例库</span>
-      </span>
+    <!-- 顶部路由 -->
+    <div class='menu'>
+        <div class='home' @click='$emit("update:modelNum", 0)'>
+            <div class='downright'></div>
+            <div class='home-box'>
+                <img src='@/assets/imgs/logo.png' alt />
+                <span>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span>
+            </div>
+        </div>
+        <div>
+            <div
+                v-for='(item, index) in list'
+                :key='index'
+                :class='{ "is-active": item.state }'
+                @click='clickEventAcitve(item, index)'
+            >{{ item.name }}</div>
+        </div>
+        <div class='home-right'>
+            <span @click='dumpLegend'>
+                <img class='img1' src='../assets/imgs/scj.png' alt />
+                <span class='span1'>图例库</span>
+            </span>
 
-      <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>
-      <span>
-        <img class="img3" src="../assets/imgs/clock.png" alt />
-        <span class="span3">{{times}}</span>
-      </span>
+            <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>
+            <span>
+                <img class='img3' src='../assets/imgs/clock.png' alt />
+                <span class='span3'>{{times}}</span>
+            </span>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
-import { formatTime } from "@/utils/format.js";
-import { mapGetters } from "vuex";
-import moment from "moment";
+import { formatTime } from '@/utils/format.js'
+import { mapGetters } from 'vuex'
+import moment from 'moment'
 export default {
-  data() {
-    return {
-      state: "",
-      list: [
-        { name: "首页", state: false, route: "first" },
-        { name: "项目概况", state: false, route: "overview" },
-        { name: "楼层功能", state: false, route: "floorFunc" }, //楼层功能
-        { name: "设备设施", state: false, route: "equipment" }, //设备设施
-        { name: "其他事项", state: false, route: "other" }, //其他
-        { name: "分析 | 报表", state: false, route: "analysis" }
-      ],
-      times: `${new Date().getFullYear()}.${formatTime(
-        new Date().getMonth() + 1
-      )}.${formatTime(new Date().getDate())} ${formatTime(
-        new Date().getHours()
-      )}:${formatTime(new Date().getMinutes())}`,
-      value: 190,
-      // 路由词典
-      dict: {
-        first: 1,
-        overview: 2,
-        floorFunc: 3,
-        equipment: 4,
-        other: 5,
-        analysis: 6
-      }
-    };
-  },
-  computed: {
-    ...mapGetters(["plazas", "plazaId"])
-  },
-  watch: {
-    $route: "handleRoute"
-  },
-  created() {
-    this.currentTime();
-  },
-  mounted() {
-    window.vm = this;
-    this.handleRoute(this.$route);
-  },
-  methods: {
-    currentTime() {
-      this.times = moment().format("YYYY.MM.DD HH:mm");
-      setTimeout(this.currentTime, 1000);
+    data() {
+        return {
+            state: '',
+            list: [
+                { name: '首页', state: false, route: 'first' },
+                { name: '项目概况', state: false, route: 'overview' },
+                { name: '楼层功能', state: false, route: 'floorFunc' }, //楼层功能
+                { name: '设备设施', state: false, route: 'equipment' }, //设备设施
+                { name: '其他事项', state: false, route: 'other' }, //其他
+                { name: '分析 | 报表', state: false, route: 'analysis' }
+            ],
+            times: `${new Date().getFullYear()}.${formatTime(new Date().getMonth() + 1)}.${formatTime(new Date().getDate())} ${formatTime(
+                new Date().getHours()
+            )}:${formatTime(new Date().getMinutes())}`,
+            value: 190,
+            // 路由词典
+            dict: {
+                first: 1,
+                overview: 2,
+                floorFunc: 3,
+                equipment: 4,
+                other: 5,
+                analysis: 6
+            }
+        }
     },
-    handleRoute(newRouter) {
-      if (!newRouter) {
-        return false;
-      }
-      const { path } = newRouter;
-      let router = path.split("home/")[1];
-      this.modelNum(this.dict[router]);
+    computed: {
+        ...mapGetters(['plazas', 'plazaId'])
     },
-    formatter(str, arrv) {
-      if (str && arrv) {
-        const Objs = arrv.find(e => e && e.plazaid == str);
-        return Objs ? Objs.plazaname : "--";
-      } else {
-        return "";
-      }
+    watch: {
+        $route: 'handleRoute'
     },
-    modelNum(val) {
-      this.list = this.list.map((item, index) => {
-        if (val == index + 1) {
-          item.state = true;
-        } else {
-          item.state = false;
-        }
-        return item;
-      });
+    created() {
+        this.currentTime()
     },
-    clickEventAcitve(item) {
-      if (item.name == "楼层功能") {
-        this.$cookie.set("categoryId", "LCGN", 3);
-      } else {
-        this.$cookie.set("categoryId", "GDXT", 3);
-      }
-      this.list.forEach(ele => {
-        ele.state = false;
-      });
-      item.state = true;
-      this.state = item.state;
-      this.$router.push({ path: `/home/${item.route}` });
+    mounted() {
+        window.vm = this
+        this.handleRoute(this.$route)
     },
+    methods: {
+        //入草稿箱
+        toDrafts() {
+            const { conf } = window.__systemConf,
+                { editerUrl } = conf
+            let data = `projectId=${this.plazaId}&fmapID=${this.fmapID}`
+            let url = editerUrl + 'drafts?' + encodeURIComponent(data)
+            window.open(url, true)
+        },
+        currentTime() {
+            this.times = moment().format('YYYY.MM.DD HH:mm')
+            setTimeout(this.currentTime, 1000)
+        },
+        handleRoute(newRouter) {
+            if (!newRouter) {
+                return false
+            }
+            const { path } = newRouter
+            let router = path.split('home/')[1]
+            this.modelNum(this.dict[router])
+        },
+        formatter(str, arrv) {
+            if (str && arrv) {
+                const Objs = arrv.find(e => e && e.plazaid == str)
+                return Objs ? Objs.plazaname : '--'
+            } else {
+                return ''
+            }
+        },
+        modelNum(val) {
+            this.list = this.list.map((item, index) => {
+                if (val == index + 1) {
+                    item.state = true
+                } else {
+                    item.state = false
+                }
+                return item
+            })
+        },
+        clickEventAcitve(item) {
+            if (item.name == '楼层功能') {
+                this.$cookie.set('categoryId', 'LCGN', 3)
+            } else {
+                this.$cookie.set('categoryId', 'GDXT', 3)
+            }
+            this.list.forEach(ele => {
+                ele.state = false
+            })
+            item.state = true
+            this.state = item.state
+            this.$router.push({ path: `/home/${item.route}` })
+        },
 
         dumpLegend() {
             const { conf } = window.__systemConf,
                 { wandaBmGuideUrl } = conf
             window.open(`${wandaBmGuideUrl}home/legendLibrary`, true)
         }
-    },
-    //入草稿箱
-    toDrafts() {
-      const { conf } = window.__systemConf,
-        { editerUrl } = conf;
-      let data = `projectId=${this.plazaId}&fmapID=${this.fmapID}`;
-      let url = editerUrl + "drafts?" + encodeURIComponent(data);
-      window.open(url, true);
     }
-  },
-  components: {}
-};
+}
 </script>
 
 <style scoped lang="less">
 .menu {
-  height: 48px;
-  min-width: 1366px;
-  color: #1f2429;
-  font-size: 16px;
-  background: rgba(255, 255, 255, 1);
-  box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
-  overflow: hidden;
-  .home {
-    width: 265px;
     height: 48px;
-    // line-height: 48px;
-    text-align: center;
-    cursor: pointer;
-    color: #ffffff;
-    float: left;
-    margin-right: 83px;
-    // background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
-    background: linear-gradient(
-      180deg,
-      rgba(54, 156, 247, 1) 0%,
-      rgba(2, 91, 170, 1) 100%
-    );
-    position: relative;
-    .downright {
-      position: absolute;
-      width: 0;
-      height: 0;
-      border-left: 20px solid transparent;
-      border-bottom: 48px solid #fff;
-      right: 0px;
-      top: 0;
-    }
-    .home-box {
-      height: 100%;
-      display: flex;
-      align-items: center;
-      img {
-        width: 28px;
-        height: 28px;
-        margin-left: 20px;
-        margin-right: 24px;
-        margin-top: -3px;
-      }
-      span {
-        font-size: 20px;
-        font-family: MicrosoftYaHei;
-        height: 27px;
-        line-height: 27px;
-        margin-top: -4px;
-        &:after {
-          content: "|";
-          position: absolute;
-          left: 60px;
+    min-width: 1366px;
+    color: #1f2429;
+    font-size: 16px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
+    overflow: hidden;
+    .home {
+        width: 265px;
+        height: 48px;
+        // line-height: 48px;
+        text-align: center;
+        cursor: pointer;
+        color: #ffffff;
+        float: left;
+        margin-right: 83px;
+        // background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+        position: relative;
+        .downright {
+            position: absolute;
+            width: 0;
+            height: 0;
+            border-left: 20px solid transparent;
+            border-bottom: 48px solid #fff;
+            right: 0px;
+            top: 0;
+        }
+        .home-box {
+            height: 100%;
+            display: flex;
+            align-items: center;
+            img {
+                width: 28px;
+                height: 28px;
+                margin-left: 20px;
+                margin-right: 24px;
+                margin-top: -3px;
+            }
+            span {
+                font-size: 20px;
+                font-family: MicrosoftYaHei;
+                height: 27px;
+                line-height: 27px;
+                margin-top: -4px;
+                &:after {
+                    content: '|';
+                    position: absolute;
+                    left: 60px;
+                }
+            }
         }
-      }
-    }
-  }
-  & > div:nth-of-type(2) {
-    & > div {
-      line-height: 48px;
-      text-align: center;
-      //background: url('../assets/images/topbar1.png') no-repeat;
-      float: left;
-      width: 80px;
-      height: 48px;
-      cursor: pointer;
-      transition: all 0.2s;
     }
-    .is-active {
-      color: #025baa;
-      font-weight: bolder;
-      border-bottom: 2px solid #025baa;
-      background: linear-gradient(
-        180deg,
-        rgba(2, 91, 170, 0) 0%,
-        rgba(2, 91, 170, 0.2) 100%
-      );
+    & > div:nth-of-type(2) {
+        & > div {
+            line-height: 48px;
+            text-align: center;
+            //background: url('../assets/images/topbar1.png') no-repeat;
+            float: left;
+            width: 80px;
+            height: 48px;
+            cursor: pointer;
+            transition: all 0.2s;
+        }
+        .is-active {
+            color: #025baa;
+            font-weight: bolder;
+            border-bottom: 2px solid #025baa;
+            background: linear-gradient(180deg, rgba(2, 91, 170, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
+        }
     }
-  }
-  .home-right {
-    float: right;
-    margin-right: 20px;
-    line-height: 48px;
-    color: #646c73;
-    font-size: 14px;
-    cursor: pointer;
-    display: flex;
-    align-content: center;
-    img {
-      margin-top: -2px;
+    .home-right {
+        float: right;
+        margin-right: 20px;
+        line-height: 48px;
+        color: #646c73;
+        font-size: 14px;
+        cursor: pointer;
+        display: flex;
+        align-content: center;
+        img {
+            margin-top: -2px;
+        }
+        .span-out {
+            position: relative;
+            margin: 0 16px;
+            .span2-num {
+                position: absolute;
+                right: -5px;
+                top: 5px;
+                display: inline-block;
+                width: 18px;
+                height: 18px;
+                background: red;
+                border-radius: 90px;
+                font-size: 12px;
+                text-align: center;
+                line-height: 18px;
+                color: #ffffff;
+            }
+        }
     }
-    .span-out {
-      position: relative;
-      margin: 0 16px;
-      .span2-num {
-        position: absolute;
-        right: -5px;
-        top: 5px;
-        display: inline-block;
-        width: 18px;
-        height: 18px;
-        background: red;
-        border-radius: 90px;
-        font-size: 12px;
-        text-align: center;
-        line-height: 18px;
-        color: #ffffff;
-      }
+    .span1,
+    .span2 {
+        padding: 0 6px 0 3px;
     }
-  }
-  .span1,
-  .span2 {
-    padding: 0 6px 0 3px;
-  }
 
-  .span3 {
-    padding-left: 3px;
-  }
+    .span3 {
+        padding-left: 3px;
+    }
 }
 </style>
 <style lang="less">
 .menu {
-  .el-badge__content.is-fixed {
-    top: 10px;
-  }
+    .el-badge__content.is-fixed {
+        top: 10px;
+    }
 }
 </style>

+ 5 - 9
src/views/equipment/index.vue

@@ -10,11 +10,7 @@
         <div class='eq-bottom'>
             <div class='eq-left'>
                 <ul v-for='(eve,index) in everySystem' :key='"o"+index'>
-                    <li
-                        class='li-style'
-                        :class='{"is-active": eve.id}' 
-                        @click='dialogVisible(eve)'
-                    >
+                    <li class='li-style' :class='{"is-active": eve.id}' @click='dialogVisible(eve)'>
                         <span class='circle'></span>
                         <span class='hanzi'>{{eve.label}}</span>
                     </li>
@@ -78,7 +74,7 @@ export default {
             fqPic: [],
             loadName: '',
             type: '',
-            objCount:[]
+            objCount: []
         }
     },
     components: { floorList, eqDialog, floorMap, editList },
@@ -97,12 +93,12 @@ export default {
             this.init()
         },
         //判断有没有原理图,如果没有则不出现系统原理图列表li
-        emitCount(objCount){
+        emitCount(objCount) {
             this.objCount = objCount
         },
         emitFloor(item) {
             this.floorInfo = item
-            this.$refs.floorMap.init(this.floorInfo.gname)
+            // this.$refs.floorMap.init(this.floorInfo.gname)
             this.init()
         },
         dialogVisible(eve) {
@@ -149,7 +145,7 @@ export default {
         }
         this.everySystem = this.system[0].children
         this.init()
-        this.$refs.floorMap.init(this.floorInfo.gname)
+        // this.$refs.floorMap.init(this.floorInfo.gname)
     },
     computed: {
         ...mapGetters(['floorsArr'])

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

@@ -56,16 +56,16 @@
             style='width: 100%;margin-top:12px'
         >
             <el-table-column label='序号' type='index' width='50'></el-table-column>
-            <el-table-column prop='name' :show-overflow-tooltip='true' sortable label='任务名称'>
+            <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='type' label='状态' width='90'>
-                <template slot-scope='{row}'>{{row.status2||'--'}}</template>
+            <el-table-column prop label='状态' width='90'>
+                <template slot-scope='{row}'>{{row.status||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='thing' label='部门' width='90' :show-overflow-tooltip='true'>
+            <el-table-column prop label='部门' width='90' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.zgbm||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='name' :show-overflow-tooltip='true' label='检测结论'>
+            <el-table-column prop :show-overflow-tooltip='true' label='检测结论'>
                 <template slot-scope='{row}'>{{row.conclusion||'--'}}</template>
             </el-table-column>
         </el-table>

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

@@ -506,7 +506,7 @@ export default {
     methods: {
         handleClick(tab) {
             if (tab.label == '机房布置图') {
-                this.Index()
+                this.Index(this.smsxtArr.smsxt)
             } else if (tab.label == '配电室低压柜及出线明细表') {
                 this.Index1()
             } else if (tab.label == '机房内核心设备') {
@@ -522,13 +522,13 @@ export default {
         show() {
             this.dialogFormVisible = !this.dialogFormVisible
         },
-        Index() {
+        Index(system) {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
                 typename: '位置布置图',
                 location: '1809',
                 module: '1002',
-                system: '1002',
+                system: system,
                 plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
@@ -819,6 +819,7 @@ export default {
             querySystem(params).then(res => {
                 this.smsxtArr = res.data[0]
                 console.log(this.smsxtArr)
+                this.Index(this.smsxtArr.smsxt)
                 this.content = `查看${this.$cookie.get('floorNow')}层${this.smsxtArr.smsxtname}分布图`
             })
         },
@@ -845,7 +846,7 @@ export default {
         }
     },
     mounted() {
-        this.Index()
+        // this.Index()
     }
 }
 </script>

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

@@ -36,7 +36,7 @@
                         <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>
-                        <template slot-scope='{row}'>{{row.cost||'--'}}</template>
+                        <template slot-scope='{row}'>{{row.cost?number_format(row.cost):'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='费用出处' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.source||'--'}}</template>
@@ -72,6 +72,7 @@
 <script>
 import Select from '@/components/Select/Select.vue'
 import moment from 'moment'
+import { number_format } from '@/utils/format.js'
 
 export default {
     props: ['table4', 'total', 'page', 'size', 'loading'],
@@ -79,7 +80,8 @@ export default {
         return {
             dateVal: '',
             value1: '',
-            searVal: ''
+            searVal: '',
+            number_format
         }
     },
     components: { Select },