dedsudiyu hai 10 meses
pai
achega
b8a585831b

+ 28 - 50
src/views/courtyardManage/courtyardHome.vue

@@ -111,9 +111,7 @@
                       <i>{{item.deptName}}</i>
                       <i>{{item.typeName}}</i>
                       <i>{{item.levelName}}</i>
-                      <div class="left_t_r2_b_i6">
-                        <i>{{item.status?'已执行':'未执行'}}</i>
-                      </div>
+                      <i>{{item.status?'已执行':'未执行'}}</i>
                     </li>
                   </div>
 
@@ -490,7 +488,14 @@ export default {
     },
     //工作通知
     openInfoUrl(item,type){
-      this.$router.push({path:'./workInfoDetail',query:item,type:type})
+      this.$router.push(
+          {
+              path:'./workInfoDetail',
+              query:{
+                  item:item,
+                  type:type
+              },
+          })
     },
     //工作计划
     openPlanUrl(){
@@ -836,10 +841,9 @@ export default {
     },
       //分级管控
     laboratoryGradeManageList(){
-      laboratoryGradeManageList({pageNum:1,pageSize:9,type:localStorage.getItem('deptLevel')}).then((res) =>{
+      laboratoryGradeManageList({page:1,pageSize:9,type:localStorage.getItem('deptLevel')}).then((res) =>{
         if(res.code==200){
-          let data=res.data;
-          this.controlList=data.data.records;
+            this.$set(this,'controlList',res.data.records);
         }
       })
     },
@@ -2046,26 +2050,22 @@ export default {
                 line-height: 50px;
                 white-space:nowrap;overflow:hidden;text-overflow:ellipsis;
               }
-              >i:nth-of-type(1){
-                width: 140px;
+              >i:nth-child(1){
+                width: 130px;
                 margin-left: 22px;
               }
-              >i:nth-of-type(2){
-                width: 140px;
+              >i:nth-child(2){
+                width: 120px;
               }
-              >i:nth-of-type(3){
+              >i:nth-child(3){
                 width: 140px;
               }
-              >i:nth-of-type(4){
-                width: 102px;
-              }
-              >i:nth-of-type(5){
-                width: 108px;
-              }
-              >i:nth-of-type(6){
+              >i:nth-child(4){
                 width: 140px;
               }
-
+              >i:nth-child(5){
+                width: 80px;
+              }
             }
             .left_t_r2_b{
               >li{
@@ -2083,43 +2083,21 @@ export default {
                   line-height: 40px;
                   white-space:nowrap;overflow:hidden;text-overflow:ellipsis;
                 }
-                >i:nth-of-type(1){
-                  width: 140px;
+                >i:nth-child(1){
+                  width: 130px;
                   margin-left: 22px;
                 }
-                >i:nth-of-type(2){
-                  width: 140px;
-                }
-                >i:nth-of-type(3){
-                  width: 140px;
+                >i:nth-child(2){
+                  width: 120px;
                 }
-                >i:nth-of-type(4){
+                >i:nth-child(3){
                   width: 140px;
                 }
-                >i:nth-of-type(5){
-                  width: 108px;
-                }
-                >i:nth-of-type(6){
+                >i:nth-child(4){
                   width: 140px;
                 }
-                .left_t_r2_b_i6{
-
-                  width: 140px;
-                  display: flex;
-                  justify-content: flex-start;
-                  align-items: center;
-                  >progress{
-                    width: 90px;
-                  }
-                  >i{
-                    display: inline-block;
-                    width: 40px;
-                    font-size: 14px;
-                    font-family: Microsoft YaHei;
-                    font-weight: 400;
-                    color: #FFFFFF;
-                    margin-left: 6px;
-                  }
+                >i:nth-child(5){
+                  width: 80px;
                 }
               }
               .controlColorOne{

+ 4 - 3
src/views/courtyardManage/workInfoDetail.vue

@@ -14,7 +14,8 @@
             </div>
             <div class="title" v-if="type == 3">{{codeData.name}}</div>
             <div class="main_t_b" v-if="type == 3">
-                <p v-html="codeData.content"></p>
+                <p style="margin-bottom:20px;">{{codeData.deptName}} - {{codeData.typeName}} - {{codeData.levelName}}</p>
+                <p>{{codeData.manageDes}}</p>
                 <div class="unit">{{codeData.status?'已执行':'未执行'}}</div>
                 <div class="time">{{parseTime(codeData.createTime,"{y}-{m}-{d}")}}</div>
             </div>
@@ -45,8 +46,8 @@ export default {
 
   },
   mounted() {
-      this.$set(this,'type',this.$route.type);
-      this.$set(this,'codeData',this.$route.query);
+      this.$set(this,'type',this.$route.query.type);
+      this.$set(this,'codeData',this.$route.query.item);
   },