gx

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "axios": "^0.24.0",
     "core-js": "^3.6.4",
+    "crypto-js": "^4.1.1",
     "docxtemplater": "^3.31.3",
     "echarts": "^4.8.0",
     "element-ui": "^2.15.6",
@@ -17,6 +18,7 @@
     "js-md5": "^0.7.3",
     "jszip-utils": "^0.1.0",
     "pizzip": "^3.1.1",
+    "qrcode": "^1.5.1",
     "vue": "^2.6.11",
     "vue-count-to": "^1.0.13",
     "vue-fragment": "^1.5.2",

public/index.html

@@ -8,6 +8,8 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title>镇江管理后台</title>
+  <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=HJEBZ-U5BLP-SRWDB-LBKOS-PCIQH-F4FLG"></script>
+  <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 </head>
 <style>
   body {

src/api/antigen.js

+import {
+    api,
+    formatParams
+} from "@/utils/axios";
+
+// 获取市区列表
+export function queryCity(params) {
+    return api(Object.assign(formatParams('GET', params), {
+        url: `/admin-api/antigen/queryCity`
+    }))
+}
+
+// 获取抗原申报列表
+export function antigenList(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/antigen/list`
+    }))
+}
+
+// 获取详情
+export function queryDetail(params) {
+    return api(Object.assign(formatParams('GET', params), {
+        url: `/admin-api/antigen/queryDetail`
+    }))
+}
\ No newline at end of file

src/api/deedtax.js

-import { api, formatParams } from '@/utils/axios'
-import { api1, formatParams1, config } from '@/utils/request'
+import { api, formatParams, baseUrl } from '@/utils/axios'
+// import { api1, formatParams1, config } from '@/utils/request'
 import axios from 'axios'
+import { getToken } from "@/utils/auth";
+
 
 /**
  * 初审部门列表列表
@@ -36,8 +38,8 @@ export function queryListDeedTax(params) {
  * 契税补贴查询操作记录
  */
  export function queryDeedTaxRecord(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/queryDeedTaxRecord`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/queryDeedTaxRecord`
     }))
 }
 
@@ -45,8 +47,8 @@ export function queryListDeedTax(params) {
  * 契税补贴初审部门审核
  */
  export function updateInitDepartmentState(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/updateInitDepartmentState`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/updateInitDepartmentState`
     }))
 }
 
@@ -54,8 +56,8 @@ export function queryListDeedTax(params) {
  * 契税补贴主审部门审核
  */
  export function updateDeedTaxState(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/updateDeedTaxState`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/updateDeedTaxState`
     }))
 }
 
@@ -63,8 +65,8 @@ export function queryListDeedTax(params) {
  * 契税补贴初审部门撤回
  */
  export function initDepartmentRevocation(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/initDepartmentRevocation`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/initDepartmentRevocation`
     }))
 }
 
@@ -72,8 +74,8 @@ export function queryListDeedTax(params) {
  * 契税补贴主审部门撤回
  */
  export function mainRevocation(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/mainRevocation`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/mainRevocation`
     }))
 }
 
@@ -81,8 +83,8 @@ export function queryListDeedTax(params) {
  * 保存申请模板
  */
  export function saveFileUrl(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/saveFileUrl`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/saveFileUrl`
     }))
 }
 
@@ -90,8 +92,8 @@ export function queryListDeedTax(params) {
  * 修改申请单审核辖市区
  */
  export function updateCheckArea(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}deedTax/updateCheckArea`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/deedTax/updateCheckArea`
     }))
 }
 
@@ -102,8 +104,11 @@ export function queryListDeedTax(params) {
     return axios({
         method: 'post',
         data: params,
-        url: `${config.proxy}deedTax/userExport`,
-        responseType: 'blob'
+        url: `${baseUrl}/admin-api/deedTax/userExport`,
+        responseType: 'blob',
+        headers: {
+            "Authorization": getToken() ? ( 'Bearer ' + getToken()) : "",
+        }
     })
 }
 

src/api/nucleicAcid.js

+import {
+    api,
+    formatParams,
+    baseUrl
+} from "@/utils/axios";
+import axios from 'axios'
+import { getToken } from "@/utils/auth";
+
+// 核酸采样码
+// 获取列表
+export function getListCommunityDeclarationUser(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcid/getListCommunityDeclarationUser`
+    }))
+}
+
+// 获取详情
+export function getDetailInfo(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcid/getDetailInfo`
+    }))
+}
+
+// 新增社区代报采样码
+export function addCommunityDeclarationUser(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcid/addCommunityDeclarationUser`
+    }))
+}
+
+// 修改社区代报采样码
+export function updateCommunityDeclarationUser(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcid/updateCommunityDeclarationUser`
+    }))
+}
+
+
+// 核酸采样结果
+// 获取列表
+export function getList(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcidResult/getList`
+    }))
+}
+
+// 导入excel
+ export function exportAdd(params) {
+    return axios({
+        method: 'post',
+        data: params,
+        url: `${baseUrl}/admin-api/nucleicAcidResult/exportAdd`,
+        responseType: 'blob',
+        headers: {
+            "Authorization": getToken() ? ( 'Bearer ' + getToken()) : "",
+        }
+    })
+}
+
+// 获取详情
+export function getResultDetail(params) {
+    return api(Object.assign(formatParams('GET', params), {
+        url: `/admin-api/nucleicAcidResult/getResultDetail`
+    }))
+}
+
+// 新增
+export function customAdd(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcidResult/customAdd`
+    }))
+}
+
+// 修改
+export function update(params) {
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/nucleicAcidResult/update`
+    }))
+}
\ No newline at end of file

