修改扫描二维码样式，

添加执法登记详情页，执法预约详情修改页面查询
2 years ago · 7d50951aab
18 changed files with 8917 additions and 402 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -23,6 +23,8 @@
    "jsonp": "^0.2.1",
    "lodash": "^4.17.21",
    "mitt": "^3.0.1",
+    "pdfh5": "^1.4.9",
+    "pdfjs-dist": "^4.0.379",
    "pinia": "^2.1.7",
    "pinia-plugin-persistedstate": "^3.2.1",
    "sass": "^1.71.1",
@ -31,6 +33,8 @@
    "vue": "^3.4.21",
    "vue-dompurify-html": "^5.0.1",
    "vue-i18n": "^9.9.1",
+    "vue-pdf": "^4.3.0",
+    "vue-pdf-embed": "^2.0.3",
    "vue-qrcode-reader": "^5.5.3",
    "vue-router": "^4.3.0"
  },
--- a/src/api/administrative.js
+++ b/src/api/administrative.js
@ -3,6 +3,8 @@ import { _get, _post,_form,_delete } from "../http/index";
 //行政检查预约登记
 export const addEnterpriseLawEnforcement = (params, success, error) => _post("/code/enforcement/add",params,success,error)

+//行政检查预约详情
+export const getEnterpriseLawEnforcement = (id, success, error) => _get("/code/enforcement/getById/" + id,null,success,error)
 //查询历史检查信息
 export const queryEnterpriseLawEnforcementList = (params, success, error) => _get("/code/enforcement/queryList",params,success,error)

--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@ -40,3 +40,12 @@ export const queryEarlyWarning = (params, success, error) => _get("/code/LawEnfo
 */
 export const queryUserInfo = (params, success, error) => _get("/getUserInfo",params,success,error)

+/**
+ * 查询执法登记信息详情
+ * @param {*} params 
+ * @param {*} success 
+ * @param {*} error 
+ * @returns 
+ */
+export const queryEnforcementRegistrationById = (id, success, error) =>_get("/code/registration/queryById/" + id,null,success,error)
+
--- a/src/config/env.js
+++ b/src/config/env.js
@ -1,6 +1,8 @@
 //本地环境
-let baseUrl="http://192.168.31.79:85";
-let wsUrl='ws://192.168.110.36:9326';
+// let baseUrl="http://192.168.110.36:85";
+let baseUrl="https://139.186.135.156:86";
+// let baseUrl="http://10.76.108.1:85";
+let wsUrl='ws://10.76.108.1:9326';
 export {
    baseUrl,
    wsUrl
--- a/src/router/enforce.js
+++ b/src/router/enforce.js
@ -17,6 +17,12 @@ const routes = [
    name: "earlyWarning",
    component: () => import("@/views/enforce/earlyWarning.vue"),
  },
+  // pdf预览
+  {
+    path: "/pdfView",
+    name: "pdfView",
+    component: () => import("@/views/common/pdfvVew.vue"),
+  },
 ];

 export { routes };
--- a/src/router/enforceHome.js
+++ b/src/router/enforceHome.js
@ -56,6 +56,15 @@ const routes = [
 			isKeepAlive: false
 		},
 	},
+    //新增公布执法计划
+	{
+		path: "/enterprise/enterpriseInspectionDetail",
+		name: "enterpriseInspectionDetail",
+		component: () => import("@/views/enterprise/enterpriseInspectionDetail.vue"),
+		meta: {
+			isKeepAlive: false
+		},
+	},
  //统计分析页面
 	{
 		path: "/analyse",
--- a/src/router/home.js
+++ b/src/router/home.js
@ -67,6 +67,13 @@ const routes = [
 		name: "registrationSelectList",
 		component: () => import("@/views/enterprise/registrationSelectList.vue"),
 	},
+  
+  // 执法登记详情
+	{
+		path: "/registrationDetail",
+		name: "registrationDetail",
+		component: () => import("@/views/enterprise/registrationDetail.vue"),
+	},
 ];

 export { routes };
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@ -58,6 +58,11 @@
                readonly
                label="执法人员"
            />
+            <van-field
+                v-model="submitData.lawEnforcerTwo"
+                readonly
+                label="执法人员2"
+            />
            <van-field
              v-model="submitData.remark"
              label="备注"
@ -137,6 +142,10 @@ const submitData = reactive({
    lawEnforcer:"",
    /** 执法人员ID */
    lawEnforcerId:"",
+    /** 执法人员2 */
+    lawEnforcerTwo:"",
+    /** 执法人员2ID */
+    lawEnforcerIdTwo:"",
    /** 备注 */
    remark:"",
 })
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@ -36,12 +36,12 @@
 		<!-- 中间 -->
 		<div class="shop-center">
 			<lodding-card :isLodding="isLodding">
-				<refresh-list v-model:freshMap="freshMap" :classMap="classMap" @refresh="onRefresh" @onLoad="onLoad"
+				<refresh-list v-model:freshMap="freshMap"  @refresh="onRefresh" @onLoad="onLoad"
 							  :resetScroll="resetScroll" class="refresh_box">
 					<div class="refresh_content" v-if="data?.dataList.length">
 						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
 							<van-swipe-cell class="swipe_cell">
-								<div class="card_box">
+								<div class="card_box" @click="toDetailView(item.id)">
 									<div class="card_box_span">
 										<p>执法时间：{{ item.checkTime }}
 <!--											<span class="card_box_action">-->
@ -274,6 +274,16 @@
 		searchParam.dateType =  null;
 		queryList();
 	}
+  const toDetailView = (id) =>{
+  console.log(id)
+  router.push(
+        { 
+          path: "/enterprise/enterpriseInspectionDetail",
+          query: {
+            id: id,
+            } 
+      });
+}
 </script>

 <style lang="less" scoped>
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@ -46,10 +46,10 @@
 		<!-- 中间 -->
 		<div class="shop-center">
 			<lodding-card :isLodding="isLodding">
-				<refresh-list v-model:freshMap="freshMap" :classMap="classMap" @refresh="onRefresh" @onLoad="onLoad"
+				<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
 						:resetScroll="resetScroll" class="refresh_box">
 					<div class="refresh_content" v-if="data?.dataList.length">
-						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
+						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index" @click="toPdfView(item.fileObject.fileUrl)">
 							<van-swipe-cell class="swipe_cell">
 								<div class="card_box">
                  <div class="card_box_span">
@ -155,14 +155,13 @@ const onClickButton = () =>{
  queryList();
 }

-const toComplaintView = (id,name) =>{
-  console.log(id,name)
+const toPdfView = (url) =>{
+  console.log(url)
  router.push(
        { 
-          path: "/enterprise/complaint",
+          path: "/pdfView",
          query: {
-            id: id,
-            lawEnforcementIncident: name
+            url: url
            } 
      });
 }
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@ -80,7 +80,7 @@
          <div class="file-upload-center">
            文件上传 <span>(不多于9张)</span>
          </div>
-          <van-uploader v-model="submitData.fileListObj"  class="file" :after-read="uploadFiles" multiple  @oversize="onOversize" :before-delete="deleteFile" accept="file">
+          <van-uploader v-model="submitData.fileListObj"  class="file" :after-read="uploadFiles" multiple  @oversize="onOversize" :before-delete="deleteFile" accept=".pdf">
            <template #preview-cover="{ file }">
              <div class="preview-cover van-ellipsis">{{ file.name }}</div>
            </template>
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@ -36,12 +36,12 @@
 		<!-- 中间 -->
 		<div class="shop-center">
 			<lodding-card :isLodding="isLodding">
-				<refresh-list v-model:freshMap="freshMap" :classMap="classMap" @refresh="onRefresh" @onLoad="onLoad"
+				<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
 							  :resetScroll="resetScroll" class="refresh_box">
 					<div class="refresh_content" v-if="data?.dataList.length">
 						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
 							<van-swipe-cell class="swipe_cell">
-								<div class="card_box">
+								<div class="card_box" @click="toDetailView(item.id)">
 									<div class="card_box_span">
 										<p>执法时间：{{ item.createTime }}
 <!--											<span class="card_box_action">-->
@ -266,6 +266,22 @@
 		searchParam.dateType =  null;
 		queryList();
 	}
+
+  /**
+ * 查看执法登记详情
+ * @param {} id 
+ * @param {*} name 
+ */
+const toDetailView = (id) =>{
+  console.log(id)
+  router.push(
+        { 
+          path: "/registrationDetail",
+          query: {
+              id: id,
+            }
+      });
+}
 </script>

 <style lang="less" scoped>
