Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_app into dev

src/assets/css/index.scss

@@ -14,7 +14,3 @@ body .app {
   padding-bottom: 100px;
   background-color: rgb(245, 245, 249);
 }
-
-.layout-content{
-
-}

src/assets/css/variables.scss

@@ -1,4 +1,3 @@
 
 // variables
 $background-color: #ffffff;
-

src/components/NavBar/index.vue

@@ -24,8 +24,17 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+
+.van-nav-bar{
+  background-color: #008cd6;
+}
+.van-nav-bar__title,.van-nav-bar .van-icon{
+  color: #fff;
+}
+</style>
 <style lang="scss" scoped>
   .nav-bar{
-    -box-shadow: 0 10px 10px #333;
+    box-shadow: 0 2px 10px #ccc;
   }
 </style>

src/components/dateCell/index.vue

@@ -1,6 +1,10 @@
 <template>
-  <div class="date-cell">
-    <van-cell :title="title" is-link :label="selected" @click="clickItem"/>
+  <div class="date-cell van-hairline--bottom" >
+    <van-cell :title="title" is-link :label="selected" @click="clickItem">
+      <template #right-icon>
+        <van-icon name="underway-o" style="font-weight: 600;line-height: inherit;color:#008cd6;" />
+      </template>
+    </van-cell>
     <van-popup v-model="showPicker" round  position="bottom" :close-on-popstate="true" get-container="#app">
       <van-datetime-picker
         v-bind="$attrs"

src/components/layouts/index.vue

@@ -7,9 +7,7 @@
       <router-view v-else></router-view>
     </div>
     <div v-if="!$route.meta.hideTabBar" class="layout-footer">
-      <van-sticky :container="container">
         <TabBar :data="tabTars" @change="handleChange" />
-      </van-sticky>
     </div>
   </div>
 </template>
@@ -52,9 +50,6 @@ export default {
   created() {
     this.getUserInfo();
   },
-  mounted() {
-    this.container = this.$refs.layouts;
-  },
   methods: {
     getUserInfo(){
       userInfo().then(info=>{

src/main.js

@@ -9,11 +9,11 @@ import Vant from 'vant';
 import 'vant/lib/index.css';
 import router from './router'
 import store from './store'
-// import VueQuickCalendar from 'vue-quick-calendar'
-// import dayjs from "dayjs";
+import dayjs from "dayjs";
 // 设置 js中可以访问 $cdn
 import { $cdn } from '@/config'
 Vue.prototype.$cdn = $cdn
+Vue.prototype.dayjs = dayjs
 // 移动端适配
 import 'amfe-flexible'
 
@@ -24,7 +24,6 @@ import VCalendar from 'v-calendar';
 import globals from "@/utils/global.js"//全局混入
 Vue.use(Vant);
 Vue.use(globals);
-// 
 Vue.use(VCalendar,{
   componentPrefix: 'vc',  // Use <vc-calendar /> instead of <v-calendar />
 });

src/utils/globalMixins.js

@@ -18,10 +18,7 @@ export default {
     }
   },
   computed:{
-    //根据字典类型获取字典值,返回字典label
-    getDicts(s,dict){
-      return  this[dict].find(v=> s == v.dictValue).dictLabel;
-    },
+
   },
   methods: {
     //根据字典类型获取字典值
@@ -33,6 +30,11 @@ export default {
         }
       })
     },
+    //根据字典类型获取字典值,返回字典label
+    getDicts(s,dict){
+      console.log(s,11111)
+      if( !this[dict]) return ;
+      return  this[dict].find(v=> s == v.dictValue).dictLabel;
+    },
   }
-
 }

src/views/menu/LZRegister/edit.vue

@@ -31,15 +31,15 @@
               <van-col span="12"  v-for="(v,i) in areaList" :key="v.areaid">
                 <div class="check-area" @click="clickArea(v,i)">
                   {{v.areaname}}
-                  <van-icon v-if="v.status" name="success" color="primary"/>
-                  <van-icon v-else name="fail" color="red"/>
+<!--                  <van-icon v-if="v.status" name="success" color="primary"/>-->
+<!--                  <van-icon v-else name="fail" color="red"/>-->
                 </div>
               </van-col>
             </van-row>
             <van-cell title="检查内容：" value="内容" />
             <van-cell :value="NFCNum" is-link>
               <template #title>
-                <span class="custom-title">NFC:</span>
+                <span>NFC:</span>
               </template>
 
 <!--              <template #right-icon>-->
@@ -51,44 +51,66 @@
         </van-panel>
       </div>
 
-      <div class="card" v-for="v in checkList" :key="v.itemid">
-        <van-panel :title="v.itemname">
-          <van-collapse v-model="activeNames">
-            <van-collapse-item v-for="(item,index) in v.checkitemlist" :title="item.itemname" :name="index" :key="item.itemid">
-              <van-cell :border="false" title="入侵报警撤防时间：">
+<!--      <div class="card" v-for="v in checkList" :key="v.itemid">-->
+<!--        <van-cell :title="v.itemname" >-->
+<!--          <template #label>-->
+<!--            <van-collapse v-model="activeNames" >-->
+<!--              <van-collapse-item v-for="(item,index) in v.checkitemlist" :title="item.pointname" :name="index" :key="item.itemid">-->
+<!--                <van-cell :border="false" title="入侵报警撤防时间：">-->
+<!--                  <template #right-icon>-->
+<!--                    <van-switch-->
+<!--                      v-model="v.checked"-->
+<!--                      inactive-color="#4fc08d"-->
+<!--                      active-color="orange"-->
+<!--                      size="20" />-->
+<!--                  </template>-->
+<!--                </van-cell>-->
+<!--                <van-cell-group v-show="v.checked">-->
+<!--                  <date-cell title="现金区"  v-model="date2"/>-->
+<!--                  <date-cell title="客户区" date-type="date" v-model="date1"/>-->
+<!--                  <date-cell title="整改期限" dateType="date" />-->
+<!--                  <select-cell title="测试" v-model="sss" :dict="'sys_business_type'" is-link/>-->
+<!--                </van-cell-group>-->
+<!--              </van-collapse-item>-->
+<!--            </van-collapse>-->
+<!--          </template>-->
+<!--        </van-cell>-->
+<!--      </div>-->
+
+
+      <div class="card" v-if="selectArea">
+        <van-collapse v-model="activeNames" v-for="v in checkList" :key="v.itemid">
+          <van-collapse-item :title="v.itemname" name="1" >
+            <div v-for="(item,index) in v.checkitemlist" :key="item.pointdataid">
+              <van-cell :border="false" :title="item.pointname">
                 <template #right-icon>
                   <van-switch
-                    v-model="checked"
+                    v-model="v.checked"
                     inactive-color="#4fc08d"
                     active-color="orange"
                     size="20" />
                 </template>
               </van-cell>
-            </van-collapse-item>
-          </van-collapse>
-        </van-panel>
-      </div>
-
+              <van-cell-group v-show="v.checked">
+                <van-field
+                  v-model="v.info"
+                  rows="1"
+                  autosize
+                  label="情况描述："
+                  type="textarea"
+                  placeholder="请输入"/>
+                <div class="upload-box">
+                  <van-uploader v-model="v.fileList" multiple />
+                </div>
+                <select-cell title="整改期限" v-model="v.endDate"  :dict="'rectification_period'" is-link/>
 
-<!--      <div class="card" v-if="selectArea">-->
-<!--        <van-collapse v-model="activeNames">-->
-<!--          <van-collapse-item title="布撤防检查" name="1">-->
-<!--            <van-cell :border="false" title="入侵报警撤防时间：">-->
-<!--              <template #right-icon>-->
-<!--                <van-switch-->
-<!--                  v-model="checked"-->
-<!--                  inactive-color="#4fc08d"-->
-<!--                  active-color="orange"-->
-<!--                  size="20" />-->
-<!--              </template>-->
-<!--            </van-cell>-->
-<!--            <van-cell-group v-show="checked">-->
-<!--              <date-cell title="现金区"  v-model="date2"/>-->
-<!--              <date-cell title="客户区" date-type="date" v-model="date1"/>-->
-<!--              <date-cell title="整改期限" dateType="date" />-->
-<!--              <select-cell title="测试" v-model="sss" :dict="'sys_business_type'" is-link/>-->
-<!--            </van-cell-group>-->
-<!--          </van-collapse-item>-->
+<!--                <date-cell title="客户区" date-type="date" v-model="v.date1"/>-->
+<!--                <date-cell title="整改期限" dateType="date" />-->
+<!--                <select-cell title="测试" v-model="v.sss" :dict="'sys_business_type'" is-link/>-->
+              </van-cell-group>
+              <date-cell v-for="(val,ind) in item.protectionVo" :title="val.name"  v-model="val.statusUpdateTime" :key="val.id" date-type="datetime" />
+            </div>
+          </van-collapse-item>
 <!--          <van-collapse-item title="技防设备检查" name="2">-->
 <!--            <van-cell title="报警及通信设备状态是否良好：">-->
 <!--              <template #right-icon>-->
@@ -135,8 +157,8 @@
 <!--            </div>-->
 <!--            <van-cell title="整改期限" is-link/>-->
 <!--          </van-collapse-item>-->
