flat: 合并

src/views/tenant/main/serve/index.vue

@@ -1495,7 +1495,7 @@ export default {
     // 匹配政策
     matchPolicy(row) {
       console.log('匹配政策')
-      getMatchPolicy({id: row.id, serveId: this.selectInfo.id}).then(res => {
+      getMatchPolicy({id: row.id, serveId: this.selectInfo.id, serveUserId: row.serveUserId}).then(res => {
         let _this = this;
         const {records, current, size, total} = res.data.data
           _this.policyData = records

vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://localhost:8000',
+        target: 'http://192.168.1.109:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {