Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.5

src/components/Calendar/index.vue

@@ -110,6 +110,7 @@ export default {
     },
     //获取工作时间列表
     getWorkTimeList(data){
+      this.attrs = [];
       workTimeList(data).then(res=>{
         let list = res.data.map(v=>{
           if(v.ymdDate == dayjs( new Date()).format('YYYY-MM-DD')){
@@ -126,6 +127,7 @@ export default {
             dates: dayjs(v.ymdDate).format('YYYY-MM-DD'),
           }
         });
+        console.log(list,'list')
         this.attrs = list;
         this.date = new Date();
       })

src/views/menu/problemItem/edit.vue

@@ -286,7 +286,7 @@ export default {
     //页面跳转逻辑
     toPagesFcn(){
       this.getRouter();
-      if(this.fromPage.name === "works"){
+      if(this.fromPages.name === "works"){
         this.$router.go(-1)
       }else {
         this.$router.replace({

src/views/menu/safetyBook/detail.vue

@@ -6,7 +6,7 @@
         <van-cell-group>
           <van-cell class="item-cell" title="签署层级" :value="getDictLabel(dataInfo.signLevel,'sign_level')" ></van-cell>
           <van-cell class="item-cell" title="责任书类型" :value="getDictLabel(dataInfo.type,'safety_book_type')" ></van-cell>
-          <van-cell class="item-cell" title="所属年份" :value="`${dataInfo.year}年`" ></van-cell>
+          <van-cell class="item-cell" title="所属年度" :value="`${dataInfo.year}年`" ></van-cell>
           <van-cell class="item-cell" title="甲方姓名" :value="dataInfo.partyA" ></van-cell>
           <van-cell class="item-cell" title="甲方机构" :value="dataInfo.partyAOrgName"></van-cell>
           <van-cell class="item-cell" title="乙方姓名" :value="dataInfo.partyB" ></van-cell>

src/views/menu/safetyBook/index.vue

@@ -19,7 +19,7 @@
               <van-cell class="item-cell" title="甲方机构" :value="v.partyAOrgName"></van-cell>
               <van-cell class="item-cell" title="乙方姓名" :value="v.partyB" ></van-cell>
               <van-cell class="item-cell" title="乙方机构" :value="v.partyBOrgName" ></van-cell>
-              <van-cell class="item-cell" title="所属年份" :value="`${v.year} 年`" >
+              <van-cell class="item-cell" title="所属年度" :value="`${v.year} 年`" >
               </van-cell>
 <!--              <van-cell class="item-cell" title="添加时间" :value="dayjs(v.createTime).format('YYYY-MM-DD HH:mm')">-->
 <!--              </van-cell>-->
@@ -127,7 +127,7 @@ export default {
 
 }
 .scroll-box{
-  padding:0 20px;
+  padding:0 20px 20px;
   width: 100%;
   height:calc(100vh - 284px);
   overflow: auto;

src/views/menu/securityCheckRegister/add.vue

@@ -530,7 +530,7 @@ export default {
     //页面跳转逻辑
     toPagesFcn(){
       this.getRouter();
-      if(this.fromPage.name === "works"){
+      if(this.fromPages.name === "works"){
         this.$router.go(-1)
       }else {
         this.$router.replace({

src/views/menu/visitCheck/detail.vue

@@ -128,7 +128,7 @@ export default {
     //页面跳转逻辑
     toPagesFcn(){
       this.getRouter();
-      if(this.fromPage.name === "works"){
+      if(this.fromPages.name === "works"){
         this.$router.go(-1)
       }else {
         this.$router.replace({