Explorar el Código

修复调阅现场添加防抖操作

coys hace 1 año
padre
commit
4674a7613d

+ 8 - 3
src/components/nfcPopup/alone.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="nfc-popup">
-    <van-popup v-model="visible" get-container="nfc-popup" lock-scroll>
+    <van-popup v-model="visible"  v-show="!globalLoading" get-container="nfc-popup"  lock-scroll>
       <div class="nfc-panel">
         <div>
           <p class="top-text">将手机背部靠近NFC标签扫描</p>
@@ -64,6 +64,7 @@ export default {
       this.useNFC()
     },
     openCameraCallBack(data) {
+      this.globalLoading=true
       let params = {}
       try {
         let img = JSON.parse(data)
@@ -96,15 +97,18 @@ export default {
 
           this.imageList.push({ name: res.data.name, url: imgUrl(res.data.url), imgPath: res.data.url })
           this.$emit('input', this.imageList)
+          
         })
         .catch(err => {
           /*上传失败*/
-          console.log(err)
-          this.$toast.fail('上传失败')
+        
+          this.visible = false
+          this.$toast.fail('上传失败111')
           this.fileList.splice(this.fileList.length - 1, 1)
         })
     },
     openNFCScanCallBack(data) {
+      this.globalLoading=true
       let nfc = null
       try {
         nfc = JSON.parse(data)
@@ -112,6 +116,7 @@ export default {
         nfc = data
       }
       this.objNfc = nfc
+      
       if (this.objNfc.errorCode == 0) {
         this.$emit('changeNFC', this.objNfc.content)
         Toast.success('扫描成功')

+ 5 - 2
src/utils/globalMixins.js

@@ -6,7 +6,9 @@ import { imgUrl } from '@/utils/index'
 
 export default {
   data() {
-    return {}
+    return {
+      globalLoading:false,
+    }
   },
   created() {
     /** 组件中设置dicts数组,会将字典存储在vuex中*/
@@ -93,7 +95,7 @@ export default {
     },
     //调用NFC
     useNFC() {
-
+      
       let system = this.isAndroidOrIos()
       const parms = {
         "iOS_SessionType": "0"
@@ -122,6 +124,7 @@ export default {
     },
     //调用相机和相册
     useCamera(actionType) {
+      
       window.openCameraCallBack = null
       window.openCameraCallBack = this.openCameraCallBack
       let parms = {}

+ 1 - 0
src/views/home/works.vue

@@ -130,6 +130,7 @@ export default {
         this.falg = false
         this.taskId = i.id
         this.$refs.scandialog.visible = true
+        this.globalLoading=true
       } else {
         this.falg = true
         this.$router.push({ path: this.worksLink(4, taskType, i.status, i.id, i) })

+ 17 - 6
src/views/menu/drillStatistics/index.vue

@@ -5,7 +5,8 @@
       <org-tree v-model="cascaderValue" @change="getOrgDataList"></org-tree>
       <van-row>
         <van-col span="24"
-          ><van-field
+          >
+          <!-- <van-field
             v-model="fieldValue"
             label-width="6em"
             :disabled="showStatus"
@@ -13,7 +14,9 @@
             placeholder=""
             @click="showStatus = true"
             ><van-icon name="arrow-down" slot="button"
-          /></van-field>
+          /></van-field> -->
+          <van-cell title="演练计划名称" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
+
           <van-popup v-model="showStatus" round position="bottom">
             <van-picker
               title="演练计划名称"
@@ -29,7 +32,7 @@
       </van-row>
       <van-row>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="currentDate"
             label-width="5em"
             label="开始月份"
@@ -38,7 +41,9 @@
             @click="showDate = true"
           >
             <van-icon name="arrow-down" slot="button"
-          /></van-field>
+          /></van-field> -->
+          <van-cell title="开始月份" @click="showDate = true" is-link arrow-direction="down" :value="currentDate" />
+
           <van-popup v-model="showDate" round position="bottom">
             <!-- :columns="yearColumns" -->
             <van-datetime-picker
@@ -54,7 +59,7 @@
           </van-popup>
         </van-col>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="endDate"
             label-width="5em"
             label="结束月份"
@@ -63,7 +68,9 @@
             @click="endShowDate = true"
           >
             <van-icon name="arrow-down" slot="button"
-          /></van-field>
+          /></van-field> -->
+          <van-cell title="开始月份" @click="endShowDate = true" is-link arrow-direction="down" :value="endDate" />
+
           <van-popup v-model="endShowDate" round position="bottom">
             <!-- :columns="yearColumns" -->
             <van-datetime-picker
@@ -343,4 +350,8 @@ export default {
     width: 50%;
   }
 }
+.van-cell__value{
+  color: black;
+  text-align: left;
+}
 </style>

+ 1 - 0
src/views/menu/monitoringCall/components/consultInfo.vue

@@ -135,6 +135,7 @@ export default {
       let falg = this.taskData.coreMonitoringTaskRegistrationMonitorVOList
       if (falg && falg.length > 0) {
         this.$refs.scandialog.visible = true
+        this.globalLoading=true
       } else {
         Dialog({ message: '调阅项目登记不能为全空!' })
         return

+ 1 - 0
src/views/menu/monitoringCall/index.vue

@@ -354,6 +354,7 @@ export default {
     startMonitorHandler(taskId) {
       this.taskId = taskId
       this.$refs.scandialog.visible = true
+      this.globalLoading=true
     },
 
     //查看调阅详情

+ 4 - 0
src/views/menu/rehearsalTask/index.vue

@@ -576,4 +576,8 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
+.van-cell__value{
+  color: black;
+  text-align: left;
+}
 </style>

+ 4 - 0
src/views/menu/rehearsalTask/learning.vue

@@ -384,4 +384,8 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
+.van-cell__value{
+  color: black;
+  text-align: left;
+}
 </style>

+ 12 - 4
src/views/menu/rehearsalTask/optimal.vue

@@ -38,7 +38,7 @@
       </van-row>
       <van-row>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="currentDate"
             label-width="5em"
             label="开始月份"
@@ -47,7 +47,9 @@
             @click="showDate = true"
           >
             <van-icon name="arrow-down" slot="button"
-          /></van-field>
+          /></van-field> -->
+          <van-cell title="开始月份" @click="showDate = true" is-link arrow-direction="down" :value="currentDate" />
+
           <van-popup v-model="showDate" round position="bottom">
             <!-- :columns="yearColumns" -->
             <van-datetime-picker
@@ -63,7 +65,7 @@
           </van-popup>
         </van-col>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="endDate"
             label-width="5em"
             label="结束月份"
@@ -72,7 +74,9 @@
             @click="endShowDate = true"
           >
             <van-icon name="arrow-down" slot="button"
-          /></van-field>
+          /></van-field> -->
+          <van-cell title="开始月份" @click="endShowDate = true" is-link arrow-direction="down" :value="endDate" />
+
           <van-popup v-model="endShowDate" round position="bottom">
             <!-- :columns="yearColumns" -->
             <van-datetime-picker
@@ -518,4 +522,8 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
+.van-cell__value{
+  color: black;
+  text-align: left;
+}
 </style>

+ 13 - 9
src/views/menu/resumptionEvaluate/index.vue

@@ -22,8 +22,7 @@
         </van-col>
       </van-row>
       <van-row>
-        <van-col span="12"
-          >
+        <van-col span="10">
           <!-- <van-field
             v-model="fieldValue"
             label-width="3em"
@@ -47,8 +46,8 @@
             />
           </van-popup>
         </van-col>
-        <van-col span="12">
-          <van-field
+        <van-col span="14">
+          <!-- <van-field
             v-model="currentDate"
             clearable
             label-width="3em"
@@ -58,7 +57,9 @@
             @click="showDate = true"
           >
             <van-icon name="arrow-down" slot="button"
-          /></van-field>
+          /></van-field> -->
+          <van-cell title="日期" @click="showDate = true" is-link arrow-direction="down" :value="currentDate" />
+
           <van-popup v-model="showDate" round position="bottom">
             <van-datetime-picker
               v-model="presentDate"
@@ -134,7 +135,6 @@ export default {
       },
       taskList: [], //列表数据
 
-
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
       fieldValue: '全部', //状态名称
@@ -159,8 +159,6 @@ export default {
 
   created() {
     this.presentDate = new Date(newDateDay())
-    
-    
   },
   mounted() {
     this.init()
@@ -205,7 +203,7 @@ export default {
         this.columns.unshift('全部')
       })
       //获取分页列表
-      // this.selectListAppHandler()
+      this.selectListAppHandler()
     },
     selectListAppHandler(type = 0, callback = () => {}) {
       let obj = {
@@ -238,6 +236,7 @@ export default {
             if (this.taskList.length >= total) {
               //已加载完全部数据
               this.finished = true
+              
             } else {
               callback()
             }
@@ -248,6 +247,7 @@ export default {
             if (this.taskList.length >= total) {
               //已加载完全部数据
               this.finished = true
+              
             }
 
             // this.taskList = rows || []
@@ -394,4 +394,8 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
+.van-cell__value {
+  color: black;
+  text-align: left;
+}
 </style>

+ 4 - 0
src/views/menu/training/index.vue

@@ -569,4 +569,8 @@ export default {
   color: #323233;
   -webkit-text-fill-color: #323233;
 }
+.van-cell__value{
+  color: black;
+  text-align: left;
+}
 </style>

+ 2 - 2
vue.config.js

@@ -118,9 +118,9 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://10.87.21.107:8080",
+        // target: "http://10.87.21.107:8080",
         // target: "http://10.87.21.103:8080",
-        // target: "http://10.87.23.62:8080",
+        target: "http://10.87.23.62:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{