diff --git a/package-lock.json b/package-lock.json index 7afe41d..b0e89ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "axios": "^1.6.7", "core-js": "^3.36.0", "crypto-js": "^4.2.0", + "date-fns": "^3.6.0", "echarts": "^5.5.0", "html2canvas": "^1.4.1", "jsonp": "^0.2.1", @@ -31,7 +32,8 @@ "vue-pdf": "^4.3.0", "vue-pdf-embed": "^2.0.3", "vue-qrcode-reader": "^5.5.3", - "vue-router": "^4.3.0" + "vue-router": "^4.3.0", + "weixin-js-sdk": "^1.6.5" }, "devDependencies": { "@vitejs/plugin-basic-ssl": "^1.1.0", @@ -4925,6 +4927,15 @@ "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==", "peer": true }, + "node_modules/date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -11923,6 +11934,11 @@ "npm": ">=3.10.0" } }, + "node_modules/weixin-js-sdk": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz", + "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ==" + }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", @@ -15572,6 +15588,11 @@ "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==", "peer": true }, + "date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==" + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -20906,6 +20927,11 @@ "sdp": "^3.2.0" } }, + "weixin-js-sdk": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz", + "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ==" + }, "whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", diff --git a/package.json b/package.json index f2f176f..f3ade1e 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "vue-pdf": "^4.3.0", "vue-pdf-embed": "^2.0.3", "vue-qrcode-reader": "^5.5.3", - "vue-router": "^4.3.0" + "vue-router": "^4.3.0", + "weixin-js-sdk": "^1.6.5" }, "devDependencies": { "@vitejs/plugin-basic-ssl": "^1.1.0", diff --git a/src/api/Home.js b/src/api/Home.js index 5b00f29..238ec60 100644 --- a/src/api/Home.js +++ b/src/api/Home.js @@ -16,5 +16,6 @@ export const getSiqLoginAuthTest = (params, success, error) => _post("/app/third // 深圳易平台登录 export const getSzyptLoginAuth = (code, success, error) => _get("/app/thirdLogin/szyptLogin/"+code,null,success,error); +export const szyptGetToken = (params, success, error) => _get("/app/thirdLogin/szyptGetToken",params,success,error); diff --git a/src/config/env.js b/src/config/env.js index 6914bd1..513850f 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -1,10 +1,7 @@ //本地环境 -// let baseUrl="http://192.168.110.36:85"; -// let baseUrl="http://localhost:85"; -let baseUrl="https://139.186.135.156:86"; // let baseUrl="http://139.186.135.156:86"; -// let baseUrl="http://10.132.108.3:85"; -// let baseUrl="http://192.168.1.101:85"; +let baseUrl="http://10.132.108.3:85"; +// let baseUrl="http://192.168.1.105:85"; // let wsUrl='ws://10.76.108.1:9326'; export { baseUrl, diff --git a/src/router/enforceHome.js b/src/router/enforceHome.js index d8dfc1e..9614812 100644 --- a/src/router/enforceHome.js +++ b/src/router/enforceHome.js @@ -38,6 +38,15 @@ const routes = [ isKeepAlive: false, }, }, + //执法端扫码页面-深圳易 + { + path: "/enforce/scanPage_szy", + name: "scanPage", + component: () => import("@/views/enforce/scanPage_szy.vue"), + meta: { + isKeepAlive: false, + }, + }, //执法端扫码页面 // { // path: "/enforce/scanPageTest", diff --git a/src/router/home.js b/src/router/home.js index 2ada058..cf3cae8 100644 --- a/src/router/home.js +++ b/src/router/home.js @@ -57,6 +57,12 @@ const routes = [ name: "complaint", component: () => import("@/views/enterprise/complaint.vue"), }, + //在线投诉列表 + { + path: "/enterprise/complaintList", + name: "complaintList", + component: () => import("@/views/enterprise/complaintList.vue"), + }, // 执法列表 { path: "/enterprise/enterpriseInspectionList", diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 749bc06..c6d2000 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -56,9 +56,9 @@
-
+
-

{{ item.checkItem }}

+

{{ item.checkItem }}

-
+
-

{{ item.planName }}

+

{{ item.planName }}

@@ -319,20 +319,24 @@ const openPlanAddView = () =>{ .card_box { display: flex; width: 100%; - padding: 10px,0px; + padding: 10px 0px; flex-direction: column; .card_body { background-color: #fff; border-radius: 10px; flex: 1; } - .card_box_span{ - font-size: 13px; - padding-left: 5%; - height: 35px; - align-items: center; + .card_box_span { display: flex; align-items: center; + margin: 2% 0; + padding-left: 3%; + font-size: 0.38rem; + line-height: 1.5; + + p { + margin: 0; + } } .card_box_action{ position: absolute; diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index 4cdef6a..2d492e9 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -87,10 +87,10 @@
-
+
-
@@ -134,9 +134,9 @@
- +
-

{{ item.lawEnforcementItem }}

+

{{ item.lawEnforcementItem }}

强制种类: {{ item.lawEnforcement }}

@@ -266,27 +266,27 @@ onMounted(() =>{ // queryRegistrationList(data.searchParam,success =>{ // data.checkDataList = success.data; // },error =>{ - + // }) //查询企业历史检查案件 queryXzjcjbxxList(data.enterpriseInfo.enterpriseNumber,success =>{ console.log("历史检查案件---",success.data) data.checkDataList = success.data; },error =>{ - + }); //查询历史强制案件 queryQZAJList(data.enterpriseInfo.enterpriseNumber,success =>{ console.log("历史强制案件---",success.data) },error =>{ - + }) - + //查询历史强制案件 queryCFAJList(data.enterpriseInfo.enterpriseNumber,success =>{ console.log("历史处罚案件---",success.data) },error =>{ - + }) } diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue index 71f122e..b2f0b03 100644 --- a/src/views/enforce/enterpriseScanPreview.vue +++ b/src/views/enforce/enterpriseScanPreview.vue @@ -135,7 +135,6 @@ const onLoad = () => { }; onMounted(() => { - getEnterpriseInformation(data.enterpriseNumber,success =>{ if (null != success.data) { data.searchParam.enterpriseNumber = success.data.enterpriseNumber; diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue index 43d6251..5a80fb9 100644 --- a/src/views/enforce/enterpriseWarningInfo.vue +++ b/src/views/enforce/enterpriseWarningInfo.vue @@ -276,21 +276,25 @@ .card_box { display: flex; width: 100%; - padding: 10px,0px; + padding: 10px 0px; flex-direction: column; .card_body { background-color: #fff; border-radius: 10px; flex: 1; } - .card_box_span{ - font-size: 13px; - padding-left: 5%; - height: 35px; - align-items: center; - display: flex; - align-items: center; - } + .card_box_span { + display: flex; + align-items: center; + margin: 2% 0; + padding-left: 3%; + font-size: 0.38rem; + line-height: 1.5; + + p { + margin: 0; + } + } .card_box_action{ position: absolute; right: 4%; diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index bbf5ef5..fadf75f 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -3,8 +3,8 @@
- - + +
+ + diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue index e2753f4..3725efa 100644 --- a/src/views/enterprise/enterpriseInspectionList.vue +++ b/src/views/enterprise/enterpriseInspectionList.vue @@ -68,9 +68,9 @@

-
+
-

{{ item.checkItem }}

+

{{ item.checkItem }}

-
+
@@ -328,20 +328,24 @@ const cancelSelectDate = () =>{ .card_box { display: flex; width: 100%; - padding: 10px,0px; + padding: 10px 0px; flex-direction: column; .card_body { background-color: #fff; border-radius: 10px; flex: 1; } - .card_box_span{ - font-size: 13px; - padding-left: 5%; - height: 35px; - align-items: center; + .card_box_span { display: flex; align-items: center; + margin: 2% 0; + padding-left: 3%; + font-size: 0.38rem; + line-height: 1.5; + + p { + margin: 0; + } } .card_box_action{ position: absolute; diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index c7c4a9f..398b3a4 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -35,6 +35,12 @@ right-icon="add-o" @click="showPopup2" /> +

执法时间:{{ item.createTime }} - 投诉 + 投诉

-
+
+
-

{{ item.lawEnforcementItemText }}

+

{{ item.lawEnforcementItemText }}

@@ -76,7 +77,7 @@

企业名称: {{ item.enterpriseName }}

-

备注: {{ item.remark }}

+

备注信息: {{ item.remark }}

@@ -357,20 +358,24 @@ const searchComplaint = (val) =>{ .card_box { display: flex; width: 100%; - padding: 10px,0px; + padding: 10px 0px; flex-direction: column; .card_body { background-color: #fff; border-radius: 10px; flex: 1; } - .card_box_span{ - font-size: 13px; - padding-left: 5%; - height: 35px; - align-items: center; + .card_box_span { display: flex; align-items: center; + margin: 2% 0; + padding-left: 3%; + font-size: 0.38rem; + line-height: 1.5; + + p { + margin: 0; + } } .card_box_action{ position: absolute; @@ -423,4 +428,29 @@ const searchComplaint = (val) =>{ } } +.trbtn { + top: -0.25rem; + height: 0.55rem; +} +/deep/ .van-hairline--bottom { + margin: -1% 0 3% 0; + height: 0; + background-color: transparent; + border: 1px; +} + +/deep/ .card_box_span:first-child { + color: #c1bfbf; +} + +/deep/ .card_box_span:nth-child(2) p { + font-size: 0.4rem; + font-weight: bold; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.card_box_label { + color: rgba(128, 128, 128, 0.65); +} diff --git a/src/views/enterprise/registrationSelectList.vue b/src/views/enterprise/registrationSelectList.vue index 50157aa..0cb918b 100644 --- a/src/views/enterprise/registrationSelectList.vue +++ b/src/views/enterprise/registrationSelectList.vue @@ -59,9 +59,9 @@

执法时间:{{ item.createTime }}

-
+
-

{{ item.lawEnforcementIncident }}

+

{{ item.lawEnforcementIncident }}

@@ -325,22 +325,26 @@ const oneCheckbox = (item) => { .card_box { display: flex; width: 100%; - padding: 10px,0px; + padding: 10px 0px; flex-direction: column; .card_body { background-color: #fff; border-radius: 10px; flex: 1; } - .card_box_span{ - font-size: 13px; - padding-left: 5%; - height: 35px; - align-items: center; + .card_box_span { display: flex; align-items: center; + margin: 2% 0; + padding-left: 3%; + font-size: 0.38rem; + line-height: 1.5; + + p { + margin: 0; + } } - .card_box_action{ + .card_box_action { position: absolute; right: 4%; } @@ -358,19 +362,19 @@ const oneCheckbox = (item) => { } } -.search-button-list{ +.search-button-list { height: 3%; display: flex; flex-direction: row; padding-left: 10px; margin-top: 6px; align-items: end; - .search-button{ + .search-button { width: 15%; height: 80%; } } -.search-button-date{ +.search-button-date { height: 3%; display: flex; flex-direction: row; @@ -382,7 +386,7 @@ const oneCheckbox = (item) => { font-size: 20px; margin-left: 2%; } - .search-button{ + .search-button { width: 15%; height: 80%; position: absolute; @@ -391,12 +395,12 @@ const oneCheckbox = (item) => { } } -.van-checkbox{ +.van-checkbox { margin-left: 10px; position: absolute; top: 45%; } -.card_box_span{ +.card_box_span { padding-left: 10% !important; }