src/api/policy.js

@@ -123,8 +123,8 @@ export function mattersGuideDelete(params) {
  * @returns 
  */
 export function mattersHousingReviewerUpdate(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}talent/mattersHousingReviewerUpdate`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/housing/mattersHousingReviewerUpdate`
     }))
 }
 
@@ -134,8 +134,8 @@ export function mattersHousingReviewerUpdate(params) {
  * @returns 
  */
 export function mattersHousingUpdate(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}talent/mattersHousingUpdate`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/housing/mattersHousingUpdate`
     }))
 }
 
@@ -165,8 +165,8 @@ export function mattersHousingGet(params) {
  * @returns 
  */
 export function mattersHousingReason(params) {
-    return api1(Object.assign(formatParams1('POST', params), {
-        url: `${config.proxy}talent/mattersHousingReason`
+    return api(Object.assign(formatParams('POST', params), {
+        url: `/admin-api/housing/mattersHousingReason`
     }))
 }
 

src/config/index.js

@@ -3,5 +3,22 @@ const domain = {
   // dev: "http://81.69.231.72:8881", // 测试接口
   dev: "https://exam.smart-zj.cn:9100/smartExam/", // 新正式接口
 };
+// 腾讯地图 key
+const map = {
+  dev: {
+    key: 'HJEBZ-U5BLP-SRWDB-LBKOS-PCIQH-F4FLG',
+    appName: '测试'
+  },
+  // 配置之后没有权限 暂时使用测试key
+  // dev: {
+  //   appName: '智慧镇江',
+  //   key: 'THOBZ-J7ILW-AWERU-O3K2T-HLROF-XZFDC'
+  // }
+}
 
+
+// 核酸地图
+// export const appointmentUrl = 'https://exam.smart-zj.cn:9100'
+export const appointmentUrl = ''
+export const mapKey = map.dev
 export const baseUrl = domain.dev;

src/router/index.js

@@ -169,6 +169,27 @@ const routes = [{
                 meta: ['通行码管理'],
                 component: () => import('@/views/Epidemic/index.vue')
             },
+            // 采样码管理
+            {
+                path: '/nucleicAcid',
+                name: 'nucleicAcid',
+                meta: ['采样码管理'],
+                component: () => import('@/views/NucleicAcid/index.vue')
+            },
+            // 抗原管理
+            {
+                path: '/antigen',
+                name: 'antigen',
+                meta: ['抗原管理'],
+                component: () => import('@/views/Antigen/index.vue')
+            },
+            // 核酸采样结果
+            {
+                path: '/nucleicAcidResult',
+                name: 'nucleicAcidResult',
+                meta: ['核酸采样结果'],
+                component: () => import('@/views/NucleicAcid/result.vue')
+            },
         ]
 
     },

src/utils/axios.js

@@ -9,6 +9,8 @@ const api = axios.create({
 // 请求拦截
 api.interceptors.request.use(
   (config) => {
+    let appId = /*getToken()*/ "1234";
+    if (config.data) config.data.appId = appId;
     return config;
   },
   (error) => ({ status: 0, msg: error.message })

src/utils/index.js

 // import { uploadImg, uploadVideo, uploadFile } from '@/api/upload'
+import CryptoJS from "crypto-js";
+
 /**
  * @param {Function} func
  * @param {number} wait
@@ -216,3 +218,26 @@ export function setCertNo(certNo) {
     return '-';
   }
 }
+// 解密
+export function decryptByDES(ciphertext, key) {
+  const keyHex = CryptoJS.enc.Utf8.parse(key);
+  const decrypted = CryptoJS.DES.decrypt({
+      ciphertext: CryptoJS.enc.Base64.parse(ciphertext),
+    },
+    keyHex, {
+      mode: CryptoJS.mode.ECB,
+      padding: CryptoJS.pad.Pkcs7,
+    }
+  );
+  return decrypted.toString(CryptoJS.enc.Utf8);
+}
+// 加密
+export function encryptByDES(message, key) {
+  const keyHex = CryptoJS.enc.Utf8.parse(key); // 秘钥
+  let newMessage = "" + message;
+  const encrypted = CryptoJS.DES.encrypt(newMessage, keyHex, {
+    mode: CryptoJS.mode.ECB, // 加密模式
+    padding: CryptoJS.pad.Pkcs7,
+  });
+  return encrypted.toString(); //  加密出来为 hex格式密文
+}
\ No newline at end of file

src/utils/tengxun.js

+import axios from 'axios'
+import { mapKey,appointmentUrl } from '@/config/index'
+
+/**
+ * 逆地址解析
+ * @param { point: 'lat<纬度>,lng<经度>' } data
+ * @returns
+ */
+export const getGeocoder = (point) => {
+  const params = {
+    location: point || '32.188478,119.425722',
+    get_poi: '1',
+    key: mapKey.key
+  }
+  return axios.get(appointmentUrl + '/baiduapi/ws/geocoder/v1/', {
+    params: {
+      ...params
+    }
+  })
+}
+
+/**
+ * 根据城市/区域搜索
+ * @param { string } str
+ * @returns
+ */
+export const searchArea = (str) => {
+  const params = {
+    keyword: str,
+    page_size: 20,
+    key: mapKey.key,
+    boundary: 'region(镇江,0)'
+  }
+  return axios.get(appointmentUrl + '/baiduapi/ws/place/v1/search', {
+    params: params
+  })
+}
+
+/**
+ * 百度坐标转换成经纬度
+ * @param { string } str
+ * @returns
+ */
+export const zhuanhuan = (str) => {
+  const params = {
+    locations: str,
+    type: 3,
+    key: mapKey.key
+  }
+  return axios.get(appointmentUrl + '/baiduapi/ws/coord/v1/translate', { params })
+}
+
+/**
+ * 高德gpi转换
+ * @param {`lng,lat`} str  坐标点,经度和纬度用“,”分割，经度在前，纬度在后
+ * @returns
+ */
+export const gaoDeZhuanHuan = (str) => {
+  const params = {
+    locations: str,
+    coordsys: 'baidu'
+  }
+  return axios.get(appointmentUrl + '/gaodeapi/v3/assistant/coordinate/convert', {
+    params
+  })
+}

src/views/Components/Map/TengXunMap.vue

+<template>
+  <div :id="id" class="tengxun-map"></div>
+</template>
+
+<script>
+import qq from 'qq'
+let num = 88
+
+export default {
+  name: 'TengXunMap',
+  props: {
+    point: {
+      type: Object,
+      default () {
+        return {
+          lng: 119.425722,
+          lat: 32.188478
+        }
+      }
+    },
+    zoom: {
+      type: Number,
+      default: 15
+    }
+  },
+  watch: {
+    point: {
+      deep: true,
+      handler () {
+        // 创建地图实例
+        if (this.map) {
+          const point = new qq.maps.LatLng(this.point.lat, this.point.lng)
+          this.map.setCenter(point)
+          if (this.marker) {
+            this.marker.setPosition(point)
+          } else {
+            this.marker = new qq.maps.Marker({ visible: true, map: this.map, position: point })
+          }
+        }
+      }
+    }
+  },
+  data: () => {
+    return {
+      id: 'baiduMap' + num,
+      map: null,
+      marker: null
+    }
+  },
+  mounted () {
+    const _that = this
+    const center = new qq.maps.LatLng(this.point.lat, this.point.lng)
+    this.map = new qq.maps.Map(this.$el, {
+      center: center,
+      zoom: this.zoom || 15,
+      mapTypeControl: false
+    })
+    qq.maps.event.addListener(this.map, 'click', function (evt) {
+      var lat = evt.latLng.getLat().toFixed(6)
+      var lng = evt.latLng.getLng().toFixed(6)
+      // 设置中心
+      _that.map.setCenter(evt.latLng)
+      _that.$emit('click', { lat, lng, poi: evt.poi, latLng: evt.LatLng })
+    })
+    this.$emit('mapMounted', this.map)
+  },
+  beforeCreate () {
+    ++num
+  }
+  // destroyed () {
+  //   if (this.map) {
+  //     this.map.destroy()
+  //   }
+  // }
+}
+</script>
+<style scoped>
+.tengxun-map {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file

src/views/Deedtax/house.vue

@@ -85,8 +85,8 @@
                 </el-table>
                 <div class="cell">
                     <p class="label">是否享受过相关政策</p>
-                    <p :class="['value', viewDetail.enjoyFlag == true ? 'value1' : 'value2']">{{ viewDetail.enjoyFlag ?
-                    '是' : '否'
+                    <p :class="['value', viewDetail.enjoyFlag == true ? 'value2' : 'value1']">{{ viewDetail.enjoyFlag ?
+                    '否' : '是'
                     }}</p>
                 </div>
                 <!-- 新增功能end -->

src/views/Deedtax/index.vue

@@ -99,9 +99,9 @@
           <p class="label">是否享受过相关政策</p>
           <p :class="[
             'value',
-            viewDetail.enjoyFlag == true ? 'value1' : 'value2',
+            viewDetail.enjoyFlag == true ? 'value2' : 'value1',
           ]">
-            {{ viewDetail.enjoyFlag ? "是" : "否" }}
+            {{ viewDetail.enjoyFlag ? "否" : "是" }}
           </p>
         </div>
         <!-- 新增功能end -->

src/views/Policy/house.vue

@@ -69,7 +69,7 @@
         </el-table>
         <div class="cell">
           <p class="label">是否享受过相关政策</p>
-          <p :class="['value', viewDetail.enjoyFlag == true ? 'value1' : 'value2']">{{ viewDetail.enjoyFlag ? '是' : '否'
+          <p :class="['value', viewDetail.enjoyFlag == true ? 'value2' : 'value1']">{{ viewDetail.enjoyFlag ? '否' : '是'
           }}</p>
         </div>
         <div class="cell">
@@ -141,6 +141,15 @@
           <p class="label">所属银行</p>
           <p class="value">{{ viewDetail.bank }}</p>
         </div>
+        <div class="cell" v-if="viewDetail.bankPicture && viewDetail.bankPicture.length > 0">
+          <p class="label">银行卡照片</p>
+          <p class="value">
+            <el-image v-for="(item, index) in viewDetail.bankPicture" :key="index"
+              style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
+              :preview-src-list="[item.picture]">
+            </el-image>
+          </p>
+        </div>
         <div class="cell">
           <p class="label">身份证照片</p>
           <p class="value">
@@ -456,13 +465,18 @@ export default {
         this.viewDetail.idCardPicture = res.data.pictureList.find(item => {
           return item.pictureType === 1;
         }).picture;
-
+        this.viewDetail.bankPicture = res.data.pictureList.filter((item) => {
+          return (
+            item.pictureType === 8
+          );
+        });
         this.viewDetail.contract = res.data.pictureList.filter(item => {
           return (
             item.pictureType !== 1 &&
             item.pictureType !== 5 &&
             item.pictureType !== 6 &&
-            item.pictureType !== 7
+            item.pictureType !== 7 &&
+            item.pictureType !== 8
           );
         });
         this.viewDetail.certificate = res.data.pictureList.find(item => {
@@ -516,6 +530,8 @@ export default {
             if (res.success) {
               this.$message.success(`发放成功`);
               this.init();
+            } else {
+              this.$message.error(res.msg || '审核失败');
             }
           });
         })

src/views/Policy/housemain.vue

@@ -43,7 +43,7 @@
             </template>
             <template v-if="scope.row.state === 2">
               <el-button type="success" size="mini" round @click="passFinal(scope.row)">终审通过</el-button>
-              <el-button type="danger" size="mini" round @click="deny(scope.row)" m>终审拒绝</el-button>
+              <el-button type="danger" size="mini" round @click="deny(scope.row)">终审拒绝</el-button>
             </template>
           </template>
         </el-table-column>
@@ -61,7 +61,7 @@
         </el-table>
         <div class="cell">
           <p class="label">是否享受过相关政策</p>
-          <p :class="['value', viewDetail.enjoyFlag == true ? 'value1' : 'value2']">{{ viewDetail.enjoyFlag ? '是' : '否'
+          <p :class="['value', viewDetail.enjoyFlag == true ? 'value2' : 'value1']">{{ viewDetail.enjoyFlag ? '否' : '是'
           }}</p>
         </div>
         <div class="cell">
@@ -137,6 +137,15 @@
           <p class="label">所属银行</p>
           <p class="value">{{ viewDetail.bank }}</p>
         </div>
+        <div class="cell" v-if="viewDetail.bankPicture && viewDetail.bankPicture.length > 0">
+          <p class="label">银行卡照片</p>
+          <p class="value">
+            <el-image v-for="(item, index) in viewDetail.bankPicture" :key="index"
+              style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
+              :preview-src-list="[item.picture]">
+            </el-image>
+          </p>
+        </div>
         <div class="cell">
           <p class="label">身份证照片</p>
           <p class="value">
@@ -170,6 +179,15 @@
             </el-image>
           </p>
         </div>
+        <div class="cell" v-if="viewDetail.labour.length > 0">
+          <p class="label">上传一年以上劳动合同的项目</p>
+          <p class="value">
+            <el-image v-for="(item, index) in viewDetail.labour" :key="index"
+              style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
+              :preview-src-list="[item.picture]">
+            </el-image>
+          </p>
+        </div>
       </div>
     </el-dialog>
     <el-dialog title="操作记录" :visible.sync="recordShow" width="800px" :close-on-press-escape="false">
@@ -361,7 +379,9 @@ export default {
         currentPage: 1,
       },
       viewShow: false,
-      viewDetail: {},
+      viewDetail: {
+        labour: []
+      },
       recordShow: false,
       recordList: [],
       examineList: [],
@@ -473,11 +493,18 @@ export default {
         this.viewDetail.idCardPicture = res.data.pictureList.find((item) => {
           return item.pictureType === 1;
         }).picture;
+        this.viewDetail.bankPicture = res.data.pictureList.filter((item) => {
+          return (
+            item.pictureType === 8
+          );
+        });
         this.viewDetail.contract = res.data.pictureList.filter((item) => {
           return (
             item.pictureType !== 1 &&
             item.pictureType !== 5 &&
-            item.pictureType !== 6
+            item.pictureType !== 6 &&
+            item.pictureType !== 7 &&
+            item.pictureType !== 8
           );
         });
         this.viewDetail.certificate = res.data.pictureList.find((item) => {
@@ -486,6 +513,12 @@ export default {
         this.viewDetail.voucher = res.data.pictureList.find((item) => {
           return item.pictureType === 6;
         }).picture;
+        this.viewDetail.labour = [];
+        res.data.pictureList.map(item => {
+          if (item.pictureType == 7) {
+            return this.viewDetail.labour.push(item);
+          }
+        });
         this.viewShow = true;
       });
     },
@@ -678,6 +711,8 @@ export default {
             if (res.success) {
               that.$message.success(`复审通过`);
               that.init();
+            } else {
+              this.$message.error(res.msg || '审核失败');
             }
           });
         });
@@ -710,6 +745,8 @@ export default {
             if (res.success) {
               this.$message.success(`资料终审通过`);
               this.init();
+            } else {
+              this.$message.error(res.msg || '审核失败');
             }
           });
         })

src/views/Policy/talentwindow.vue

@@ -136,7 +136,7 @@
         </el-table>
         <div class="cell">
           <p class="label">是否享受过相关政策</p>
-          <p :class="['value', viewDetail.enjoyFlag == true ? 'value1' : 'value2']">{{ viewDetail.enjoyFlag ? '是' : '否'
+          <p :class="['value', viewDetail.enjoyFlag == true ? 'value2' : 'value1']">{{ viewDetail.enjoyFlag ? '否' : '是'
           }}</p>
         </div>
         <div class="cell">
@@ -208,6 +208,15 @@
           <p class="label">所属银行</p>
           <p class="value">{{ viewDetail.bank }}</p>
         </div>
+        <div class="cell" v-if="viewDetail.bankPicture && viewDetail.bankPicture.length > 0">
+          <p class="label">银行卡照片</p>
+          <p class="value">
+            <el-image v-for="(item, index) in viewDetail.bankPicture" :key="index"
+              style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
+              :preview-src-list="[item.picture]">
+            </el-image>
+          </p>
+        </div>
         <div class="cell">
           <p class="label">身份证照片</p>
           <p class="value">
@@ -258,6 +267,15 @@
             </el-image>
           </p>
         </div>
+        <div class="cell" v-if="viewDetail.labour.length > 0">
+          <p class="label">上传一年以上劳动合同的项目</p>
+          <p class="value">
+            <el-image v-for="(item, index) in viewDetail.labour" :key="index"
+              style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
+              :preview-src-list="[item.picture]">
+            </el-image>
+          </p>
+        </div>
       </div>
     </el-dialog>
     <el-dialog
@@ -449,7 +467,9 @@ export default {
         currentPage: 1
       },
       viewShow: false,
-      viewDetail: {},
+      viewDetail: {
+        labour: []
+      },
       recordShow: false,
       recordList: [],
       totalList: [],
@@ -548,11 +568,18 @@ export default {
         this.viewDetail.idCardPicture = res.data.pictureList.find(item => {
           return item.pictureType === 1;
         }).picture;
+        this.viewDetail.bankPicture = res.data.pictureList.filter((item) => {
+          return (
+            item.pictureType === 8
+          );
+        });
         this.viewDetail.contract = res.data.pictureList.filter(item => {
           return (
             item.pictureType !== 1 &&
             item.pictureType !== 5 &&
-            item.pictureType !== 6
+            item.pictureType !== 6 &&
+            item.pictureType !== 7 &&
+            item.pictureType !== 8
           );
         });
         this.viewDetail.certificate = res.data.pictureList.find(item => {
@@ -561,6 +588,12 @@ export default {
         this.viewDetail.voucher = res.data.pictureList.find(item => {
           return item.pictureType === 6;
         }).picture;
+        this.viewDetail.labour = [];
+        res.data.pictureList.map(item => {
+          if (item.pictureType == 7) {
+            return this.viewDetail.labour.push(item);
+          }
+        });
         this.viewShow = true;
       });
     },
@@ -645,6 +678,8 @@ export default {
               //     this.$message.error(res.msg || '推送失败');
               //   }
               // })
+            } else {
+              this.$message.error(res.msg || '资料审核失败');
             }
           });
         })

vue.config.js

 const env = process.env.NODE_ENV === 'production'
-const publicPath = env ? '/manage-h5/' : '/';
-// const publicPath = env ? '/smartExam-h5/' : '/';
+const publicPath = env ? '/manage-h5/' : '/'; //正式
+// const publicPath = env ? '/smartExam-h5/' : '/'; //测试
 
 module.exports = {
   publicPath,

yarn.lock

@@ -2879,6 +2879,11 @@
     "randombytes" "^2.0.0"
     "randomfill" "^1.0.3"
 
+"crypto-js@^4.1.1":
+  "integrity" "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+  "resolved" "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz"
+  "version" "4.1.1"
+
 "css-color-names@^0.0.4", "css-color-names@0.0.4":
   "integrity" "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q=="
   "resolved" "https://registry.npmmirror.com/css-color-names/-/css-color-names-0.0.4.tgz"
@@ -3239,6 +3244,11 @@
     "miller-rabin" "^4.0.0"
     "randombytes" "^2.0.0"
 
+"dijkstrajs@^1.0.1":
+  "integrity" "sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="
+  "resolved" "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz"
+  "version" "1.0.2"
+
 "dir-glob@^2.0.0", "dir-glob@^2.2.2":
   "integrity" "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="
   "resolved" "https://registry.npmmirror.com/dir-glob/-/dir-glob-2.2.2.tgz"
@@ -3455,6 +3465,11 @@
   "resolved" "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz"
   "version" "3.0.0"
 
+"encode-utf8@^1.0.3":
+  "integrity" "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+  "resolved" "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz"
+  "version" "1.0.3"
+
 "encodeurl@~1.0.2":
   "integrity" "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
   "resolved" "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz"
@@ -4020,7 +4035,7 @@
   dependencies:
     "locate-path" "^3.0.0"
 
-"find-up@^4.0.0":
+"find-up@^4.0.0", "find-up@^4.1.0":
   "integrity" "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="
   "resolved" "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz"
   "version" "4.1.0"
@@ -6417,6 +6432,11 @@
   dependencies:
     "find-up" "^4.0.0"
 
+"pngjs@^5.0.0":
+  "integrity" "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
+  "resolved" "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz"
+  "version" "5.0.0"
+
 "pnp-webpack-plugin@^1.6.4":
   "integrity" "sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="
   "resolved" "https://registry.npmmirror.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"
@@ -6902,6 +6922,16 @@
   "resolved" "https://registry.npmmirror.com/q/-/q-1.5.1.tgz"
   "version" "1.5.1"
 
+"qrcode@^1.5.1":
+  "integrity" "sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg=="
+  "resolved" "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.1.tgz"
+  "version" "1.5.1"
+  dependencies:
+    "dijkstrajs" "^1.0.1"
+    "encode-utf8" "^1.0.3"
+    "pngjs" "^5.0.0"
+    "yargs" "^15.3.1"
+
 "qs@~6.5.2":
   "integrity" "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
   "resolved" "https://registry.npmmirror.com/qs/-/qs-6.5.3.tgz"
@@ -8850,6 +8880,14 @@
     "camelcase" "^5.0.0"
     "decamelize" "^1.2.0"
 
+"yargs-parser@^18.1.2":
+  "integrity" "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="
+  "resolved" "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz"
+  "version" "18.1.3"
+  dependencies:
+    "camelcase" "^5.0.0"
+    "decamelize" "^1.2.0"
+
 "yargs-parser@^20.2.2":
   "integrity" "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
   "resolved" "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz"
@@ -8871,6 +8909,23 @@
     "y18n" "^4.0.0"
     "yargs-parser" "^13.1.2"
 
+"yargs@^15.3.1":
+  "integrity" "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="
+  "resolved" "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz"
+  "version" "15.4.1"
+  dependencies:
+    "cliui" "^6.0.0"
+    "decamelize" "^1.2.0"
+    "find-up" "^4.1.0"
+    "get-caller-file" "^2.0.1"
+    "require-directory" "^2.1.1"
+    "require-main-filename" "^2.0.0"
+    "set-blocking" "^2.0.0"
+    "string-width" "^4.2.0"
+    "which-module" "^2.0.0"
+    "y18n" "^4.0.0"
+    "yargs-parser" "^18.1.2"
+
 "yargs@^16.0.0":
   "integrity" "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="
   "resolved" "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz"