Explorar el Código

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

shaun-sheep hace 4 años
padre
commit
acf08795f2

+ 3 - 3
public/systemConf.js

@@ -26,9 +26,9 @@ var __systemConf = {
         // 编辑器地址
         // TODO: 修改为对应的地址
         // editerUrl: 'http://192.168.200.1:9910/wandaEditer/',
-        editerUrl: 'http://192.168.200.89:8081/wandaEditer/',
         // wandaBmGuideUrl: 'http://192.168.200.89:8080/wandaBmGuide',
-        wandaBmGuideUrl: 'http://192.168.200.100:8080/wandaBmGuide',
+        editerUrl: 'http://192.168.200.1:8091/wandaEditer/',
+        wandaBmGuideUrl: 'http://192.168.200.1:8090/wandaBmGuide/',
     },
 }
-window.__systemConf = __systemConf
+window.__systemConf = __systemConf

+ 1 - 1
src/components/menuList.vue

@@ -128,7 +128,7 @@ export default {
         dumpLegend() {
             const { conf } = window.__systemConf,
                 { wandaBmGuideUrl } = conf
-            window.open(`${wandaBmGuideUrl}/home/legendLibrary`, true)
+            window.open(`${wandaBmGuideUrl}home/legendLibrary`, true)
         }
     },
     components: {}

+ 17 - 18
src/store/index.js

