debyg

src/views/room/index.vue

@@ -700,6 +700,9 @@ export default {
         page: this.page2,
         size: this.size2
       };
+      if (this.smsxtArr.smsxt != "1008") {
+        data.onlyMainAsset = true;
+      }
       if (this.sbjcInput) {
         if (data.keyword) {
           data.keyword = `${data.keyword + ";" + this.sbjcInput}:type_name`;
@@ -951,6 +954,7 @@ export default {
         });
       });
       // 2维修任务状态
+
       let postParams2 = [
         {
           columnName: { status: "status" },

src/views/room/room3.vue

@@ -12,7 +12,7 @@
             >
                 <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
-                    <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
+                    <template slot-scope='{row}'>{{row.type_name ||row.classqc||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='数量' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>

vue.config.js

@@ -4,8 +4,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,
@@ -34,8 +34,8 @@ module.exports = {
             // 图例库服务
             "/serve": {
                 // target: 'http://192.168.200.87:8088',
-            //    target: 'http://10.199.143.129:8080',
-                target: 'http://60.205.177.43:8080',
+               target: 'http://10.199.143.129:8080',
+                // target: 'http://60.205.177.43:8080',
                 changeOrigin: true,
                 pathRewrite: {
                     "^/serve": "",