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

src/components/selectCell/index.vue

@@ -98,7 +98,14 @@ export default {
         let obj = {};
         obj[this.prop.label] = '全部';
         obj[this.prop.value] = null;
-        return [obj,...this.dataList];
+        if(this.dataList)
+        { // 如果 this.dataList 为null undefine 解构会报错
+          return [obj,...this.dataList];
+        }
+        else
+        {
+          return [obj]
+        }
       }
       return this.dataList;
     },

src/views/menu/cockpit/components/comprehensiveData.vue

@@ -111,7 +111,7 @@
               <div class="wj-title-blue font5vw">{{ parseInt(safetyCheck['整改率'] * 100) }}%</div>
             </van-col>
           </van-row>
-          <van-row class="boxCard" v-if="safetyCheck">
+          <!-- <van-row class="boxCard" v-if="safetyCheck">
             <van-col :span="24" class="titleSty">
               <span class="leftSty"></span><span>{{ '安全检查' }}</span>
             </van-col>
@@ -127,7 +127,7 @@
               <div>已取消</div>
               <div class="wj-title-blue font5vw">{{ safetyCheck['已取消'] }}</div>
             </van-col>
-          </van-row>
+          </van-row> -->
         </div>
       </van-tab>
       <van-tab title="安全检查">

src/views/menu/cockpit/components/overviewCom.vue

@@ -80,36 +80,46 @@
       </div>
     </div>
     <div class="businessModule">
-      <div class="moduleCom" v-for="(item, index) in Object.keys(allData.taskInfo)" :key="index">
+      <div class="moduleCom2" v-for="(item, index) in Object.keys(allData.taskInfo)" :key="index">
         <div class="titleText">
           <span class="leftSty"></span><span>{{ Object.keys(allData.taskInfo)[index] }}</span>
         </div>
-        <div class="complete">
+         <!-- <div class="complete">
           <div class="numCls wj-title-blue">
             {{ parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].currentCompletedRate * 100) }}%
           </div>
-
-        </div>
-        <div class="moduleItem">
+        </div> -->
+        <div class="moduleItem2">
           <div>
+            <!-- <div class="iconcls">
+              <van-icon name="circle" size="10px" />
+            </div> -->
+            <div class="fontCls">{{Object.keys(allData.taskInfo)[index]=='预案演练'?'当季完成率':'当月完成率'}}</div>
             <div class="numCls wj-title-blue">
-              {{ allData.taskInfo[Object.keys(allData.taskInfo)[index]].currentCompletedCount }}
-            </div>
-            <div class="fontCls">{{Object.keys(allData.taskInfo)[index]=='预案演练'?'当季完成数':'当月完成数'}}</div>
-          </div>
-          <div>
-            <div class="numCls wj-title-blue tal">
+              {{ parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].currentCompletedRate * 100) }}%
+              
+              <!-- {{ allData.taskInfo[Object.keys(allData.taskInfo)[index]].currentCompletedCount }} -->             
+            </div>    
+            <div class="iconcls">
               <van-icon v-if="allData.taskInfo[Object.keys(allData.taskInfo)[index]].compare  > 0" name="play" class="wj-title-red rate270" />
               <van-icon v-else name="play" class="wj-title-green rate" />
-              <span
-                >{{ Math.abs(parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].compare * 100)) }}%</span
-              >
-            </div>
-            <div class="fontCls">{{Object.keys(allData.taskInfo)[index]=='预案演练'?'完成率(较上季)':'完成率(较上月)'}}</div>
+            </div>        
+          </div>
+          <div>
+            <!-- <div class="iconcls">
+              <van-icon name="circle" size="10px" />
+            </div> -->
+            <div class="fontCls">{{Object.keys(allData.taskInfo)[index]=='预案演练'?'上季完成率':'上月完成率'}}</div>
+            <div class="numCls wj-title-blue tal">    
+              <span>{{ Math.abs(parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].prevCompletedRate * 100)) }}%</span>
+            </div>   
+          <div>
+              <span></span>       
           </div>
         </div>
       </div>
     </div>
+    </div>
   </div>
 </template>
 <script>
@@ -297,6 +307,53 @@ export default {
   }
 }
 
+.moduleCom2 {
+  width: 47%;
+  height: 200px;
+  background-color: #fff;
+  margin-top: 20px;
+  padding: 10px;
+  box-shadow: 0 2px 10px #ccc;
+  // border-left: 1px solid #008cd6;
+  position: relative;
+
+  .moduleItem2 {
+    margin-top: 27px;
+    // display: flex;
+    text-align: center;
+    align-content: center;
+    justify-content: space-around;
+    line-height: 30px;
+    .numCls {
+      font-size: 30px;
+      margin-bottom: 10px;
+      padding-top: 10px;
+      margin-right: 30px;
+    }
+    .iconcls {
+        font-size: 30px;
+      }
+    .textCCls {
+      text-align: right;
+    }
+    > div {
+      // width: 42%;
+      margin-left: 40px;
+      display: flex;
+      justify-content: flex-start;
+    }
+    .fontCls {
+      font-size: 25px;
+      padding-top:10px ;
+      margin-right: 30px;
+    }
+    .ga38cls{
+      text-align: center;
+    }
+  }
+}
+
+
 .businessModule {
   display: flex;
   flex-wrap: wrap;
@@ -305,6 +362,9 @@ export default {
   .moduleCom {
     margin: 10px;
   }
+  .moduleCom2 {
+    margin: 10px;
+  }
 }
 
 .rate {
@@ -334,8 +394,8 @@ export default {
 }
 ::v-deep.van-icon-play {
   font-size: 40px;
-  position: absolute;
-  left: 49%;
-  top: 62%;
+  // position: absolute;
+  // left: 49%;
+  // top: 62%;
 }
 </style>