瀏覽代碼

修复 模块苹果手机点击搜索条件问题

coys 1 年之前
父節點
當前提交
367679287d

+ 1 - 0
src/components/layouts/index.vue

@@ -60,6 +60,7 @@ export default {
   },
   watch: {
     $route(to, from) {
+      
       //如果 要 to(进入) 的页面是需要 keepAlive 缓存的,把 name push 进 include数组
       if (to.meta.keepAlive) {
         !this.include.includes(to.name) && this.include.push(to.name);

+ 1 - 0
src/components/orgTree/index.vue

@@ -59,6 +59,7 @@ export default  {
         if(!val){
           this.selected = null
         }else {
+         
           this.selected = this.value
         }
       },

+ 7 - 24
src/router/router.config.js

@@ -35,30 +35,7 @@ export let routers = [
     component: () => import('@/views/menu/monitoringCall/components/consultInfo'),
     meta: { title: '监控调阅', keepAlive: true }
   },
-  // {
-  //   path: '/addInfo/:id',
-  //   name: 'addInfo',
-  //   component: () => import('@/views/menu/monitoringCall/components/addInfo'),
-  //   meta: { title: '添加监控调阅', keepAlive: false }
-  // },
-  // {
-  //   path: '/update/:id',
-  //   name: 'update',
-  //   component: () => import('@/views/menu/monitoringCall/components/addInfo'),
-  //   meta: { title: '编辑监控调阅', keepAlive: false }
-  // },
-  // {
-  //   path: '/info/:id',
-  //   name: 'info',
-  //   component: () => import('@/views/menu/monitoringCall/components/addInfo'),
-  //   meta: { title: '监控调阅详情', keepAlive: false }
-  // },
-  {
-    path: '/training',
-    name: 'training',
-    component: () => import('@/views/menu/training/index'),
-    meta: { title: '教育培训', keepAlive: false }
-  },
+  
   {
     path: '/Addtraining/:id',
     name: 'Addtraining',
@@ -196,6 +173,12 @@ export let routers = [
         meta: { title: '优秀案例管理', keepAlive: false }
       },
       {
+        path: '/training',
+        name: 'training',
+        component: () => import('@/views/menu/training/index'),
+        meta: { title: '教育培训', keepAlive: false }
+      },
+      {
         path: '/rehearsallearning',
         name: 'rehearsallearning',
         component: () => import('@/views/menu/rehearsalTask/learning'),

+ 1 - 0
src/store/modules/app.js

@@ -24,6 +24,7 @@ export default {
     },
     SET_ORGTREE: (state, val) => {
       state.orgTree = val
+      
     },
     SET_DEPTREE: (state, val) => {
       state.depTree = val

+ 12 - 4
src/views/menu/monitoringCall/index.vue

@@ -8,7 +8,8 @@
     </van-row>
     <van-row>
       <van-col span="12"
-        ><van-field
+        >
+        <!-- <van-field
           v-model="fieldValue"
           label-width="3em"
           clearable
@@ -17,7 +18,8 @@
           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="调阅状态"
@@ -31,7 +33,7 @@
           /> </van-popup
       ></van-col>
       <van-col span="12">
-        <van-field
+        <!-- <van-field
           v-model="currentDate"
           clearable
           :disabled="showDate"
@@ -40,7 +42,9 @@
           placeholder=""
           @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"
@@ -593,4 +597,8 @@ export default {
 .resetDy {
   margin-left: 20px;
 }
+.van-cell__value{
+  color: black;
+  text-align: left;
+}
 </style>

+ 11 - 6
src/views/menu/rehearsalTask/index.vue

@@ -10,7 +10,8 @@
       </van-row>
       <van-row>
         <van-col span="12"
-          ><van-field
+          >
+          <!-- <van-field
             v-model="fieldValue"
             label-width="3em"
             :disabled="showStatus"
@@ -18,7 +19,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="状态"
@@ -32,7 +35,7 @@
           </van-popup>
         </van-col>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="currentDate"
             label-width="3em"
             label="年份"
@@ -41,7 +44,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
@@ -146,7 +151,7 @@
 import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
 import { getdrillTask, getsignUserList } from '@/api/drillTask.js'
-import { deptTreeList } from '@/api/toConsult.js'
+
 import { Toast } from 'vant'
 import OrgTree from '@/components/orgTree'
 import { newDateMonth } from '@/utils/date.js'
@@ -206,7 +211,7 @@ export default {
 
   created() {
     this.presentDate = new Date(newDateMonth())
-    // this.getNewMonth()
+
     this.yearData()
   },
   mounted() {

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

@@ -10,7 +10,7 @@
       </van-row>
       <van-row>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="currentDate"
             label-width="5em"
             label="开始月份"
@@ -19,7 +19,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
@@ -35,7 +37,7 @@
           </van-popup>
         </van-col>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="endDate"
             label-width="5em"
             label="结束月份"
@@ -44,7 +46,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

+ 5 - 2
src/views/menu/rehearsalTask/optimal.vue

@@ -10,7 +10,8 @@
       </van-row>
       <van-row>
         <van-col span="24"
-          ><van-field
+          >
+          <!-- <van-field
             v-model="fieldValue"
             label-width="3em"
             :disabled="showStatus"
@@ -18,7 +19,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="状态"

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

@@ -23,7 +23,8 @@
       </van-row>
       <van-row>
         <van-col span="12"
-          ><van-field
+          >
+          <!-- <van-field
             v-model="fieldValue"
             label-width="3em"
             clearable
@@ -32,7 +33,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="状态"
@@ -131,7 +134,6 @@ export default {
       },
       taskList: [], //列表数据
 
-      value1: JSON.parse(sessionStorage.getItem('SET_USER_ID')) || '', //输入框model
 
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
@@ -139,7 +141,7 @@ export default {
       statusValue: ' ', //状态值
       columns: ['全部'], //状态数组
       columnsList: [], //状态数组
-      currentDate: newDateMonth(), //年份
+      currentDate: newDateDay(), //年份
       conditionShow: false //机构弹框显示隐藏
     }
   },
@@ -156,7 +158,9 @@ export default {
   },
 
   created() {
-    this.presentDate = new Date()
+    this.presentDate = new Date(newDateDay())
+    
+    
   },
   mounted() {
     this.init()

+ 17 - 20
src/views/menu/training/index.vue

@@ -10,7 +10,8 @@
       </van-row>
       <van-row>
         <van-col span="12"
-          ><van-field
+          >
+          <!-- <van-field
             v-model="fieldValue"
             label-width="3em"
             clearable
@@ -19,7 +20,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="状态"
@@ -34,7 +37,7 @@
           </van-popup>
         </van-col>
         <van-col span="12">
-          <van-field
+          <!-- <van-field
             v-model="currentDate"
             clearable
             label-width="3em"
@@ -44,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">
             <van-datetime-picker
               v-model="presentDate"
@@ -171,6 +176,7 @@ export default {
       }, // 缺席人员
       orgName: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //机构名称
       cascaderValue: '', //机构ID
+    
       show: false, //机构弹框显示隐藏
 
       fieldNames: {
@@ -211,8 +217,12 @@ export default {
   },
   mounted() {
     this.init()
+  
     this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+    
   },
+ 
+  
   methods: {
     //机构搜索
     getDataList(val) {
@@ -262,9 +272,7 @@ export default {
       //任务处于待培训状态,且任务在规定完成时间范围内,登录人所在机构和与任务培训机构一致才显示
 
       if (list.startDate && list.endDate && (list.status == 0 || list.status == 4)) {
-        console.log(date)
-        console.log(startDate)
-        console.log(endDate)
+        
         if (date >= startDate && date <= endDate) {
           timefalg = true
         }
@@ -275,7 +283,7 @@ export default {
       if (orgId == list.orgId) {
         falg = true
       }
-      console.log(list.orgId, '....', timefalg)
+    
       if (date > endDate) {
         //当前时间大于结束时间表示已超期
 
@@ -286,18 +294,7 @@ export default {
         return true
       }
     },
-    //清空查询条件
-    clearSearch() {
-      this.fieldValue = ''
-      this.statusValue = ''
-      this.cascaderValue = ''
-      this.currentDate = ''
-      this.typeValue = ''
-      this.typeName = ''
-      this.orgName = ''
-
-      this.selectListAppHandler()
-    },
+   
 
     //初始化
     init() {

+ 1 - 0
vue.config.js

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