Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.5

src/components/TopBar.vue

@@ -110,19 +110,15 @@ export default {
       }
     },
     clickOutLogin() {
-      
-      // window.location.reload()
-      
       logout().then(res => {
-        sessionStorage.clear()
-        this.$router.replace('/login')
-        this.$toast('退出登录')
+        sessionStorage.clear();
+        this.$router.replace('/login');
+        this.$toast('退出登录');
       })
     },
     clickHandler(item) {
-      console.log(item,'1111111')
-      this.info = item.alarmContent
-      this.show = true
+      this.info = item.alarmContent;
+      this.show = true;
     },
   }
 }

src/views/menu/resumption/detail.vue

@@ -158,6 +158,7 @@
                     inactive-color="#4fc08d"
                     active-color="#ee0a24"
                     size="18"
+                    @change="validateArea(item.areaId)"
                   />
                   <span v-else>
                     <van-tag v-if="point.resValue === 1" type="warning">异常</van-tag>
@@ -190,6 +191,7 @@
                   label="情况描述"
                   type="textarea"
                   :placeholder="enable ? '请输入情况描述' : ''"
+                  @input="validateArea(item.areaId)"
                 />
                 <van-field
                   :readonly="!enable"
@@ -226,6 +228,7 @@
                   name="rectificationDeadline"
                   v-model="point.rectificationDeadline"
                   :data-list="dayList"
+                  @change="validateArea(item.areaId)"
                 />
               </van-cell-group>
             </div>
@@ -504,12 +507,9 @@ export default {
         });
         this.areasMap = obj;
         this.activeArea(this.areas[0], 0)
-
-        /*if (!this.enable) {
-          this.openCollapseItems()
-        }*/
         this.openCollapseItems()
         this.updateNFC(0);
+        this.validateAreaAll();
       })
     },
     openCollapseItems() {
@@ -534,6 +534,12 @@ export default {
       })
       this.openCollapseItems()
     },
+    validateAreaAll() {
+
+      this.areas.forEach((item, index) => {
+        this.validateArea(item.areaId)
+      })
+    },
     changeCurrentSwitch(areaId) {
       this.resumptionData.yesPointNums = this.resumptionData.yesPointNums + 1
       this.resumptionData.noPointNums = this.resumptionData.noPointNums - 1
@@ -553,7 +559,13 @@ export default {
           if (item.areaId === areaId) {
             total++
             if (point.dataStatus === 2) {
-              yes++
+              if(point.resValue === 1){
+                if(point.resRemark !== null && point.resRemark !== "" && point.rectificationDeadline !== null){
+                  yes++;
+                }
+              }else{
+                yes++
+              }
             }
           }
         });
@@ -599,6 +611,11 @@ export default {
           nfcs.push(pro)
         }
         this.$refs.NfcPopup.show(nfcs)
