dedsudiyu преди 2 години
родител
ревизия
70edad6b2e
променени са 2 файла, в които са добавени 3 реда и са изтрити 50 реда
  1. 1 48
      src/views/comprehensive/personnel/onDutyConfiguration/index.vue
  2. 2 2
      src/views/comprehensive/personnel/patrolRecord/index.vue

+ 1 - 48
src/views/comprehensive/personnel/onDutyConfiguration/index.vue

@@ -265,54 +265,7 @@
           ],
         },
         props: { multiple: true },
-        options: [
-          {
-          value: 1,
-          label: '东南',
-          children: [{
-            value: 2,
-            label: '上海',
-            children: [
-              { value: 3, label: '普陀' },
-              { value: 4, label: '黄埔' },
-              { value: 5, label: '徐汇' }
-            ]
-          }, {
-            value: 7,
-            label: '江苏',
-            children: [
-              { value: 8, label: '南京' },
-              { value: 9, label: '苏州' },
-              { value: 10, label: '无锡' }
-            ]
-          }, {
-            value: 12,
-            label: '浙江',
-            children: [
-              { value: 13, label: '杭州' },
-              { value: 14, label: '宁波' },
-              { value: 15, label: '嘉兴' }
-            ]
-          }]
-        }, {
-          value: 17,
-          label: '西北',
-          children: [{
-            value: 18,
-            label: '陕西',
-            children: [
-              { value: 19, label: '西安' },
-              { value: 20, label: '延安' }
-            ]
-          }, {
-            value: 21,
-            label: '新疆维吾尔族自治区',
-            children: [
-              { value: 22, label: '乌鲁木齐' },
-              { value: 23, label: '克拉玛依' }
-            ]
-          }]
-        }],
+        options: [],
         //已选择人员数据
         userCheckList:[],
         showSearch:true,

+ 2 - 2
src/views/comprehensive/personnel/patrolRecord/index.vue

@@ -40,7 +40,7 @@
               <div class="for-month-max-big-box" v-for="(item,index) in year.list" :key="item.key">
                 <p class="for-month-top-big-box" :class="item.disable?'for-month-top-big-box-color':''">{{item.date}}</p>
                 <div class="for-month-bottom-big-box" :class="item.noSignedInCount>0?'red-backgroud-color':''"
-                     v-if="!item.disable&&item.signInCount>0" @click.stop="goPage('info',item)">
+                     v-if="!item.disable&&(item.signInCount>0||item.noSignedInCount>0)" @click.stop="goPage('info',item)">
                   <div class="for-month-bottom-left-min-box">
                     <p>已签到人员:{{item.signInCount}}</p>
                     <p>未签到人员:{{item.noSignedInCount}}</p>
@@ -62,7 +62,7 @@
             <div class="year-big-box">
               <div class="for-year-big-box" v-for="(item,index) in year.list" :key="item.key">
                 <p class="for-year-top-big-box" :class="item.disable?'for-year-top-big-box-color':''">{{item.date}}</p>
-                <div class="for-year-bottom-big-box" :class="!item.disable&&item.noSignedInCount>0?'red-backgroud-color':''" v-if="item.signInCount>0&&!item.disable" @click.stop="goPage('info',item)">{{item.noSignedInCount>0?item.noSignedInCount:item.signInCount}}人</div>
+                <div class="for-year-bottom-big-box" :class="!item.disable&&item.noSignedInCount>0?'red-backgroud-color':''" v-if="(item.signInCount>0||item.noSignedInCount>0)&&!item.disable" @click.stop="goPage('info',item)">{{item.noSignedInCount>0?item.noSignedInCount:item.signInCount}}人</div>
               </div>
             </div>
           </div>