Merge branch 'dev-yjl' into 'shenzhen-dev'

修改中建四大屏（页面调整）

See merge request !100

src/views/companyFront/project/overview.vue

@@ -906,30 +906,44 @@ export default {
       //     }, 1000)
       // })
     },
-    //地图跳转到下一级
+    // 地图跳转到下一级
     mapJumpToNext(index) {
+      console.log("test1");
       var _this = this;
-      console.log("mapJumpToNext",_this.mapData[index].list);
       if (_this.mapData[index].list) {
+        console.log("test2");
         var json = {
           sn: _this.mapData[index].companySn,
           name: _this.mapData[index].name,
         };
+        _this.backArr.forEach(element=>{
+            if(element.name==json.name){
+                return
+            }
+        })
         _this.backArr.push(json);
         _this.$store.commit("setMapBackArr", _this.backArr);
         _this.showMapDialog = false;
+        _this.initData()
       } else {
-        //这里的4指除去总公司外的层级数
+        console.log("test3");
-        // if (_this.mapData[index].projectName && _this.backArr.length < 3) {
+        if (_this.mapData[index].projectName && _this.backArr.length < 3) {
-        if (_this.mapData[index].projectName && _this.backArr.length < 4) {
+          console.log("test4");
           var json = {
             sn: _this.mapData[index].projectSn,
             name: _this.mapData[index].name,
           };
+          _this.backArr.forEach(element=>{
+              if(element.name==json.name){
+                  return
+              }
+          })
           _this.backArr.push(json);
           _this.$store.commit("setMapBackArr", _this.backArr);
           _this.showMapDialog = false;
-          console.log('执行888');
+          _this.initData()
+        } else {
+          _this.$message("该区域下没有数据！");
         }
       }
     },

src/views/projectAdmin/fourEngin/command/rightThree.vue

@@ -12,11 +12,11 @@
             :color="['#6EE4F0', '#E7622A']"
             :data="[
               {
-                value: 5,
+                value: safetyPatrolInspection.allClose,
                 name: '已巡检',
               },
               {
-                value: 5,
+                value: safetyPatrolInspection.allNoClose,
                 name: '未巡检',
               },
             ]"

src/views/projectAdmin/fourEngin/command/rightTwo.vue

@@ -40,11 +40,11 @@
             :color="['#6EE4F0', '#E7622A']"
             :data="[
               {
-                value: 5,
+                value: safetyPatrolInspection.allRectificationNum,
                 name: '已巡检',
               },
               {
-                value: 5,
+                value: safetyPatrolInspection.allNoRectificationNum,
                 name: '未巡检',
               },
             ]"

src/views/projectAdmin/fourEngin/progress/uav.vue

@@ -108,6 +108,7 @@ export default {
       background-size: 90% 100%;
       font-size: 16px;
       margin-top: 20px;
+      cursor: pointer;
       .areaName {
         font-size: 20px;
         span {

src/views/projectAdmin/fourEngin/quality/centerBottom.vue

@@ -188,7 +188,7 @@ export default {
   ::v-deep .el-range-input {
     cursor: pointer;
     background: transparent;
-    color: #6ee4f0;
+    color: #fff;
   }
   ::v-deep .el-date-editor {
     cursor: pointer;

src/views/projectAdmin/fourEngin/quality/rightBottom.vue

@@ -231,7 +231,7 @@ export default {
 ::v-deep .el-range-input {
   cursor: pointer;
   background: transparent;
-  color: #6ee4f0;
+  color: #fff;
 }
 ::v-deep .el-date-editor {
   cursor: pointer;

src/views/projectAdmin/fourEngin/sourse/leftCenter.vue

@@ -1,7 +1,7 @@
 <template>
   <Card title="偏差预警">
     <div class="list">
-      <div style="margin-left: 436px; position: absolute; margin-top: -20px">
+      <div style="margin-left: 436px; position: absolute; margin-top: -20px;cursor: pointer">
         <el-date-picker
           v-model="checkDate"
           type="month"

src/views/projectAdmin/fourEngin/sourse/leftTop.vue

@@ -10,7 +10,7 @@
             <el-option v-for="item in typesList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
           </el-select>
         </div>
-        <div style="margin-left: 20px;">
+        <div style="margin-left: 20px;"  class="curs">
           <el-date-picker
       v-model="checkDate"
       type="month"
@@ -150,6 +150,10 @@ export default {
       line-height: 40px;
       margin: 0 20px 0 0;
     }
+    .curs{
+      cursor: pointer;
+      height: 40px;
+    }
   }
 
   .contentTop {

src/views/projectAdmin/fourEngin/sourse/rightTop.vue

@@ -19,7 +19,7 @@
             </el-option>
           </el-select>
         </div>
-        <div style="margin-left: 20px">
+        <div style="margin-left: 20px:cursor: pointer;height:50px">
           <el-date-picker
             v-model="checkDate"
             type="year"

src/views/projectFront/informatioBroadcast/broadcast.vue

@@ -127,15 +127,22 @@
   </div>
 </template>
   <script>
-import { quillEditor } from "vue-quill-editor";
+// import { quillEditor } from "vue-quill-editor";
+import VueQuillEditor from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
 import {
   addInformationBroadcastingApi, //新增
   deleteInformationBroadcastingApi, //删除
   updateInformationBroadcastingApi, //修改
   selectPageInformationBroadcastingApi, //分页查询
 } from "@/assets/js/api/broadcast.js";
-
 export default {
+  components:{
+    VueQuillEditor
+  },
   data() {
     return {
       type: "",
@@ -173,6 +180,8 @@ export default {
         },
         theme: "snow",
       },
+     
+
     };
   },
   computed: {