diff --git a/src/utils/request.js b/src/utils/request.js index 17da0e6..fd35035 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,8 +4,8 @@ import vm from "../main"; import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - //baseURL: 'http://172.18.113.50:8080/zhapi', - baseURL: `http://${window.location.host}/zhapi`, + baseURL: 'http://172.18.113.50:8080/zhapi', + // baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/systemManagement/safeIndex/components/indexTable.vue b/src/views/systemManagement/safeIndex/components/indexTable.vue index ae3a3ea..298859a 100644 --- a/src/views/systemManagement/safeIndex/components/indexTable.vue +++ b/src/views/systemManagement/safeIndex/components/indexTable.vue @@ -469,7 +469,7 @@ export default { level: "3", }; this.$emit("back", massage); - bus.$emit("send", massage); // 传给三级指标详情 + bus.$emit("send_three", massage); // 传给三级指标详情 }, }, }; diff --git a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue index 28a064c..04259b0 100644 --- a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue +++ b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue @@ -92,7 +92,6 @@ export default { }, mounted() { bus.$on("send", (data) => { - console.log(data, "data"); this.params = { safeRuleId: data.safeRuleId, levelIndex: data.level, diff --git a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue index 6b3850c..f7c6bb1 100644 --- a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue +++ b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue @@ -1,22 +1,138 @@ \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue b/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue index 13867e0..1042195 100644 --- a/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue +++ b/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue @@ -92,7 +92,6 @@ export default { }, mounted() { bus.$on("send", (data) => { - console.log(data, "data"); this.params = { safeRuleId: data.safeRuleId, levelIndex: data.level,