Merge branch 'v0.1.0' of http://10.87.21.221:8000/jzyd_yyds/soc_app into v0.1.0

src/views/menu/drillStatistics/index.vue

@@ -184,7 +184,8 @@ export default {
           let arr = res.data;
           // 将百分比字符串转换为数字
           arr.forEach(item => {
-            item.finishRate = parseFloat(item.finishRate);
+            item.finishRate = parseFloat(item.finishRate).toFixed(2);
+            console.log("123",item.finishRate)
           });
 
           // 根据percentage字段进行降序排列
@@ -192,6 +193,7 @@ export default {
           // 将排序后的数字转换回带有百分比符号的字符串
           arr.forEach(item => {
             item.finishRate = `${item.finishRate}%`;
+            console.log("456",item.finishRate)
           });
           // 重新赋值给dataList
           this.dataList = arr;
@@ -223,7 +225,7 @@ export default {
       let startTime = dayjs(val[1].start);
       let endTime = dayjs(this.selectEndDate);
       if (startTime.month()+1 > endTime.month()+1 ) {
-        return Toast('开始月份不能大于结束月份')
+        return Toast('开始时间不能大于结束时间')
       }
       this.selectStartDate=startTime.format('YYYY-MM-DD');
       this.currentDate = this.initShowDateStr(startTime.year(), startTime.month()+1);
@@ -235,7 +237,7 @@ export default {
       let startTime = dayjs(this.selectStartDate);
       let endTime = dayjs(val[1].end);
       if (startTime.month()+1 > endTime.month()+1 ) {
-        return Toast('开始月份不能大于结束月份')
+        return Toast('开始时间不能大于结束时间')
       }
       this.selectEndDate=endTime.format('YYYY-MM-DD');
       this.endDate =this.initShowDateStr(endTime.year(), endTime.month()+1);

src/views/menu/educationStatistics/index.vue

@@ -112,7 +112,7 @@ export default {
           let arr=res.data;
           // 将百分比字符串转换为数字
           arr.forEach(item => {
-            item.finishRate = parseFloat(item.finishRate);
+            item.finishRate = parseFloat(item.finishRate).toFixed(2);
           });
 
           // 根据percentage字段进行降序排列

src/views/menu/iot/add.vue

@@ -172,7 +172,7 @@ export default {
         return
       }
       if(!this.formData.arrivalTime){
-        this.$toast('请选择到达时间');
+        this.$toast('请选择进入时间');
         return
       }
       let data = {

src/views/menu/monitorStatistics/index.vue

@@ -127,7 +127,7 @@ export default {
           let arr=res.data;
           // 将百分比字符串转换为数字
           arr.forEach(item => {
-            item.accessRate = parseFloat(item.accessRate);
+            item.accessRate = parseFloat(item.accessRate).toFixed(2);
           });
 
           // 根据percentage字段进行降序排列

src/views/menu/rehearsalTask/components/addRehearsalTask.vue

@@ -77,16 +77,16 @@
           </div>
         </div>
       </div>
-      <!-- //演练项目 -->
+      <!-- //演练类型 -->
       <van-field
         readonly
         clickable
         required
         name="picker"
         :value="form.typeText"
-        label="演练项目"
-        :rules="[{ required: true, message: '演练项目不能为空' }]"
-        placeholder="请选择演练项目"
+        label="演练类型"
+        :rules="[{ required: true, message: '演练类型不能为空' }]"
+        placeholder="请选择演练类型"
         @click="showPicker = true"
       />
 
@@ -241,7 +241,7 @@ export default {
       falg: false, //校验是否通过
 
       form: {
-        typeText: '', //演练项目类型
+        typeText: '', //演练类型类型
         type: '', //演练value
         category: '', //演练类型value
         categoryText: '', //演练类型text
@@ -385,9 +385,9 @@ export default {
       this.$refs.yldialog.initBranch()
     },
 
-    //演练项目确认
+    //演练类型确认
     onConfirm(val) {
-      this.form.typeText = val //演练项目赋值
+      this.form.typeText = val //演练类型赋值
       this.columnsList.forEach(item => {
         if (val == item.dictLabel) {
           this.form.type = item.dictValue

src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -82,7 +82,7 @@
       <div class="mainItem">
         <van-row>
           <van-col :span="8" class="label">
-            <div>演练项目</div>
+            <div>演练类型</div>
           </van-col>
           <van-col :span="16">
             <div>{{ trainingData.typeText }}</div>
@@ -475,9 +475,9 @@ export default {
               //省联社
               this.checkBoxList =checkBoxList2;
             }
-            
+
           }
-          
+
           // 从待办直接进入 评优界面
           if(!this.activeTab)
           {
@@ -492,7 +492,7 @@ export default {
             {
               this.checkBoxList = checkBoxList2;
             }
-          }          
+          }
 
           if (this.trainingData.recStatus == 5) {
             this.result = [5]
@@ -579,7 +579,7 @@ export default {
 
           if (this.trainingData.recStatus == 2) {
             this.result = [1, 2]
-          } 
+          }
           // else if (this.trainingData.recStatus == 1) {
           //   this.result = [1]
           // }

src/views/menu/rehearsalTask/index.vue

@@ -20,7 +20,7 @@
               @confirm="onConfirm"
               confirm-button-text="确定"
               @cancel="onCancel"
-             
+
 
               :close-on-click-overlay="false"
             />
@@ -96,7 +96,7 @@
               <div class="wj-title-red" v-else-if="item.status == 4">{{ item.statusText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练项目</div>
+              <div>演练类型</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">

src/views/menu/rehearsalTask/learning.vue

@@ -8,7 +8,7 @@
           <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
-     
+
       <van-row>
         <van-col span="12">
           <!-- <van-field
@@ -69,11 +69,11 @@
       </van-row>
       <van-row>
         <van-col span="24">
-          <van-cell title="演练项目" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
+          <van-cell title="演练类型" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
 
           <van-popup v-model="showStatus" round position="bottom">
             <van-picker
-              title="演练项目"
+              title="演练类型"
               show-toolbar
               :columns="columns"
               @confirm="onConfirm"
@@ -83,7 +83,7 @@
             />
           </van-popup>
         </van-col>
-      
+
       </van-row>
       <van-row>
         <van-col span="24">
@@ -118,7 +118,7 @@
             </div>
 
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练项目</div>
+              <div>演练类型</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
@@ -171,8 +171,8 @@ export default {
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
       endShowDate: false, //月份显示隐藏
-      fieldValue: '', //演练项目名称
-      drillType: '', 
+      fieldValue: '', //演练类型名称
+      drillType: '',
       statusValue: ' ', //状态值
       columns: [], //状态数组
       columnsList: [], //状态数组
@@ -222,7 +222,7 @@ export default {
       this.getDictHandler('core_drill_type', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
-        
+
       })
       //获取分页列表
       this.selectListAppHandler()
@@ -252,7 +252,7 @@ export default {
         obj.endTime = this.endDate + '-' + '01'
       }
       if (this.fieldValue) {
-        obj.drillType = this.drillType 
+        obj.drillType = this.drillType
       }
       if (this.activeAl) {
         obj.recStatus = this.activeAl
@@ -350,7 +350,7 @@ export default {
           this.drillType = item.dictValue
         }
       })
-      
+
 
       this.selectListAppHandler()
       this.showStatus = false

src/views/menu/rehearsalTask/optimal.vue

@@ -69,11 +69,11 @@
       </van-row>
       <van-row>
         <van-col span="24">
-          <van-cell title="演练项目" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
+          <van-cell title="演练类型" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
 
           <van-popup v-model="showStatus" round position="bottom">
             <van-picker
-              title="演练项目"
+              title="演练类型"
               show-toolbar
               :columns="columns"
               @confirm="onConfirm"
@@ -113,7 +113,7 @@
             <div class="titleClass">
               <div class="title">{{ item.title }}</div>
               <div>
-                <van-button                 
+                <van-button
                   type="info"
                   v-if="canCancel(item)"
                   size="small"
@@ -132,7 +132,7 @@
               <div>{{ item.orgName }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练项目</div>
+              <div>演练类型</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
@@ -189,7 +189,7 @@ export default {
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
       endShowDate: false, //月份显示隐藏
-      fieldValue: '', //演练项目名称
+      fieldValue: '', //演练类型名称
       drillType: '',
       statusValue: ' ', //状态值
       columns: [], //状态数组
@@ -245,7 +245,7 @@ export default {
       this.getDictHandler('core_drill_type', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
-      })      
+      })
       //根据登录人机构 初始化默认选中Tab页
       this.initDefaultActiveTab();
       // 根据第一层默认选中的Tab页 初始化第二层Tab 页值

src/views/menu/rehearsalTask/optimal_old.vue

@@ -117,7 +117,7 @@
               <div>{{ item.orgName }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练项目</div>
+              <div>演练类型</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">

src/views/menu/resumptionStatistics/index.vue

@@ -151,7 +151,7 @@ export default {
           let arr=res.data;
           // 将百分比字符串转换为数字
           arr.forEach(item => {
-            item.totalRate = parseFloat(item.totalRate);
+            item.totalRate = parseFloat(item.totalRate).toFixed(2);
           });
 
           // 根据percentage字段进行降序排列

src/views/menu/safeCheckSelfStatistics/index.vue

@@ -157,7 +157,7 @@ export default {
           let arr=res.data;
           // 将百分比字符串转换为数字
           arr.forEach(item => {
-            item.inspectRate = parseFloat(item.inspectRate);
+            item.inspectRate = parseFloat(item.inspectRate).toFixed(2);
           });
 
           // 根据percentage字段进行降序排列

src/views/menu/safeCheckStatistics/index.vue

@@ -157,7 +157,7 @@ export default {
           let arr=res.data;
           // 将百分比字符串转换为数字
           arr.forEach(item => {
-            item.inspectRate = parseFloat(item.inspectRate);
+            item.inspectRate = parseFloat(item.inspectRate).toFixed(2);
           });
 
           // 根据percentage字段进行降序排列

src/views/menu/visitRecord/add.vue

@@ -62,7 +62,7 @@
                 <uploader :maxCount="2" v-model="formData.checkImage"/>
               </van-cell>
             </div>
-            <date-cell required title="到达时间" :min-date="selectedUser.minDate"  :max-date="maxDate" v-model="formData.arrivalTime" date-type="datetime" />
+            <date-cell required title="进入时间" :min-date="selectedUser.minDate"  :max-date="maxDate" v-model="formData.arrivalTime" date-type="datetime" />
 <!--            <date-cell title="离开时间" :max-date="maxData" v-model="formData.departureTime" date-type="datetime" />-->
           </div>
           <div class="big-btn-box" >
@@ -208,7 +208,7 @@ export default {
         return
       }
       if(!this.formData.arrivalTime){
-        this.$toast('请选择到达时间');
+        this.$toast('请选择进入时间');
         return
       }
       let data = {

src/views/menu/visitRecord/detail.vue

@@ -60,7 +60,7 @@
               </van-cell>
             </div>
             <van-cell v-if="selectedUser.accompanyingPerson" title="陪同人员" :value="selectedUser.accompanyingPerson"></van-cell>
-            <!-- <date-cell v-if="selectedUser.approveStatus==1 && !selectedUser.accompanyingPerson" required title="到达时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" /> -->
+            <!-- <date-cell v-if="selectedUser.approveStatus==1 && !selectedUser.accompanyingPerson" required title="进入时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" /> -->
             <van-field
               v-if="canRecord() && !selectedUser.accompanyingPerson"
               v-model="formData.accompanyingPerson"
@@ -70,7 +70,7 @@
               :maxlength="200"
               placeholder="请输入陪同人员姓名"
               label="陪同人员"></van-field>
-            <van-cell title="到达时间" v-if="selectedUser.arrivalTime" :value="dayjs(selectedUser.arrivalTime).format('YYYY-MM-DD HH:mm')"></van-cell>
+            <van-cell title="进入时间" v-if="selectedUser.arrivalTime" :value="dayjs(selectedUser.arrivalTime).format('YYYY-MM-DD HH:mm')"></van-cell>
             <van-cell title="离开时间" v-if="selectedUser.departureTime" :value="dayjs(selectedUser.departureTime).format('YYYY-MM-DD HH:mm')"></van-cell>
             <div class="upload-box" v-if="selectedUser.submitSign">
               <span>登记签名</span>
@@ -83,7 +83,7 @@
                 </div>
               </van-cell>
             </div>
-            <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="到达时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
+            <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="进入时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
             <date-cell v-if="canRecord() && selectedUser.arrivalTime && !selectedUser.departureTime" required title="离开时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
           </div>
 
@@ -173,7 +173,7 @@ export default {
       }
 
       if(!this.selectedUser.arrivalTime && !arrivalTime){
-        this.$toast('请选择到达时间');
+        this.$toast('请选择进入时间');
         return
       }
 

src/views/menu/visitRecord/index.vue

@@ -41,7 +41,7 @@
                     已失效
                   </span>
                 <van-button v-if="v.approveStatus==0" @click.stop="cancelOutInRequest(v.id)" type="info" size="mini">取消出入申请</van-button>
-                <van-button v-if="v.approveStatus==1 && v.status!=3 &&!v.arrivalTime" type="info" size="mini">登记达到时间</van-button>
+                <van-button v-if="v.approveStatus==1 && v.status!=3 &&!v.arrivalTime" type="info" size="mini">登记进入时间</van-button>
                 <van-button v-if="v.approveStatus==1 && v.status!=3 && v.arrivalTime&&!v.departureTime" type="info" size="mini">登记离开时间</van-button>
               </template>
             </van-cell>
@@ -68,13 +68,13 @@
                        {{v.approveTime? dayjs(v.approveTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
                       </div>
                   </div>
-                
+
                   <div class="info-item">
                     <div class="item-label">人员姓名</div>
                     <div class="item-value"> {{v.userName}}</div>
                   </div>
                   <div class="info-item">
-                    <div class="item-label">到达时间</div>
+                    <div class="item-label">进入时间</div>
                     <div class="item-value">
                       <!-- {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}} -->
                       {{v.arrivalTime? dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
@@ -112,7 +112,7 @@
 <!--&lt;!&ndash;                  <div class="item-value">{{v.idCard}}</div>&ndash;&gt;-->
 <!--&lt;!&ndash;                </div>&ndash;&gt;-->
 <!--                <div class="info-item">-->
-<!--                  <div class="item-label">到达时间：</div>-->
+<!--                  <div class="item-label">进入时间：</div>-->
 <!--                  <div class="item-value">-->
 <!--                    {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}}-->
 <!--                  </div>-->
@@ -135,7 +135,7 @@
 <!--          </card>-->
         </Scroll>
       </div>
-     
+
     </div>
     <!-- <drag-button @btnClick="clickAdd"></drag-button> -->
   </div>
@@ -156,7 +156,7 @@ import dayjs from "dayjs";
 export default {
   name: 'visitRecord',
   components: {
-   
+
     DragButton,
     NavBar,
     OrgTree,

src/views/menu/visitRegister/add.vue

@@ -179,7 +179,7 @@
                 placeholder="请输入"/>
           </van-form>
           <div class="upload-box" >
-            <span class="required">上传证件照</span>
+            <span class="required">{{personnel.idType==0?'证件正反面':'上传证件照'}}</span>
             <van-cell>
               <uploader :maxCount="2" v-model="personnel.imgFile"/>
             </van-cell>

src/views/menu/workTime/index.vue

@@ -39,10 +39,14 @@
 
       <!--   操作     -->
       <van-cell-group>
-        <van-cell center title="是否值班打卡" v-if="!ifOrg() && !formData.isDisabled">
-          <template #right-icon>
+        <van-cell center title="是否值班打卡" v-if="!ifOrg()">
+<!--          <template #right-icon>
             <van-switch :size="20" active-value="1" inactive-value="0" v-model="formData.isDuty"></van-switch>
-          </template>
+          </template>-->
+          <van-radio-group  v-model="formData.isDuty" direction="horizontal" style="display: flex; justify-content: flex-end;">
+            <van-radio :disabled="formData.isDisabled" name="1">是</van-radio>
+            <van-radio  :disabled="formData.isDisabled" name="0" style="margin-right: 0">否</van-radio>
+          </van-radio-group>
         </van-cell>
         <van-cell center title="是否复制到全月" v-if="!ifOrg() && !formData.isDisabled">
           <template #right-icon>