Merge branch 'huyt' of http://192.168.2.237:3000/root/middleground_code_v2 into huyt

src/views/apiLogs/configData.js

@@ -9,6 +9,11 @@ const tableColumnData = [
     prop: 'sendAppName',
     tooltip: true,
   },
+  {
+    label: '接口名称',
+    prop: 'apiName',
+    tooltip: true,
+  },
   {
     label: '源数据',
     prop: 'sourceData',
@@ -204,6 +209,16 @@ const formRowShow = [
       optionLabel: 'name',
     },]
   },
+  {
+    elCol: [{
+      label: '接口名称',
+      prop: 'apiName',
+      tag: 'elInput',
+      disabled: true,
+      type: 'text',
+      span: 12,
+    },]
+  },
   {
     elCol: [{
       label: '源数据',

src/views/apiLogs/index.vue

@@ -210,6 +210,24 @@ export default {
         this.tableData = res.attribute.list;
         this.$refs.baseLayout.setPageTotal(res.attribute.total);
       }
+
+      this.tableData.forEach(async (item, index) => {
+        console.log(item.receiveCode)
+
+        let res2 = await authApi(
+          "sysApplicationApiService",
+          "application",
+          "queryEntity",
+          "",
+          {"apiCode":item.receiveCode}
+        );
+        if (res2.status == "200") {
+          this.$set(this.tableData[index],'apiName',res2.attribute[0].apiName);
+        }else{
+          this.$set(this.tableData[index],'apiName',"未配置该接口");
+        }
+
+      })
     },
     // 分页变化
     handlePageChange(val) {

src/views/apiLogs/rightDialog.vue

@@ -115,6 +115,19 @@ export default {
         params
       )
       if (res.status == '200') {
+        let res2 = await authApi(
+          "sysApplicationApiService",
+          "application",
+          "queryEntity",
+          "",
+          {"apiCode":res.attribute.receiveCode}
+        );
+        if (res2.status == '200') {
+          this.$set(res.attribute,'apiName',res2.attribute[0].apiName);
+        }else{
+          this.$set(res.attribute,'apiName',"未配置该接口");
+        }
+
         this.$nextTick(() => {
           this.$refs.basicsForm.incomingParameters(res.attribute)
         })

src/views/apiLogsError/configData.js

@@ -9,6 +9,11 @@ const tableColumnData = [
     prop: 'sendAppName',
     tooltip: true,
   },
+  {
+    label: '接口名称',
+    prop: 'apiName',
+    tooltip: true,
+  },
   {
     label: '源数据',
     prop: 'sourceData',
@@ -204,6 +209,17 @@ const formRowShow = [
       optionLabel: 'name',
     },]
   },
+  {
+    elCol: [{
+      label: '接口名称',
+      prop: 'apiName',
+      tag: 'elInput',
+      disabled: true,
+      type: 'text',
+      span: 12,
+    },]
+  },
+
   {
     elCol: [{
       label: '源数据',
@@ -276,6 +292,18 @@ const HandleformRowShow = [
       optionLabel: 'name',
     },]
   },
+  {
+    elCol: [{
+      label: '接口名称',
+      prop: 'apiName',
+      tag: 'elInput',
+      disabled: true,
+      type: 'text',
+      span: 12,
+    },]
+  },
+
+
   {
     elCol: [{
       label: '源数据',

src/views/apiLogsError/index.vue

@@ -220,6 +220,27 @@ export default {
         this.tableData = res.attribute.list;
         this.$refs.baseLayout.setPageTotal(res.attribute.total);
       }
+
+      this.tableData.forEach(async (item, index) => {
+        console.log(item.receiveCode)
+
+        let res2 = await authApi(
+          "sysApplicationApiService",
+          "application",
+          "queryEntity",
+          "",
+          {"apiCode":item.receiveCode}
+        );
+        if (res2.status == "200") {
+          this.$set(this.tableData[index],'apiName',res2.attribute[0].apiName);
+        }else{
+          this.$set(this.tableData[index],'apiName',"未配置该接口");
+        }
+
+      })
+
+
+
     },
     // 分页变化
     handlePageChange(val) {

src/views/apiLogsError/rightDialog.vue

@@ -148,14 +148,28 @@ export default {
         id: id,
         status: row.status
       }
+
       let res = await authApi(
         'sysMessageManageLogService',
         'messageManage',
         'thirdInterfacequeryEntity',
         '',
         params
-      )
+      );
+
       if (res.status == '200') {
+        let res2 = await authApi(
+          "sysApplicationApiService",
+          "application",
+          "queryEntity",
+          "",
+          {"apiCode":res.attribute.receiveCode}
+        );
+        if (res2.status == '200') {
+          this.$set(res.attribute,'apiName',res2.attribute[0].apiName);
+        }else{
+          this.$set(res.attribute,'apiName',"未配置该接口");
+        }
         this.$nextTick(() => {
           this.$refs.basicsForm.incomingParameters(res.attribute)
         })

vue.config.js

@@ -40,14 +40,15 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://hzya.ufyct.com:9067/`,
-        // target: `http://ufidahz.com.cn:9067/`,
+        //target: `http://ufidahz.com.cn:9067/`,
         // target: `http://127.0.0.1:9081/`,
         // target: `http://192.168.2.78:9999`,
         // target: `http://192.168.2.85:9999`,
         // target: `http://192.168.2.78:8080`,
-        target: `http://192.168.2.78:9999`,
+        // target: `http://192.168.2.78:9999`,
         // target: `http://192.168.2.185:9999`,
         // target: `http://192.168.2.83:9999`,
+        target:'http://127.0.0.1:9999/',
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",