@@ -1,6 +1,6 @@
-import Vue from "vue"
-import Vuex from "vuex"
-import { login, queryFloor, queryfmapID } from "@/api/login.js"
+import Vue from 'vue'
+import Vuex from 'vuex'
+import { login, queryFloor, queryfmapID } from '@/api/login.js'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
@@ -8,15 +8,15 @@ export default new Vuex.Store({
         permissions: [], //权限信息 "GLSMS_VIEW":"说明书查看"、"GLSMS_SYMBOL_MANAGE": "图例库管理"、 "GLSMS_PLANARGRAPH_MANAGE":"平面图维护"
         plazas: [], //项目列表
         userInfo: {
-            employeename: "", //用户名称:艾宇;
-            orgCode: "",
-            username: "lengqiang", //账户名称
+            employeename: '', //用户名称:艾宇;
+            orgCode: '',
+            username: 'lengqiang', //账户名称
         },
-        plazaId: "1000423",
-        projectName: "", //全局项目名称
+        plazaId: '1000423',
+        projectName: '', //全局项目名称
         floorsArr: [], //楼层数组
         floorSelect: [], //楼层下拉框
-        fmapID: "",
+        fmapID: '',
     },
     getters: {
         floorsArr: (state) => state.floorsArr,
@@ -42,7 +42,6 @@ export default new Vuex.Store({
             state.floorsArr = data
             if (data.length > 0) {
                 data.forEach((e) => {
-                    console.log(e)
                     let obj = {
                         id: e.gname,
                         name: e.code,
@@ -61,19 +60,19 @@ export default new Vuex.Store({
             await login({
                 username: palyload,
             }).then((res) => {
-                if (res.result == "success") {
-                    commit("SETISREQUESTtAUTH", true)
-                    commit("SETAUTHMSG", res)
+                if (res.result == 'success') {
+                    commit('SETISREQUESTtAUTH', true)
+                    commit('SETAUTHMSG', res)
                 } else {
-                    console.log("接口报错!!")
-                    commit("SETISREQUESTtAUTH", false)
+                    console.log('接口报错!!')
+                    commit('SETISREQUESTtAUTH', false)
                 }
             })
         },
         getFloors(context) {
             queryFloor({ plazaId: context.state.plazaId }).then((res) => {
-                if (res.result == "success") {
-                    context.commit("SETFLOORS", res.data)
+                if (res.result == 'success') {
+                    context.commit('SETFLOORS', res.data)
                 }
             })
         },
@@ -81,7 +80,7 @@ export default new Vuex.Store({
             await queryfmapID({
                 mapId: context.state.plazaId,
             }).then((res) => {
-                context.commit("SETMAPID", `${context.state.plazaId}_${res.mapVersion}`)
+                context.commit('SETMAPID', `${context.state.plazaId}_${res.mapVersion}`)
             })
         },
     },

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

@@ -8,7 +8,7 @@
                 <p>3.相关政府强制性检测的按时完成情况及检测中提出的问题</p>
                 <p>4.广场安全质量第三方检测过程中列出的整改事项</p>
                 <div class='bottom-table'>
-                    <el-table :data='tableData' height='500' style='width:100%;' :span-method='objectSpanMethod' border v-if='tableData.length>0'>
+                    <el-table :data='tableData' height='480' style='width:100%;' :span-method='objectSpanMethod' border v-if='tableData.length>0'>
                         <el-table-column label='序号' type='index' width='50'></el-table-column>
                         <el-table-column prop='jcsx' label='检测事项' :show-overflow-tooltip='true'></el-table-column>
                         <el-table-column prop='zgbm' label='主管部门' :show-overflow-tooltip='true'></el-table-column>
@@ -108,5 +108,11 @@ export default {
 </style>
 <style lang="less">
 .zhsx-log {
+    .el-dialog {
+        margin-top: 10vh !important;
+    }
+    .el-dialog__wrapper {
+        overflow: hidden;
+    }
 }
 </style>

+ 15 - 4
src/views/room/detail.vue

@@ -165,7 +165,7 @@ import { mapGetters } from 'vuex'
 import { queryHxsbDetail } from '@/api/room.js'
 
 export default {
-    props: ['type_code'],
+    props: ['row', 'floorChange'],
     data() {
         return {
             dialogFormVisible: false,
@@ -198,13 +198,13 @@ export default {
         ...mapGetters(['floorSelect', 'plazaId'])
     },
     mounted() {
-        if (this.type_code) {
+        if (this.row) {
             this.queryDetail()
             this.query()
         }
     },
     watch: {
-        type_code: {
+        row: {
             deep: true,
             handler: function(newV, oldV) {
                 if (newV != oldV) {
@@ -239,8 +239,19 @@ export default {
         queryDetail() {
             this.detailData = []
             let postParams = {
-                type_code: this.type_code //自定义分类内码 主要设备清单必传
+                manufacturer: this.row.manufacturer || '--',
+                sbxh: this.row.sbxh || '--',
+                brand: this.row.brand || '--',
+                location: '1572',
+                classstructureid: this.row.classstructureid,
+                type_code: this.row.type_code
             }
+            if (this.floorChange) {
+                postParams.gname = this.floorChange
+            }
+            // if (this.row.floorcode) {
+            //     postParams.floorcode = this.row.floorcode
+            // }
             let data = {
                 plazaId: this.plazaId,
                 page: this.pageDetail,

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

@@ -122,6 +122,7 @@
                             :page='page2'
                             :total='total2'
                             :size='size2'
+                            :floorChange='floorChange'
                             @Index2Emit='Index2Emit'
                         ></room-table3>
                     </el-tab-pane>
@@ -614,10 +615,9 @@ export default {
                 }
             }
             if (this.floorChange) {
-                data.gname = this.floorChange
+                postParams.gname = this.floorChange
             }
             queryHxsb({ data, postParams }).then(res => {
-                // console.log('核心设备', res)
                 this.loading2 = false
                 this.total2 = res.data.count
                 this.table3 = res.data.data ? res.data.data : []

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

@@ -42,7 +42,7 @@
             ></el-pagination>
         </div>
         <el-dialog width='90%' title='设备清单' :visible.sync='innerVisible' append-to-body>
-            <detail v-if='type_code' :type_code='type_code'></detail>
+            <detail v-if='row' :row='row' :floorChange='floorChange'></detail>
         </el-dialog>
     </div>
 </template>
@@ -52,11 +52,11 @@ import Select from '@/components/Select/Select.vue'
 import Detail from './detail'
 
 export default {
-    props: ['table3', 'total', 'page', 'size', 'loading'],
+    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange'],
     data() {
         return {
             innerVisible: false,
-            type_code: ''
+            row: {}
         }
     },
 
@@ -69,7 +69,7 @@ export default {
             this.$emit('Index2Emit', page)
         },
         innerTable(row) {
-            this.type_code = row.type_code
+            this.row = row
             this.innerVisible = true
         }
     },

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

@@ -29,7 +29,7 @@
                         <template slot-scope='{row}'>{{row.model||'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='数量' show-overflow-tooltip resizable>
-                        <template slot-scope='{row}'>{{row.cost||'--'}}</template>
+                        <template slot-scope='{row}'>{{row.cost!=0?row.cost:'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='费用(万元)' min-width='100' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.cost||'--'}}</template>