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

src/views/equipment/table/eqDetaileDialog.vue

@@ -252,7 +252,7 @@ export default {
             //输入框搜索
             data.keyword = ''
             if (this.sbjc) {
-                data.keyword += `${this.sbjc}:type_name,assetnum;`
+                data.keyword += `${this.sbjc}:sbjc,assetnum;`
             }
             if (this.brand) {
                 data.keyword += `${this.brand}:brand,sbxh;`

src/views/legendLibrary/index.vue

@@ -481,7 +481,7 @@ export default {
             })
         },
         getTableList(val) {
-            this.currentPage = val || 1
+            this.currentPage = Number(val) || 1
             this.getTableTata()
         },
 

src/views/room/detail.vue

@@ -113,7 +113,7 @@
         >
             <el-table-column type='index' label='序号' width='50'></el-table-column>
             <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
-                <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
+                <template slot-scope='{row}'>{{row.sbjc||'--'}}</template>
             </el-table-column>
             <el-table-column prop='assetnum' label='设备内码' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>

src/views/room/index.vue

@@ -101,7 +101,7 @@
                                 clearable
                                 @keyup.enter.native='Index2'
                                 @blur='Index2'
-                                placeholder='搜索品牌、型号'
+                                placeholder='搜索品牌型号'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='ppxhInput'
@@ -147,7 +147,7 @@
                                 clearable
                                 @keyup.enter.native='Index3'
                                 @blur='Index3'
-                                placeholder='搜索设备名称、编号'
+                                placeholder='搜索设备名称编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='sbmcInput4'
@@ -157,7 +157,7 @@
                                 clearable
                                 @keyup.enter.native='Index3'
                                 @blur='Index3'
-                                placeholder='搜索事项类型、事项描述'
+                                placeholder='搜索事项类型事项描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='zysxInput4'
@@ -270,7 +270,7 @@
                                 @keyup.enter.native='Index4'
                                 @blur='Index4'
                                 clearable
-                                placeholder='搜索设备名称、编号'
+                                placeholder='搜索设备名称编号'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='sbmcInput5'

vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
         port: 8090,
         proxy: {
             '/data': {
-                target: 'http://60.205.177.43',
-                // target: 'http://10.199.143.126',
+                // target: 'http://60.205.177.43',
+                target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,