Merge remote-tracking branch 'origin/dev' into dev

package.json

@@ -13,6 +13,7 @@
     "@riophae/vue-treeselect": "0.4.0",
     "amfe-flexible": "^2.2.1",
     "axios": "^1.3.4",
+    "browser-fs-access": "^0.34.1",
     "core-js": "^3.23.3",
     "dayjs": "^1.11.9",
     "js-image-compressor": "^2.0.0",

src/components/nfcPopup/alone.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="nfc-popup">
+    <van-popup v-model="visible" get-container="nfc-popup" lock-scroll>
+      <div class="nfc-panel">
+        <div>
+          <p v-if="showBottomBox" class="top-text">将手机背部靠近NFC标签扫描</p>
+          <div class="image-box">
+            <img class="nfc-image" v-show="nfcImage" :src="nfcImage" alt="">
+          </div>
+          <div v-if="showBottomBox" class="bottom-box">
+            <div>
+              <img :src="require('../../assets/img/icon/NFC扫描-01.png')" />
+              <span>NFC</span>
+            </div>
+            <div>
+              <img :src="require('../../assets/img/icon/camera.png')" />
+              <span @click="nfcTakePhotos">拍照</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <input v-show="false" ref="upload" type='file' accept="image/*" @change="fileChange"/>
+      <!--    <uploader v-show="false" ref="imageUpload" v-model="nfcImage" multiple :maxCount="1" :deletable="false"/>-->
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import {baseImg} from "@/views/menu/LZRegister/api";
+import {upload} from "@/api/public";
+import ImageCompressor from "js-image-compressor";
+export default {
+  name: "index",
+  data(){
+    return {
+      //nfc弹窗
+      visible:false,
+      //nfc图片(base64)
+      nfcImage:null,
+      //是否显示底部按钮
+      showBottomBox:true,
+    }
+  },
+  watch:{
+    visible(val){
+      if(val){
+        this.nfcImage = null;
+        this.showBottomBox = true;
+      }
+    }
+  },
+  methods:{
+    //上传前
+    async fileChange(e){
+      let file = e.target.files[0];
+      let fileName = e.target.files[0].name;
+      let imgFile = await this.imageCompress(file);
+      console.log(imgFile,'imgFile')
+      let formData = new FormData();
+      formData.append('file',imgFile);
+      upload(formData,'image').then(res=>{
+        console.log(res,'resssss')
+        this.nfcImage = baseImg.base;
+        this.$emit('change',baseImg)
+        this.showBottomBox = false;
+      })
+
+    },
+    //压缩图片
+    imageCompress(file){
+      let imageCom = new Promise((resolve,reject)=>{
+        new ImageCompressor({
+          file,
+          quality: 0.6,
+          success: (result) => {
+            //this.$toast('图片压缩成功')
+            console.log(result,'图片压缩后')
+            let img = new File([result], result.name, {
+              width: result.width,
+              height: result.height,
+              type: result.type,
+            });
+            resolve(img);
+          },
+          error: (e) => {
+            console.log('imageError:'+e);
+            this.$toast('图片压缩失败')
+            reject(e);
+          },
+        });
+      });
+      return imageCom;
+    },
+    nfcTakePhotos(){
+      this.$refs.upload.click();
+    },
+  }
+}
+</script>
+<style lang="scss">
+#app{
+  .nfc-popup{
+    .van-popup--center{
+      border-radius: 20px;
+    }
+  }
+}
+</style>
+<style scoped lang="scss">
+.nfc-panel{
+  width: 400px;
+  background:url('../../assets/img/NFCphone.png') center no-repeat;
+  background-size: 50%;
+  >div{
+    padding: 30px;
+  }
+}
+.top-text{
+  text-align: center;
+  font-size: 26px;
+}
+.image-box{
+  width: 100%;
+  height: 350px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.nfc-image{
+  width: 300px;
+  height: 300px;
+}
+.bottom-box{
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  >div{
+    display: flex;
+    flex-direction: column;
+    &:active{
+      opacity: .5;
+    }
+    >img{
+      width: 70px;
+      height: 70px;
+    }
+    >span{
+      text-align: center;
+      font-size: 25px;
+    }
+  }
+}
+</style>

src/components/nfcPopup/more.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="nfc-popup">
+    <van-popup v-model="visible" get-container="nfc-popup" lock-scroll>
+      <div class="nfc-panel">
+        <div>
+          <p v-if="showBottomBox" class="top-text">将手机背部靠近NFC标签扫描</p>
+          <div class="image-box">
+            <img class="nfc-image" v-show="nfcImage" :src="nfcImage" alt="">
+          </div>
+          <div v-if="showBottomBox" class="bottom-box">
+            <div>
+              <img :src="require('../../assets/img/icon/NFC扫描-01.png')" />
+              <span>NFC</span>
+            </div>
+            <div>
+              <img :src="require('../../assets/img/icon/camera.png')" />
+              <span @click="nfcTakePhotos">拍照</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <input v-show="false" ref="upload" type='file' accept="image/*" @change="fileChange"/>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import {baseImg} from "@/views/menu/LZRegister/api";
+import {upload} from "@/api/public";
+import ImageCompressor from "js-image-compressor";
+export default {
+  name: "index",
+  data(){
+    return {
+      //nfc弹窗
+      visible:false,
+      //nfc图片(base64)
+      nfcImage:null,
+      //是否显示底部按钮
+      showBottomBox:true,
+    }
+  },
+  watch:{
+    visible(val){
+      if(val){
+        this.nfcImage = null;
+        this.showBottomBox = true;
+      }
+    }
+  },
+  methods:{
+    //上传前
+    async fileChange(e){
+      let file = e.target.files[0];
+      let fileName = e.target.files[0].name;
+      let imgFile = await this.imageCompress(file);
+      console.log(imgFile,'imgFile')
+      let formData = new FormData();
+      formData.append('file',imgFile);
+      upload(formData,'image').then(res=>{
+        console.log(res,'resssss')
+        this.nfcImage = baseImg.base;
+        this.$emit('change',baseImg)
+        this.showBottomBox = false;
+      })
+
+    },
+    //压缩图片
+    imageCompress(file){
+      let imageCom = new Promise((resolve,reject)=>{
+        new ImageCompressor({
+          file,
+          quality: 0.6,
+          success: (result) => {
+            //this.$toast('图片压缩成功')
+            console.log(result,'图片压缩后')
+            let img = new File([result], result.name, {
+              width: result.width,
+              height: result.height,
+              type: result.type,
+            });
+            resolve(img);
+          },
+          error: (e) => {
+            console.log('imageError:'+e);
+            this.$toast('图片压缩失败')
+            reject(e);
+          },
+        });
+      });
+      return imageCom;
+    },
+    //拍照
+    nfcTakePhotos(){
+      this.$refs.upload.click();
+    },
+  }
+}
+</script>
+<style lang="scss">
+#app{
+  .nfc-popup{
+    .van-popup--center{
+      border-radius: 20px;
+    }
+  }
+}
+</style>
+<style scoped lang="scss">
+.nfc-panel{
+  width: 400px;
+  background:url('../../assets/img/NFCphone.png') center no-repeat;
+  background-size: 50%;
+  >div{
+    padding: 30px;
+  }
+}
+.top-text{
+  text-align: center;
+  font-size: 26px;
+}
+.image-box{
+  width: 100%;
+  height: 350px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.nfc-image{
+  width: 300px;
+  height: 300px;
+}
+.bottom-box{
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  >div{
+    display: flex;
+    flex-direction: column;
+    &:active{
+      opacity: .5;
+    }
+    >img{
+      width: 70px;
+      height: 70px;
+    }
+    >span{
+      text-align: center;
+      font-size: 25px;
+    }
+  }
+}
+</style>

src/components/upload/index.vue

@@ -88,17 +88,12 @@ export default {
              });
         });
       },
