From 6a4cf801eeb81ec1759e5d014552e85aa9904270 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 21 Mar 2024 11:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=9B=91=E7=9D=A3=E7=A0=81-?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/env.js | 4 ++-- src/http/http.js | 1 - src/router/home.js | 6 ++++++ src/views/administrative/appointmentList.vue | 6 ++++++ src/views/enforce/earlyWarning.vue | 12 ++++++------ src/views/enforce/enforcementPlan.vue | 4 ++-- src/views/enforce/historyCheck.vue | 11 +++++++++-- src/views/login.vue | 7 ++++++- 8 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/config/env.js b/src/config/env.js index 08c11eb..ee459ee 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -1,6 +1,6 @@ //本地环境 -let baseUrl="http://localhost:85"; -let wsUrl='ws://localhost:9326'; +let baseUrl="http://192.168.110.36:85"; +let wsUrl='ws://192.168.110.36:9326'; export { baseUrl, wsUrl diff --git a/src/http/http.js b/src/http/http.js index c3f365b..a0c8515 100644 --- a/src/http/http.js +++ b/src/http/http.js @@ -39,7 +39,6 @@ http.interceptors.response.use( // Message.error('没有操作该功能权限，请联系管理员添加权限'); } if (response.data.msg === '未登录或登录超时。请重新登录') { - console.log(1111111111111) // let show = cache.getMemoryCache("isShow"); // if(show){ // return response; diff --git a/src/router/home.js b/src/router/home.js index 41fa0e1..f4eba18 100644 --- a/src/router/home.js +++ b/src/router/home.js @@ -55,6 +55,12 @@ const routes = [ name: "enterpriseInspectionList", component: () => import("@/views/enterprise/enterpriseInspectionList.vue"), }, + // 投诉案件选择列表 + { + path: "/registrationSelectList", + name: "registrationSelectList", + component: () => import("@/views/enterprise/registrationSelectList.vue"), + }, ]; export { routes }; diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 6908ce0..66901cf 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -104,6 +104,8 @@ isComplaint: null, //企业统一信用码 enterpriseNumber: ref(useCommon.enterpriseNumber), + //日期搜索 + searchDate: ref(), }); const data = reactive({ @@ -244,6 +246,9 @@ }); data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1] data.showDatePicker = false; + //日期搜索 + searchParam.searchDate = value.selectedValues[0] + "-" + value.selectedValues[1] + queryList(); } const nowDate = (time) => { var year = time.getFullYear(); // 年 @@ -261,6 +266,7 @@ const searchDateType = (val) =>{ searchParam.dateType = val; searchParam.isComplaint = null; + searchParam.searchDate = null; queryList(); } const searchComplaint = (val) =>{ diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index 2bf3c92..ac75a24 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -28,12 +28,12 @@

-
-
- - - - +
+
+ + + +

{{ item.lawEnforcement }}

diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index 7a87161..4f67534 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -95,8 +95,6 @@ const { useCommon, useShopCard } = $globalStore; const router = useRouter(); let allchecked = ref(false); // 是否全选 let refreshLoad = ref(false); // 是否加载中 -let value = ref('') -let totalPrice = ref(0); // 总钱数 let searchParam = reactive({ //搜索框 @@ -240,6 +238,8 @@ const onDateConfirm = (value)=> { }); data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1] data.showDatePicker = false; + searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1]; + queryList(); } const nowDate = (time) => { var year = time.getFullYear(); // 年 diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 79a0bb8..c525f4d 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -88,8 +88,6 @@ const router = useRouter(); let allchecked = ref(false); // 是否全选 let refreshLoad = ref(false); // 是否加载中 - let value = ref('') - let totalPrice = ref(0); // 总钱数 let searchParam = reactive({ //执法事件 @@ -104,6 +102,8 @@ isComplaint: null, //企业统一信用码 enterpriseNumber: ref(useCommon.enterpriseNumber), + //日期搜索 + dateSearch: ref(), }); const data = reactive({ @@ -133,6 +133,7 @@ } const onSearch = (val) => { + searchParam.dateSearch = null; queryRegistrationList( { "searchValue": searchParam.searchValue @@ -235,6 +236,12 @@ }); data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1] data.showDatePicker = false; + + //日期搜索条件 + searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1] + //取消投诉 + searchParam.isComplaint = null, + queryList(); } const nowDate = (time) => { var year = time.getFullYear(); // 年 diff --git a/src/views/login.vue b/src/views/login.vue index 7219c8e..be4acf9 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -44,7 +44,12 @@ const onSubmit = async (values) => { //设置全局变量 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber); useCommon.SET_USER_ID(success.data.userId); - + // 监听uni-app发送的消息 + window.addEventListener('message', (event) => { + console.log('Received message from uni-app:', event.data); + // 向uni-app返回消息 + window.parent.postMessage('Hello, uni-app!', '*'); + }); },error=>{ console.log("登录失败") })