From 3903ff7a9dcdbff039a105f2aa3693af3dcddc14 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Mon, 26 Aug 2024 14:37:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E6=9F=90=E6=9D=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8B=E9=92=BB=EF=BC=8C=E7=9C=8B=E5=88=B0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5(=E5=89=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enforce.js | 9 +- src/router/enforceHome.js | 9 ++ src/views/enforce/enforcementPlanDetailed.vue | 116 ++++++++++++++++++ src/views/enforceHome.vue | 29 +++-- 4 files changed, 151 insertions(+), 12 deletions(-) create mode 100644 src/views/enforce/enforcementPlanDetailed.vue diff --git a/src/api/enforce.js b/src/api/enforce.js index 29cb6f8..e285d1b 100644 --- a/src/api/enforce.js +++ b/src/api/enforce.js @@ -27,7 +27,14 @@ export const queryEnforcementInspectionProgramListNoPermission = (params, succes * @returns */ export const queryEnforcementInspectionProgramListNoPermissionNoPaging = (params, success, error) => _get("/app/code/enforcementInspectionProgram/queryListNoPermissionNoPaging", params, success, error); - +/** + * 执法计划列表 按id查询 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const detail = (id, success, error) => _get("/app/code/enforcementInspectionProgram/detail/"+id, null, success, error); /** * 添加年度执法计划 * @param {*} params diff --git a/src/router/enforceHome.js b/src/router/enforceHome.js index 9614812..412d3ed 100644 --- a/src/router/enforceHome.js +++ b/src/router/enforceHome.js @@ -101,6 +101,15 @@ const routes = [ isKeepAlive: false }, }, + //计划详情页 + { + path:"/enforce/enforcementPlanDetailed", + name:"enforcementPlanDetailed", + component: () => import("@/views/enforce/enforcementPlanDetailed.vue"), + meta: { + isKeepAlive: false + }, + }, ] export {routes} \ No newline at end of file diff --git a/src/views/enforce/enforcementPlanDetailed.vue b/src/views/enforce/enforcementPlanDetailed.vue new file mode 100644 index 0000000..1756ae7 --- /dev/null +++ b/src/views/enforce/enforcementPlanDetailed.vue @@ -0,0 +1,116 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index 6e9a503..b7d28e9 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -11,12 +11,15 @@
-
@@ -51,7 +54,7 @@ import Vconsolefrom from 'vconsole'; import {Loading, showFailToast} from 'vant'; import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home'; - import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce"; + import {queryEnforcementInspectionProgramListNoPermissionNoPaging} from "@/api/enforce"; const isLoading = ref(true); const {useCommon} = $globalStore; @@ -93,7 +96,8 @@ }); const data = reactive({ - noticeList: [] + noticeList: [], + notNull:true }); const adviceList = reactive([]); const boutiqueAttr = reactive({ @@ -144,13 +148,13 @@ path: "/enforce/enforceNotice", }); } - const toNoticeDetail = async (url) => { - if (null != url) { + const toNoticeDetail = async (item) => { + if (null != item) { router.push( { - path: "/pdfView", + path: "/enforce/enforcementPlanDetailed", query: { - url: url + id:item.id } }); } else { @@ -158,7 +162,7 @@ } } const queryList = () => { - queryEnforcementInspectionProgramListNoPermissionNoPaging({dateType:4}, success => { + queryEnforcementInspectionProgramListNoPermissionNoPaging({isPublish:1,dateType:4}, success => { /* if (success.rows.length > 4) { for (let i = 0; i < 5; i++) { carouselList.push(success.rows[i]); @@ -175,12 +179,15 @@ noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : ""; } else { */ carouselList = success.data; - + if(carouselList.length==0){ + data.notNull=false + } for (let i = 0; i < success.data.length; i++) { // carouselList.push(success.data[i]); noticeObj.noticeList.push(success.data[i].planName); var obj = { - content: success.data[i].planName + content: success.data[i].planName, + id:success.data[i].id } data.noticeList.push(obj) //} From a85c34fddf4f09ce205b15f925fc252fa30a6912 Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Mon, 26 Aug 2024 16:14:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/enforceNotice.vue | 36 ++++++++++--- src/views/enforce/enforcementPlanDetailed.vue | 53 +++++++++++++++++-- 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue index 5615f6e..e5a66f5 100644 --- a/src/views/enforce/enforceNotice.vue +++ b/src/views/enforce/enforceNotice.vue @@ -34,11 +34,20 @@
{{ null==item.fileObject?'':item.fileObject.fileName }}
-
+ +
+

{{ item.bureauDeptName }} +

+
+
+

{{ item.enforcementArea }}

+
+
+

{{ item.createTime }}

+
@@ -407,8 +416,8 @@ display: flex; position: relative; margin: 1% 0; - padding: 0 2% 0 0; - width: 96%; + padding: 0 1% 0 0; + width: 98%; align-items: center; /*border-bottom: 1px solid #f3f4f5;*/ } @@ -424,7 +433,8 @@ .item-cont { display: inline-block; - width: calc(100% - 2.0rem); + margin: 3% 0; + width: calc(100% - 1.75rem); } .item-time { @@ -451,16 +461,26 @@ .item-text { width: 100%; - color: #999; + color: #666; font-size: 0.35rem; font-weight: normal; - line-height: 2; } .item-text a { color: #2b75fd; + line-height: 2; } + .item-text p { + display: flex; + margin: 0; + } + + .item-text label { + color: #323233; + } + + /deep/ .van-search__content { height: 0.9rem; border: 1px solid #ececec; diff --git a/src/views/enforce/enforcementPlanDetailed.vue b/src/views/enforce/enforcementPlanDetailed.vue index 1756ae7..140139f 100644 --- a/src/views/enforce/enforcementPlanDetailed.vue +++ b/src/views/enforce/enforcementPlanDetailed.vue @@ -2,11 +2,15 @@
- + />--> +
+ + +
- + right-icon="eye" + />--> +
+ + + +
@@ -113,4 +123,39 @@ onMounted(() => { overflow-y: auto; margin-top: 0.15rem; } + + /deep/ .van-field__right-icon i { + color: #2b75fd; + } + + .fold-div { + position: relative; + display: flex; + margin: 0 0.3rem; + padding-bottom: 0.13rem; + border-bottom: 1px solid #f5f6f7; + color: rgb(50, 50, 51); + font-size: 0.37rem; + } + + .fold-div label { + width: 2.6rem; + padding: 0.27rem 0px 0.27rem 0.15rem; + } + + .fold-div .van-text-ellipsis { + padding: 0.27rem 0px 0px; + width: calc(100% - 2.7rem); + color: #666; + } + + .fold-div i { + position: absolute; + bottom: 0.2rem; + right: 0.1rem; + display: inline-block; + color: #2b75fd; + font-size: 0.5rem; + } + \ No newline at end of file From b4f463b263424411f3e220acdc288d94d4f4b15e Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Mon, 26 Aug 2024 16:32:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=97=A0pdf=E6=96=87=E4=BB=B6=E6=97=B6=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=9B=BE=E6=A0=87=E4=B8=8D=E6=98=BE=E7=A4=BA(?= =?UTF-8?q?=E5=89=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/enforcementPlanDetailed.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/enforce/enforcementPlanDetailed.vue b/src/views/enforce/enforcementPlanDetailed.vue index 140139f..aaacf69 100644 --- a/src/views/enforce/enforcementPlanDetailed.vue +++ b/src/views/enforce/enforcementPlanDetailed.vue @@ -41,7 +41,7 @@
- +
@@ -66,7 +66,8 @@ const obj = reactive({ objList:{ fileName:"", fileUrl:"" - } + }, + iconShow:false }); const data = reactive({}); @@ -82,6 +83,7 @@ const queryList = () => { if(success.data.fileObject!=null && success.data.fileObject!="undefined"){ obj.objList.fileName = success.data.fileObject.fileName; obj.objList.fileUrl = success.data.fileObject.fileUrl; + obj.iconShow=true; } }); From 9131f7c5ddb055298784ff366c9a6edf2eb8c6f7 Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Mon, 26 Aug 2024 19:54:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home.vue | 9 ++++++--- src/views/HomeWx.vue | 9 ++++++--- src/views/administrative/appointmentList.vue | 6 ++++-- src/views/enforce/earlyWarning.vue | 6 ++++-- src/views/enforce/enforceNotice.vue | 8 +++++--- src/views/enforce/enforcementPlan.vue | 6 ++++-- src/views/enforce/enforcementPlanDetailed.vue | 5 +++-- src/views/enforce/enterpriseBaseInfo.vue | 2 +- src/views/enforceHome.vue | 9 ++++++--- src/views/enterprise/complaintList.vue | 6 ++++-- src/views/enterprise/enterpriseInspectionNotice.vue | 4 +++- src/views/enterprise/register.vue | 2 +- 12 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index 9d5ab6e..9e133c4 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,7 +1,7 @@