-      chooseFiles(){
-        console.log( this.$refs.uploader,'子组件1111')
-        this.$refs.uploader.chooseFile({sourceType: ['album']})
-      },
       //上传到服务器
       afterRead(fileObj){
-
         console.log(fileObj,'flie');
         let formData = new FormData();
         formData.append("file", fileObj.file);
-        
+
         upload(formData, "image").then((res) => {
           console.log( config,'222')
           /*上传成功*/

src/views/login.vue

@@ -83,8 +83,8 @@ export default {
 <style scoped lang="scss">
 .login {
   height: 100vh;
-  background: url("../assets/img/登录背景2_app.png") top left no-repeat #edfcff;
-  background-size: 100% auto;
+  background: url("../assets/img/login-background.png") top left no-repeat #edfcff;
+  background-size: 100%;
   display: flex;
   justify-content: center;
   align-items: center;

src/views/menu/LZRegister/edit.vue

@@ -54,7 +54,7 @@
 
             </van-cell>
             <van-cell v-show="nfcImage.length > 0" :border="false" >
-              <uploader ref="imageUpload" v-model="nfcImage" multiple :maxCount="1" :deletable="false"/>
+              <img v-for="v in nfcImage" :src="nfcImage" alt="" :key="v.url">
             </van-cell>
           </div>
         </van-panel>
@@ -131,8 +131,7 @@
       </div >
 
       <p class="warning-msg">需要完成所有区域的履职内容才能提交内容</p>
-
-      <div class="flex-box" v-if="getDicts(taskInfo.status,'resumption_status') === '未开始' || '进行中' ">
+      <div class="flex-box" v-if="getDicts(taskInfo.status,'resumption_status') === '未开始' || getDicts(taskInfo.status,'resumption_status') === '进行中'">
         <van-button type="default" style="width: 28%;" plain  @click="goBack">取消</van-button>
         <van-button type="info" style="width: 28%;" plain hairline @click="saveData">保存</van-button>
         <van-button type="info" style="width: 28%;"  @click="submitData">提交</van-button>
@@ -140,26 +139,7 @@
     </div>
 
     <!--  nfc弹窗  -->
-    <transition name="van-fade">
-      <van-popup v-model="visible" get-container="lz-edit" lock-scroll>
-        <div class="nfc-panel">
-           <div>
-              <p class="top-text">将手机背部靠近NFC标签扫描</p>
-              <div class="bottom-box">
-                <div>
-                  <img :src="require('../../../assets/img/icon/NFC扫描-01.png')" />
-                  <span>NFC</span>
-                </div>
-                <div>
-                  <img :src="require('../../../assets/img/icon/camera.png')" />
-                  <span @click="nfcTakePhotos">拍照</span>
-                </div>
-              </div>
-            </div>
-        </div>
-      </van-popup>
-    </transition>
-
+    <nfc-popup ref="NfcPopup" @change="changeNfcImg"></nfc-popup>
   </div>
 </template>
 
@@ -168,10 +148,11 @@ import NavBar from '@/components/NavBar';
 import SelectCell from '@/components/selectCell';
 import DateCell from '@/components/dateCell';
 import Uploader from '@/components/upload';
+import NfcPopup from '@/components/nfcPopup/more';
 import {taskDetails,saveTaskData} from "@/views/menu/LZRegister/api";
 import {formatDate} from "@/filters/filter";
 export default {
-  components:{NavBar,SelectCell,DateCell,Uploader},
+  components:{NavBar,SelectCell,DateCell,Uploader,NfcPopup},
   data(){
     return {
       activeNames: ['1'],
@@ -195,8 +176,6 @@ export default {
       allCheckNum:0,
       //区域下检查项数量
       checkNum:0,
-      //nfc弹窗
-      visible:false,
       //nfc图片
       nfcImage:[
         { url: 'https://img01.yzcdn.cn/vant/leaf.jpg' },
@@ -371,7 +350,7 @@ export default {
       this.clearData();
     },
     clickNFC(){
-      this.visible = true;
+      this.$refs.NfcPopup.visible = true;
     },
     //清空数据
     clearData(){
@@ -383,25 +362,19 @@ export default {
       this.checkItemList = [];
       this.NFCNum = 0;
     },
-    nfcTakePhotos(){
-      let uploader = this.$refs.imageUpload;
-      console.log(uploader,'uploader')
-      uploader.chooseFiles();
-    },
     switchChange(item){
       console.log(item,'666')
       item.resTime = formatDate(new Date());
-    }
+    },
+    changeNfcImg(baseImg){
+      console.log(baseImg,'baseImg')
+      let arr = [];
+      arr.push({url:baseImg});
+      this.nfcImage = arr;
+    },
   }
 }
 </script>
-<style lang="scss">
-  .lz-edit{
-    .van-popup--center{
-      border-radius: 20px;
-    }
-  }
-</style>
 <style lang="scss" scoped>
   .lz-edit{
     height: 100%;
@@ -458,37 +431,4 @@ export default {
     color: #fff;
     background-color: #1989fa;
   }
-  .nfc-panel{
-    width: 400px;
-    background:url('../../../assets/img/NFCphone.png') center no-repeat;
-    background-size: 50%;
-    >div{
-      padding: 30px;
-    }
-  }
-  .top-text{
-    text-align: center;
-    font-size: 26px;
-  }
-  .bottom-box{
-    margin-top: 270px;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    >div{
-      display: flex;
-      flex-direction: column;
-      &:active{
-        opacity: .5;
-      }
-      >img{
-        width: 70px;
-        height: 70px;
-      }
-      >span{
-        text-align: center;
-        font-size: 25px;
-      }
-    }
-  }
 </style>

src/views/menu/monitoringCall/index.vue

@@ -126,16 +126,19 @@ import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
 import { deptTreeList, selectListApp, registration } from '@/api/toConsult.js'
 import { Toast } from 'vant'
+import { newDateMonth } from '@/utils/date.js'
+
 export default {
   data() {
     return {
       str: '',
-      fieldValue: '',
+      fieldValue: '全部',
       monitor: ['monitor', 'monitored', 'monitoring'], //状态样式
-      value1: '', //输入框model
-      currentDate: '',
-      cascaderValue: '',
-      columns: ['调阅中', '待调阅', '已调阅'],
+      value1: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //输入框model
+      currentDate: newDateMonth(),
+      cascaderValue: JSON.parse(sessionStorage.getItem('SET_USER_ORGID')) || '',
+      columns: ['全部'],
+      statusList: [], //调阅状态字典数组
       show: false,
       showStatus: false,
       showDate: false,
@@ -208,6 +211,13 @@ export default {
           this.options = data
         }
       })
+      //获取调阅状态字典
+      this.getDictHandler('retrieval_task_status', res => {
+        this.statusList = res
+        res.forEach(item => {
+          this.columns.push(item.dictLabel)
+        })
+      })
       this.selectListAppHandler()
     },
     selectListAppHandler() {
@@ -263,13 +273,7 @@ export default {
       this.taskId = taskId
       this.showDialog = true
     },
-    // //已调阅事件
-    // endMonitorHandler(status, taskId) {
-    //   // 0待调阅，1调阅中，2已调阅，3已超期
-    //   //跳转详情
-    //   if (status <= 1) return
-    //   this.$router.push('/consultInfo/' + taskId+'_d')
-    // },
+
     //查看调阅详情
     lookInfoHandler(taskId, status) {
       this.taskId = taskId
@@ -288,24 +292,11 @@ export default {
     //搜索选择状态时触发
     onConfirm(value, index) {
       this.fieldValue = value
-
-      switch (value) {
-        case '待调阅':
-          this.str = '0'
-
-          break
-        case '调阅中':
-          this.str = '1'
-          break
-
-        case '已调阅':
-          this.str = '2'
-          break
-
-        case '已超期':
-          this.str = '3'
-          break
-      }
+      this.statusList.forEach(item=>{
+        if(value==item.dictLabel){
+          this.str=item.dictValue
+        }
+      })
       this.showStatus = false
       this.selectListAppHandler()
     },
@@ -323,7 +314,7 @@ export default {
       m = m < 10 ? '0' + m : m
       var d = date.getDate()
       d = d < 10 ? '0' + d : d
-      return y + '-' + m + '-' + d
+      return y + '-' + m
     },
     onChange(picker, value, index) {},
     onCancel() {
@@ -363,7 +354,7 @@ export default {
   padding-right: 10px;
   bottom: 5%;
   right: 2%;
-  
+
   position: absolute;
   font-size: 20px;
   border-radius: 10px;

src/views/menu/training/components/personnelSignature.vue

@@ -129,7 +129,7 @@ export default {
         .then(res => {
           console.log(process.env.NODE_ENV);
           /*上传成功*/
-          let imgUrl = process.env.NODE_ENV === 'development' ? config.baseUrl + res.data.url :res.data.url
+          let imgUrl = process.env.NODE_ENV === 'development' ?  res.data.url : window.origin + res.data.url
          this.submitSign(imgUrl)
           
           // this.$emit("imgUrl", res.data.url);

yarn.lock

@@ -2266,6 +2266,11 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+browser-fs-access@^0.34.1:
+  version "0.34.1"
+  resolved "https://registry.npmmirror.com/browser-fs-access/-/browser-fs-access-0.34.1.tgz#76c14def4e664c4862c562fc51522def830a6b97"
+  integrity sha512-HPaRf2yimp8kWSuWJXc8Mi78dPbDzfduA+Gyq14H4jlMvd6XNfIRm36Y2yRLaa4x0gwcGuepj4zf14oiTlxrxQ==
+
 browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.6, browserslist@^4.20.3:
   version "4.21.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
@@ -5801,11 +5806,6 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-vue-jstree@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.npmmirror.com/vue-jstree/-/vue-jstree-2.1.6.tgz#44827ad72953ed77da6590ce4e8f37f7787f8653"
-  integrity sha512-vtUmhLbfE2JvcnYNRXauJPkNJSRO/f9BTsbxV+ESXP/mMQPVUIYI4EkSHKSEOxVDHTU7SfLp/AxplmaAl6ctcg==
-
 vue-lazyload@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz#901f9ec15c7e6ca78781a2bae4a343686bdedb2c"