修改监控调阅模块调阅提示信息

src/components/nfcPopup/alone.vue

@@ -61,6 +61,7 @@ export default {
       this.useCamera(1)
     },
     submitNFC() {
+      
       this.useNFC()
     },
     openCameraCallBack(data) {
@@ -98,6 +99,10 @@ export default {
         Toast.error(this.objNfc.errorString)
       }
     }
+  },
+  destroyed(){
+    window.openCameraCallBack = null;
+    window.openNFCScanCallBack = null;
   }
 }
 </script>

src/components/upload/index.vue

@@ -121,105 +121,7 @@ export default {
           this.fileList.splice(this.fileList.length - 1, 1)
         })
     },
-    // //上传前压缩
-    // beforeRead(file) {
-    //   console.log(file, '图片压缩前')
-    //   //当前是多文件的时候
-    //   if (file.length > 1) {
-    //     let list = []
-    //     for (let index = 0; index < file.length; index++) {
-    //       const element = file[index]
-    //       list.push(
-    //         new Promise((resolve, reject) => {
-    //           new ImageCompressor({
-    //             file: element,
-    //             quality: 0.6,
-    //             success: result => {
-    //               console.log(result, '图片压缩后')
-    //               let imgFile = new File([result], result.name, {
-    //                 width: result.width,
-    //                 height: result.height,
-    //                 type: result.type
-    //               })
-    //               console.log(imgFile, '后')
-    //               resolve(imgFile)
-    //             },
-    //             error: e => {
-    //               this.$toast(e)
-    //               reject(e)
-    //             }
-    //           })
-    //         })
-    //       )
-    //       return list
-    //     }
-    //   } else {
-    //     return new Promise((resolve, reject) => {
-    //       new ImageCompressor({
-    //         file,
-    //         quality: 0.6,
-    //         success: result => {
-    //           console.log(result, '图片压缩后')
-    //           let imgFile = new File([result], result.name, {
-    //             width: result.width,
-    //             height: result.height,
-    //             type: result.type
-    //           })
-    //           console.log(imgFile, '后')
-    //           resolve(imgFile)
-    //         },
-    //         error: e => {
-    //           this.$toast(e)
-    //           reject(e)
-    //         }
-    //       })
-    //     })
-    //   }
-    // },
-    // //上传到服务器
-    // afterRead(fileObj) {
-    //   console.log(fileObj)
-    //   //多文件上传
-    //   if (this.multiple&&fileObj instanceof Array) {
-    //     for (let index = 0; index < fileObj.length; index++) {
-    //       const element = fileObj[index]
-    //       let formData = new FormData()
-    //       formData.append('file', element.file)
-    //       upload(formData, 'image')
-    //         .then(res => {
-
-    //           /*上传成功*/
-    //           let imgUrl =
-    //             process.env.NODE_ENV === 'development' ? config.baseUrl + res.data.url : window.origin + res.data.url
-
-    //           this.imageList.push({ name: res.data.name, url: imgUrl, path: res.data.url })
-    //           this.$emit('input', this.imageList)
-    //         })
-    //         .catch(err => {
-    //           /*上传失败*/
-
-    //           this.$toast.fail('上传失败')
-    //         })
-    //     }
-    //   } else {
-    //     let formData = new FormData()
-    //     formData.append('file', fileObj.file)
-    //     upload(formData, 'image')
-    //       .then(res => {
-    //         /*上传成功*/
-    //         let imgUrl =
-    //           process.env.NODE_ENV === 'development' ? config.baseUrl + res.data.url : window.origin + res.data.url
-
-    //         this.imageList.push({ name: res.data.name, url: imgUrl, path: res.data.url })
-    //         this.$emit('input', this.imageList)
-    //       })
-    //       .catch(err => {
-    //         /*上传失败*/
-
-    //         this.$toast.fail('上传失败')
-    //       })
-    //   }
-    // },
+    
     //删除
     deleteHandler() {
       let imageList = JSON.parse(JSON.stringify(this.fileList))
@@ -234,6 +136,10 @@ export default {
   model: {
     prop: 'value',
     event: 'input'
+  },
+  destroyed(){
+    window.openCameraCallBack = null;
+   
   }
 }
 </script>

src/views/home/works.vue

@@ -105,6 +105,7 @@ export default {
   },
   methods: {
     isFalgHandler(i, taskType, id) {
+      
       if (i.isExist != undefined && i.isExist == 0) {
         return Dialog.alert({
           message: '机构下没有主机摄像头，不能开启调阅任务!',

src/views/menu/monitoringCall/components/taskInfo.vue

@@ -238,6 +238,9 @@ export default {
     },
     //文字提示
     textTitleHandler(text) {
+      if(!text){
+        text='可参照相关部门管理办法!'
+      }
       // text='1.挖掘第哦啊uiOS多i,2.是多久啊了多久哦'
       this.showDialog = true
       this.showText = text.split(',')

src/views/menu/resumptionEvaluate/evaluate.vue

@@ -33,7 +33,7 @@
     </div>
     <van-row class="cell-btutton">
       <van-col span="24">
-        <van-button type="info" class="infoBtn">评价</van-button>
+        <van-button type="info"  class="infoBtn">评价</van-button>
       </van-col>
     </van-row>
   </div>

src/views/menu/resumptionEvaluate/index.vue

@@ -2,15 +2,23 @@
   <div>
     <div class="topBox">
       <NavBar :go="{ type: 'push', path: '/menu' }" />
-      <van-row>
-        <van-col span="24"> <van-search v-model="evaluateName" maxlength="50" placeholder="请输入搜索关键词" @search="onSearch" /></van-col>
-      </van-row>
+     
       <van-row>
         <van-col span="24">
           <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
       <van-row>
+        <van-col span="24">
+          <van-search
+            v-model="evaluateName"
+            @input="selectListAppHandler()"
+            clearable
+            maxlength="50"
+            placeholder="请输入搜索关键词"
+        /></van-col>
+      </van-row>
+      <van-row>
         <van-col span="12"
           ><van-field
             v-model="fieldValue"
@@ -38,7 +46,7 @@
             v-model="currentDate"
             clearable
             label-width="3em"
-            label="年份"
+            label="日期"
             placeholder=""
             :disabled="showDate"
             @click="showDate = true"
@@ -46,14 +54,13 @@
             <van-icon name="arrow-down" slot="button"
           /></van-field>
           <van-popup v-model="showDate" round position="bottom">
-            <van-picker
+            <van-datetime-picker
               v-model="presentDate"
-              show-toolbar
+              type="date"
+              title="选择年月日"
               @cancel="onCancel"
-              :columns="yearColumns"
               @confirm="onDateConfirm"
-              :default-index="yearSelect"
-              title="年份"
+              confirm-button-text="确定"
             />
           </van-popup>
         </van-col>
@@ -68,7 +75,7 @@
             <div class="titleClass">
               <div class="title">{{ item.title }}</div>
               <div>
-                <van-button type="info" v-if="evaluateTure(item)" size="mini" @click="evaluate(item.id)"
+                <van-button type="info" v-if="evaluateTure(item)" size="small" @click="evaluate(item.id)"
                   >评价</van-button
                 >
               </div>
@@ -96,7 +103,7 @@ import { getEvaluatePage } from '@/api/evaluateTask.js'
 import { deptTreeList } from '@/api/toConsult.js'
 import { Toast } from 'vant'
 import OrgTree from '@/components/orgTree'
-import { newDateMonth, newDateYear } from '@/utils/date.js'
+import { newDateMonth, newDateDay } from '@/utils/date.js'
 export default {
   data() {
     return {
@@ -106,8 +113,7 @@ export default {
       pageNum: 1,
       loading: false, //加载状态
       finished: false, //是否全部加载完毕
-      evaluateName:'',
-      yearColumns: [],
+      evaluateName: '',
 
       orgName: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //机构名称
       cascaderValue: '', //机构ID
@@ -119,8 +125,7 @@ export default {
         children: 'children'
       },
       taskList: [{}], //列表数据
-      
-      yearSelect: null,
+
       value1: JSON.parse(sessionStorage.getItem('SET_USER_ID')) || '', //输入框model
 
       showStatus: false, //状态显示隐藏
@@ -129,7 +134,7 @@ export default {
       statusValue: ' ', //状态值
       columns: ['全部'], //状态数组
       columnsList: [], //状态数组
-      currentDate: newDateYear(), //年份
+      currentDate: newDateDay(), //年份
       conditionShow: false //机构弹框显示隐藏
     }
   },
@@ -146,9 +151,7 @@ export default {
   },
 
   created() {
-    this.presentDate = new Date(newDateYear())
-
-    this.yearData()
+    this.presentDate = new Date()
   },
   mounted() {
     this.init()
@@ -164,7 +167,7 @@ export default {
 
     //判断评价按钮是否展示
     evaluateTure(item) {
-        return true
+      return true
       if (item.status == 2 && window.sessionStorage.getItem('SET_USER_ORGTYPE') != 4) {
         return true
       }
@@ -173,7 +176,7 @@ export default {
     //初始化
     init() {
       //获取数据字典
-      this.getDictHandler('plan_status', res => {
+      this.getDictHandler('evaluate_status', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
         this.columns.unshift('全部')
@@ -183,7 +186,7 @@ export default {
     },
     selectListAppHandler(type = 0, callback = () => {}) {
       let obj = {
-        evaluateName:this.evaluateName,
+        evaluateName: this.evaluateName,
         pageNum: this.pageNum,
         pageSize: 10
       }
@@ -198,9 +201,8 @@ export default {
       obj.orgId = this.cascaderValue || JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + '' || ''
 
       if (this.currentDate) {
-        obj.date = this.currentDate 
+        obj.date = this.currentDate
       }
-      
 
       //获取任务列表
       getEvaluatePage(obj).then(res => {
@@ -217,9 +219,9 @@ export default {
             this.finished = false
             this.taskList = rows
           }
-        }else{
+        } else {
           this.finished = true
-          this.taskList =[]
+          this.taskList = []
         }
       })
     },
@@ -247,22 +249,7 @@ export default {
       this.showDate = false
       this.selectListAppHandler()
     },
-    yearData() {
-      // 获取默认显示的时间
-      var nowTime = new Date()
-      let year = nowTime.getFullYear()
-      let month = nowTime.getMonth()
-      let day = nowTime.getDate()
-      // 循环数组 填写最小时间和最大时间范围
-      for (let i = 1980; i < 2099; i++) {
-        this.yearColumns.push(i)
-      }
-      // 格式化时间并截取
-      var years = this.formatDate(new Date(year, month, day))
-      var Year = years.slice(0, 4)
-      // 将截取的年份赋值给绑定值 用于点击弹出日期窗口后显示当前的时间
-      this.yearSelect = this.yearColumns.indexOf(Number(Year))
-    }, //日期转换
+    //日期转换
     newDate(time) {
       var date = new Date(time)
       var y = date.getFullYear()
@@ -270,11 +257,7 @@ export default {
       m = m < 10 ? '0' + m : m
       var d = date.getDate()
       d = d < 10 ? '0' + d : d
-      return y
-    },
-    //日期格式
-    formatDate(date) {
-      return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+      return y + '-' + m + '-' + d
     },
 
     //onLoad下拉刷新
@@ -289,12 +272,10 @@ export default {
         console.log(1)
       })
     },
-    onSearch(){
-
-    },
+    
     //评价
     evaluate(id) {
-      this.$router.push('/evaluate/' + id )
+      this.$router.push('/evaluate/' + id)
     },
 
     //跳转详情

src/views/menu/training/index.vue

@@ -115,6 +115,7 @@
               <div v-if="item.status==0" :style="{'color':'#008cd6'}">{{ item.statusText }}</div>
               <div v-else-if="item.status==1" :style="{'color':'#bc9f71'}">{{ item.statusText }}</div>
               <div v-else-if="item.status==3" :style="{'color':'#d7000f'}">{{ item.statusText }}</div>
+              <div v-else :style="{'color':'#008cd6'}">{{ item.statusText }}</div>
             </div>
             
             <div class="mainItem">

vue.config.js

@@ -110,9 +110,9 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://10.87.10.55:8080",
+        // target: "http://10.87.10.55:8080",
         // target: "http://10.87.10.91:8080",
-        // target: "http://10.87.10.47:8080",
+        target: "http://10.87.10.47:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{