lizhuang vor 4 Jahren
Ursprung
Commit
f3d5fe0637

+ 14 - 20
src/utils/plugins/components.js

@@ -26,7 +26,7 @@ var system = [
                     param: { tab_code: "1592" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "GDWB",
                     children: [
                         {
@@ -47,7 +47,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "GDWX",
                     children: [
                         {
@@ -142,7 +142,7 @@ var system = [
                     id: "NTQD",
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     children: [
                         {
                             label: "冷源机房内重要维保",
@@ -163,7 +163,7 @@ var system = [
                     id: "NTWB",
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     children: [
                         {
                             label: "冷源机房内重要维修",
@@ -253,7 +253,7 @@ var system = [
                     param: { tab_code: "xf01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "XFWB",
                     children: [
                         {
@@ -274,7 +274,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "XFWX",
                     children: [
                         {
@@ -369,7 +369,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "RDWB",
                     children: [
                         {
@@ -390,7 +390,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "RDWX",
                     children: [
                         {
@@ -465,7 +465,7 @@ var system = [
                     param: { tab_code: "gps01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "GSWB",
                     children: [
                         {
@@ -486,7 +486,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "GSWX",
                     children: [
                         {
@@ -566,7 +566,7 @@ var system = [
                     param: { tab_code: "dt01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "DTWB",
                     children: [
                         {
@@ -582,7 +582,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "DTWX",
                     children: [
                         {
@@ -642,7 +642,7 @@ var system = [
                     param: { tab_code: "rq01" },
                 },
                 {
-                    label: "维保事项",
+                    label: "主要设备维保事项",
                     id: "RQWB",
                     children: [
                         {
@@ -658,7 +658,7 @@ var system = [
                     ],
                 },
                 {
-                    label: "维修事项",
+                    label: "主要设备维修事项",
                     id: "RQWX",
                     children: [
                         {
@@ -732,12 +732,6 @@ var system = [
                     ],
                 },
                 {
-                    label: "主要材料清单",
-                    id: "TJQD",
-                    children: [],
-                    param: { tab_code: "tj01" },
-                },
-                {
                     label: "维保事项",
                     id: "TJWB",
                     children: [

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

@@ -22,7 +22,7 @@
                     <rotation type='3' v-if='rotationImg.length>0' :size='sizePic' :rotationImg='rotationImg'></rotation>
                 </div>
                 <!-- 土建装饰主要材料清单 -->
-                <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table>
+                <!-- <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param'></tj-table> -->
                 <!-- 主要设备清单 标准设备表格 -->
                 <!-- 内部设备清单 -->
                 <standTable

+ 7 - 1
src/views/equipment/table/rcwxTable.vue

@@ -221,7 +221,13 @@ export default {
                 getParams.data.keyword += `${this.matters}:description,matters;`
             }
             if (this.locationName) {
-                getParams.data.keyword += `${this.locationName}:location`
+                getParams.data.keyword += `${this.locationName}:location;`
+            }
+            if (this.wonum2) {
+                getParams.data.keyword += `${this.wonum2}:wonum;`
+            }
+            if(this.people){
+                getParams.data.keyword += `${this.people}:lead;`
             }
             if (getParams.data.keyword == '') {
                 delete getParams.data.keyword

+ 4 - 4
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',
+               // target: 'http://10.199.143.129:8080',
+                target: 'http://60.205.177.43',
                 changeOrigin: true,
                 pathRewrite: {
                     "^/serve": "",