-<!--        </van-collapse>-->
-<!--      </div >-->
+        </van-collapse>
+      </div >
 
       <p class="warning-msg">需要完成所有区域的履职内容才能提交内容</p>
       <div class=""></div>
@@ -175,7 +197,7 @@ export default {
       NFCNum:0,
     }
   },
-  created() {
+  mounted() {
     this.getData();
   },
   computed:{
@@ -208,7 +230,12 @@ export default {
     },
     activeArea(area,index){
       this.$nextTick(()=>{
-        document.getElementsByClassName('check-area')[index].classList.add('active');
+        let doms = document.getElementsByClassName('check-area');
+        console.log(doms,'doms')
+        Array.prototype.forEach.call(doms,item=>{
+          item.classList.remove('active');
+        })
+        doms[index].classList.add('active');
       })
       this.selectArea = area;
       this.checkList = area.checklist;
@@ -220,7 +247,9 @@ export default {
   }
 }
 </script>
+<style lang="scss">
 
+</style>
 <style lang="scss" scoped>
   .lz-edit{
     height: 100%;
@@ -237,12 +266,13 @@ export default {
   .check-area{
     background-color: #f1f1f1;
     margin: 10px;
-    padding:10px;
+    padding:20px;
     color:#aaa;
     border-radius: 6px;
     display: flex;
     justify-content: space-between;
     align-items: center;
+    box-shadow: 0 2px 6px #ddd;
   }
   .custom-title {
     align-self: center;

src/views/menu/LZRegister/index.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="lvzhi" >
+  <div class="lvzhi" ref="container"  @scroll="handleScroll" >
     <nav-bar></nav-bar>
-    <div class="lz-container" ref="container">
-      <van-sticky :container="container">
-        <DatePicker @change="changeDate"></DatePicker>
-      </van-sticky>
+    <van-sticky :container="container">
+      <DatePicker @change="changeDate"></DatePicker>
+    </van-sticky>
+    <div class="lz-container"  >
       <div class="lz-list">
         <div class="list-item">
           <p>今日履职</p>
@@ -143,11 +143,19 @@ export default {
   mounted() {
     this.container = this.$refs.container;
     this.initDatalist();
+    document.getElementById('lz-container')
   },
   computed:{
     ...mapGetters(['orgName','orgId']),
   },
+  watch:{
+
+  },
   methods:{
+    handleScroll(e){
+      let scrollTop = document.getElementById('container');
+      console.log(scrollTop,'555')
+    },
     //格式化时间范围
     formatTime(start,end,format){
       return `${dayjs(start).format(format)}-${dayjs(end).format(format)}`;
@@ -202,7 +210,7 @@ export default {
 <style lang="scss">
 .lvzhi{
   .van-cell-group{
-    min-height: 250px;
+    min-height: 400px;
     background-color: #fff;
   }
 }
@@ -210,7 +218,7 @@ export default {
 <style lang="scss" scoped>
   .lvzhi{
     height: 100%;
-    overflow: hidden;
+    overflow: scroll;
   }
   .lz-container{
     overflow: auto;

src/views/menu/monitoringCall/index.vue

@@ -159,7 +159,7 @@ export default {
       this.fieldValue=''
       this.selectListAppHandler()
     },
-    
+
     //初始化
     init() {
       //获取组织机构数据
@@ -170,7 +170,7 @@ export default {
         }
       })
       this.selectListAppHandler()
-      
+
     },
     selectListAppHandler(){
       //获取任务列表
@@ -185,7 +185,7 @@ export default {
           }
         })
     },
-      
+
     //扫描NFC
     nfcHandler() {
       //NFC和图片对应字段先写死后期接入app之后再做更改
@@ -300,7 +300,7 @@ export default {
 .topBox {
   border: 1px solid #ccc;
   margin: 20px;
-  
+
   display: flex;
   .sonLeftBox {
     padding: 10px;
@@ -384,7 +384,7 @@ export default {
 }
 .spanimg {
   display: flex;
-  justify-content: end;
+  justify-content: flex-end;
   .close {
     width: 50px;
     height: 50px;

src/views/menu/workTime/index.vue

@@ -66,8 +66,9 @@
           <van-button round size="small" type="info" @click="copyMouth">点击复制</van-button>
         </template>
       </van-cell>
+
+      <van-button type="info" size="large" v-show="!formData.isDisabled" @click="onsubmit">提交</van-button>
     </div>
-    <van-button type="info" size="large" v-show="!formData.isDisabled" @click="onsubmit">提交</van-button>
   </div>
 </template>
 
@@ -214,7 +215,7 @@ export default {
   .works-time{
   }
   .form-box{
-    height: 100%;
+    height: calc(100vh - 200px);
     padding: 30px;
     overflow: auto;
   }