--- a/src/views/enforce/scanPage.vue
+++ b/src/views/enforce/scanPage.vue
@ -81,7 +81,12 @@ export default {
              // 这里写你要对扫描结果做什么，我这里扫描出来的是个网址，写的页面跳转
              if (that.textContent) {
                setTimeout(() => {
-                  window.location.href = that.textContent;
+                  this.$router.push({
+                    path:"/sign",
+                    query:{
+                      enterpriseNumber: that.textContent
+                    }
+                  })
                  // 记得重置，不然在微信里用会有问题
                  that.textContent = null;
                  that.codeReader && that.codeReader.reset();
@ -124,6 +129,9 @@ export default {
        that.codeReader && that.codeReader.reset();
        that.openScan();
      }
+    },
+    back(){
+      this.$router.go(-1);
    }
  }
 };
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@ -250,7 +250,7 @@ const submit = () =>{
    //跳转首页
    if(success.success){
        showSuccessToast('登记成功');
-        router.push({ path: "/home" });
+        router.push({ path: "/enforceHome" });
    }
  },error=>{
      console.log("登记失败")
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@ -55,12 +55,12 @@
 		<!-- 中间 -->
 		<div class="shop-center">
 			<lodding-card :isLodding="isLodding">
-				<refresh-list v-model:freshMap="freshMap" :classMap="classMap" @refresh="onRefresh" @onLoad="onLoad"
+				<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
 						:resetScroll="resetScroll" class="refresh_box">
 					<div class="refresh_content" v-if="data?.dataList.length">
 						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
 							<van-swipe-cell class="swipe_cell">
-								<div class="card_box">
+								<div class="card_box" @click="toDetailView(item.id)">
                  <div class="card_box_span">
                    <p>执法时间：{{ item.createTime }} <span class="card_box_action">
                      <!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button> -->
@ -176,14 +176,13 @@ const onClickButton = () =>{
  queryList();
 }

-const toComplaintView = (id,name) =>{
-  console.log(id,name)
+const toDetailView = (id) =>{
+  console.log(id)
  router.push(
        { 
-          path: "/enterprise/complaint",
+          path: "/enterprise/enterpriseInspectionDetail",
          query: {
            id: id,
-            lawEnforcementIncident: name
            } 
      });
 }
@ -296,6 +295,9 @@ const searchComplaint = (val) =>{
  searchParam.dateType =  null;
  queryList();
 }
+const cancelSelectDate = () =>{
+  data.showDatePicker = false;
+}
 </script>

 <style lang="less" scoped>
--- a/src/views/enterprise/qrCode.vue
+++ b/src/views/enterprise/qrCode.vue
@ -15,7 +15,7 @@
        <div class="qr_name">
          <span>{{ data.enterpriseName }}</span>
        </div>
-          <div class="qr_code_img">
+          <div class="qr_code_img" id="qr_code_img">
            <van-image
              width="100%"
              height="100%"
@ -25,7 +25,7 @@
          <span class="qr_code_text">扫一扫上面的二维码，获取企业执法信息</span>
      </div>
      <van-action-bar>
-        <van-action-bar-button color="#be99ff" text="下载二维码" @click="downloadFile(data.qrCodeUrl)" />
+        <van-action-bar-button color="#be99ff" text="下载二维码" @click="download(data.qrCodeUrl)" />
        <van-action-bar-button color="#be99ff" text="二维码管理" />
      </van-action-bar>
 		</div>
@ -80,15 +80,16 @@ const downloadFile = (url) => {
      document.body.removeChild(a) // 下载完成移除元素
 }
 const download = (url) =>{
-     let e = this.$refs.toast;
-     html2canvas(e, {
+    //  let e = this.$refs.toast;
+    debugger
+     html2canvas(document.getElementById('download-images'), {
         allowTaint: true,
         useCORS: true, // 设置跨域
         tainttest: true, // 检测每张图片都已经加载完成
         backgroundColor: null, // 背景色, 转换图片可能会有白色底色，不要的话就null
     }).then((canvas) => {
         const link = document.createElement("a"); // 创建一个超链接对象实例
-         link.download = "download.png"; // 设置要下载的图片的名称
+         link.download = "http://139.186.135.156:85/profile//2024/03/27/d2f57b93fd86d266c462a315349c13f8.jpg"; // 设置要下载的图片的名称
         link.href = canvas.toDataURL(); // 将图片的URL设置到超链接的href中
         link.click(); // 触发超链接的点击事件
     });
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@ -47,12 +47,12 @@
 		<!-- 中间 -->
 		<div class="shop-center">
 			<lodding-card :isLodding="isLodding">
-				<refresh-list v-model:freshMap="freshMap" :classMap="classMap" @refresh="onRefresh" @onLoad="onLoad"
+				<refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
 						:resetScroll="resetScroll" class="refresh_box">
 					<div class="refresh_content" v-if="data?.dataList.length">
 						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
 							<van-swipe-cell class="swipe_cell">
-								<div class="card_box">
+								<div class="card_box" onclick="toDetailView(item.id)">
                  <div class="card_box_span">
                    <p>执法时间：{{ item.createTime }} <span class="card_box_action">
                      <van-button @click="toComplaintView(item.id,item.lawEnforcementItem)" type="primary" size="mini">投诉</van-button>
@ -68,7 +68,10 @@
                    <p><span class="card_box_label">执法部门：</span> {{ item.lawEnforcement }}</p>
                  </div>
                  <div class="card_box_span">
-                    <p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }}</p>
+                    <p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }}，{{ item.lawEnforcerTwo }}</p>
+                  </div>
+                  <div class="card_box_span">
+                    <p><span class="card_box_label">企业名称：</span> {{ item.enterpriseName }}</p>
                  </div>
                  <div class="card_box_span">
                    <p><span class="card_box_label">备注：</span> {{ item.remark }}</p>
@ -163,6 +166,11 @@ const onClickButton = () =>{
  queryList();
 }

+/**
+ * 企业投诉页面
+ * @param {*} id 
+ * @param {*} name 
+ */
 const toComplaintView = (id,name) =>{
  console.log(id,name)
  router.push(
@ -175,6 +183,21 @@ const toComplaintView = (id,name) =>{
            }
      });
 }
+/**
+ * 查看执法登记详情
+ * @param {} id 
+ * @param {*} name 
+ */
+const toDetailView = (id) =>{
+  console.log(id)
+  router.push(
+        { 
+          path: "/registrationDetail",
+          query: {
+              id: id,
+            }
+      });
+}
 onActivated(() => {
 });