+      }else{
+        this.$toast.fail({
+          message: '该区域没有需要扫描的NFC！',
+          position: 'top'
+        })
       }
     },
     cancelImg(imgItem) {
@@ -727,12 +744,7 @@ export default {
       data.subType = 1
 
       saveTask(data).then(res => {
-        this.$toast('保存成功')
-        this.$router.replace({
-          path: '/resumption',
-          name: 'resumption',
-          params:{event:'refresh'}
-        });
+        this.$toast('保存成功');
       })
     },
     submitResumptionData() {
@@ -837,12 +849,13 @@ export default {
         data.subType = 2
 
         saveTask(data).then(res => {
-          this.$toast('提交成功')
-          this.$router.replace({
+          this.$toast('提交成功');
+          /*this.$router.replace({
             path: '/resumption',
             name: 'resumption',
             params:{event:'refresh'}
-          });
+          });*/
+          this.$router.go(-1);
         })
       }catch(e){
         this.nfcs = bakNfcs;

src/views/menu/safetyBook/api.js

@@ -1,9 +1,8 @@
 import request from "@/utils/request";
-import day from 'dayjs'
 //获取列表
 export function dataList(data) {
   return request({
-    url: "/core/safetyBook/list",
+    url: "/core/safetyBooknew/list",
     method: "post",
     data,
   });
@@ -11,7 +10,7 @@ export function dataList(data) {
 //获取详情
 export function detail(id){
   return request({
-    url: "/core/safetyBook/"+id,
+    url: "/core/safetyBooknew/"+id,
     method: "get",
   });
 }

src/views/menu/safetyBook/detail.vue

@@ -3,22 +3,22 @@
     <nav-bar></nav-bar>
     <div class="page-container">
       <van-cell-group>
-        <van-cell class="item-cell" title="签署责任书类型" :value="getDictLabel(dataInfo.type,'safety_book_type')" >
-        </van-cell>
-        <van-cell class="item-cell" title="签署人所在机构" :value="dataInfo.orgName" >
-        </van-cell>
-        <van-cell class="item-cell" title="所属年度" :value="`${dataInfo.year}年`" >
-        </van-cell>
-        <van-cell class="item-cell" title="添加时间" :value="dayjs(dataInfo.createTime).format('YYYY-MM-DD HH:mm')">
-        </van-cell>
+        <van-cell class="item-cell" title="签署层级" :value="getDictLabel(dataInfo.signLevel,'sign_level')" ></van-cell>
+        <van-cell class="item-cell" title="签署责任书类型" :value="getDictLabel(dataInfo.type,'safety_book_type')" ></van-cell>
+        <van-cell class="item-cell" title="所属年度" :value="`${dataInfo.year}年`" ></van-cell>
+        <van-cell class="item-cell" title="甲方姓名" :value="dataInfo.partyA" ></van-cell>
+        <van-cell class="item-cell" title="甲方机构" :value="dataInfo.partyAOrgName"></van-cell>
+        <van-cell class="item-cell" title="乙方姓名" :value="dataInfo.partyB" ></van-cell>
+        <van-cell class="item-cell" title="乙方机构" :value="dataInfo.partyBOrgName" ></van-cell>
+        <van-cell class="item-cell" title="签署时间" :value="dayjs(dataInfo.time).format('YYYY-MM-DD HH:mm')"></van-cell>
+<!--        <van-cell class="item-cell" title="添加时间" :value="dayjs(dataInfo.createTime).format('YYYY-MM-DD HH:mm')"></van-cell>-->
       </van-cell-group>
       <div class="book-list">
-        <div class="card" v-for="(v,i) in bookList" :key="v.id">
-          <van-cell  title="签署时间" :value="dayjs(v.time).format('YYYY-MM-DD')"></van-cell>
-          <van-cell v-if="v.files && v.files.length > 0"  title="签署文件" >
+        <div class="card">
+          <van-cell v-if="dataInfo.files && dataInfo.files.length > 0"  title="签署文件" >
             <template #label>
               <div class="file-list">
-                <div class="file-item" v-for="(file,index) in v.files" :key="index">
+                <div class="file-item" v-for="(file,index) in dataInfo.files" :key="index">
                   <van-icon color="#1989fa" name="guide-o" />
                   <span style="color: #1989fa;" @click="preview(file)"  :key="file.name">{{file.name}}</span>
                 </div>
@@ -41,7 +41,7 @@ export default {
       activeNames: [],
       dataInfo: {},
       bookList:[],
-      dicts:['safety_book_type']
+      dicts:['safety_book_type','sign_level']
     }
   },
   components: { NavBar },
@@ -72,7 +72,7 @@ export default {
 
 }
 .book-list{
-  height: calc(100vh - 446px);
+  height: calc(100vh - 846px);
   overflow: auto;
   padding: 20px;
 }

src/views/menu/safetyBook/index.vue

@@ -15,9 +15,9 @@
           <card class="list-item" v-else v-for="(v,i) in dataList" :key="i">
             <p class="item-title">{{getDictLabel(v.type,'safety_book_type')}}</p>
             <div :title="v.orgName" @click="clickItem(v)">
-              <van-cell class="item-cell" title="签署机构" :value="v.orgName" >
+              <van-cell class="item-cell" title="签署机构" :value="v.partyAOrgName" >
               </van-cell>
-              <van-cell class="item-cell" title="所属年度" :value="`${v.year} 年`" >
+              <van-cell class="item-cell" title="所属年份" :value="`${v.year} 年`" >
               </van-cell>
               <van-cell class="item-cell" title="添加时间" :value="dayjs(v.createTime).format('YYYY-MM-DD HH:mm')">
               </van-cell>
@@ -65,7 +65,6 @@ export default {
   },
   mounted(){
     this.query.orgId = this.orgId;
-    this.getDataList();
   },
   methods:{
     dayjs,

src/views/menu/securityCheckRegister/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="active" class="register-edit">
-    <nav-bar :go="go"></nav-bar>
+    <nav-bar></nav-bar>
     <div class="page-container">
       <!--   基本信息   -->
       <div class="card" v-if="taskInfo">

src/views/menu/visitCheck/index.vue

@@ -130,7 +130,7 @@ export default {
           return '#bc9f71';
         case '同意':
           return '#009240';
-        case '未审批':
+        case '已失效':
           return '#D7000F';
       }
     },

src/views/menu/visitRecord/add.vue

@@ -105,7 +105,7 @@
         </div>
       </div>
       <div v-else class="lists">
-        <empty description="无数据" />
+        <empty description="" />
       </div>
     </van-popup>
   </div>
@@ -464,6 +464,7 @@ export default {
   .active{
     color:#1989fa;
     border-left: 5px solid #1989fa;
+
   }
 }
 </style>

src/views/menu/visitRegister/index.vue

@@ -133,7 +133,7 @@ export default {
           return '#bc9f71';
         case '同意':
           return '#009240';
-        case '未审批':
+        case '已失效':
           return '#D7000F';
       }
     },

vue.config.js

@@ -68,7 +68,7 @@ module.exports = defineConfig({
           }
       },
       '/jingyuanchao': {
-          target: "http://10.87.23.57:8080",
+          target: "http://10.87.11.173:8080",
           // ws:true,
           changOrigin:true,
           pathRewrite:{
@@ -116,9 +116,8 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://47.92.229.224:8080",
-        // target: "http://10.87.23.50:8080",
-        // target: "http://10.87.21.103:8080",
+        //target: "http://47.92.229.224:8080",
+        target: "http://10.87.21.103:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{
@@ -194,6 +193,15 @@ module.exports = defineConfig({
     //   }
     //   return args
     //  })
+    /**
+     * 设置打包时清理console
+     */
+    config.optimization.
+    minimizer('terser')
+      .tap((args) => {
+      args[0].terserOptions.compress.drop_console = true
+      return args
+    })
 
     /**
      * 设置保留空格