diff --git a/config/index.js b/config/index.js index 4e8eddb..35d7822 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { proxyTable: { "/gyhl": { // target: "/gyhl", //8889 - target: "http://113.44.8.145:32/gyhl", + target: "http://36.137.58.70:52/gyhl", // // target:"http://192.168.1.194:21925", //lj-local changeOrigin: true, pathRewrite: { diff --git a/src/pages/inspection/daily/all.vue b/src/pages/inspection/daily/all.vue index de9ff90..aacbe8e 100644 --- a/src/pages/inspection/daily/all.vue +++ b/src/pages/inspection/daily/all.vue @@ -262,7 +262,7 @@ export default { this[loadingType] = true; const params = { - name: this.deviceSearchKeyword, + nameAndType: this.deviceSearchKeyword, pageno: this.devicePageNo, pagesize: this.devicePageSize }; diff --git a/src/pages/sbfxbb/index.vue b/src/pages/sbfxbb/index.vue index f288196..d40b529 100644 --- a/src/pages/sbfxbb/index.vue +++ b/src/pages/sbfxbb/index.vue @@ -43,8 +43,15 @@ --> - + + +