Forráskód Böngészése

完成态势分析检查督导的渲染,新增态势分析Api,修改导航栏右侧显示用户名单位,更改要事日记修改拿不回数据的问题,修复查看word文档重复秘钥

sunyanqiang 3 éve
szülő
commit
1c882e7ba6

+ 8 - 0
src/api/taishi/taishi.js

@@ -63,3 +63,11 @@ export function getNumber() {
     method: "get"
   });
 }
+
+// 统计检查督导数量
+export function getJieCha() {
+  return request({
+    url: "/situation/situationinfo/unitrank",
+    method: "get"
+  });
+}

+ 3 - 3
src/components/look_word/bdgldiary.vue

@@ -199,7 +199,7 @@
           height="70"
           align="center"
           v-for="(items, index) in message.weekworkRegisters"
-          :key="index"
+          :key="index + ' '"
           v-show="
             message.weekworkRegisters != null ||
             message.weekworkRegisters.length > 0
@@ -375,7 +375,7 @@
         </tr>
         <tr
           v-for="(item, index) in message.inspect"
-          :key="index"
+          :key="index + '  '"
           class="JR_tr"
           style="font-family: 'fangsong'"
         >
@@ -551,7 +551,7 @@
           style="font-family: 'fangsong'"
           class="JR_tr"
           v-for="(item1, i) in message.kinsfolk"
-          :key="i"
+          :key="i + ''"
           v-show="message.kinsfolk != null || message.kinsfolk.length > 0"
         >
           <td class="JR_right" height="30">

+ 6 - 4
src/layout/components/Navbar.vue

@@ -15,8 +15,10 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="yong_hu">
-      <span class="span">单位 : {{ danWie }}</span>
-      <span>用户名 : {{ yongHu }}</span>
+      <span>单位 :</span>
+      <span class="span" style="padding-left: 4px">{{ danWie }}</span>
+      <span>用户名 :</span>
+      <span style="padding-left: 4px">{{ yongHu }}</span>
     </div>
     <div class="right-menu">
       <template v-if="device !== 'mobile'">
@@ -227,9 +229,9 @@ export default {
   display: inline-block;
   margin-top: 14px;
   font-size: 15px;
-  margin-left: 50%;
+  margin-left: 58%;
 }
 .span {
-  margin-right: 60px;
+  margin-right: 26px;
 }
 </style>

+ 4 - 2
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1518,8 +1518,10 @@ export default {
         this.getRenYuan(this.form.unitId);
         this.open = true;
         // 临时来对
-        if (response.data.kinsfolk[0].peopleId != null) {
-          this.relatives = response.data.kinsfolk;
+        if (response.data.kinsfolk != null) {
+          if (response.data.kinsfolk[0].peopleId != null) {
+            this.relatives = response.data.kinsfolk;
+          }
         }
         // 查铺查询
         if (

+ 43 - 25
src/views/taishi/index.vue

@@ -950,7 +950,10 @@
                 </div>
                 <div class="right3-r-main-item-r">
                   <div class="s1">移动载体</div>
-                  <div class="s2"><b style="color: #30fdff">{{smztlist[3]}}</b>台</div>
+                  <div class="s2">
+                    <b style="color: #30fdff">{{ smztlist[3] }}</b
+                    >台
+                  </div>
                 </div>
               </div>
               <div class="right3-r-main-item">
@@ -959,7 +962,10 @@
                 </div>
                 <div class="right3-r-main-item-r">
                   <div class="s1">手机</div>
-                  <div class="s2"><b style="color: #2bf1b2">{{smztlist[0]}}</b>台</div>
+                  <div class="s2">
+                    <b style="color: #2bf1b2">{{ smztlist[0] }}</b
+                    >台
+                  </div>
                 </div>
               </div>
               <div class="right3-r-main-item">
@@ -968,7 +974,10 @@
                 </div>
                 <div class="right3-r-main-item-r">
                   <div class="s1">电脑</div>
-                  <div class="s2"><b style="color: #30aaff">{{smztlist[1]}}</b>台</div>
+                  <div class="s2">
+                    <b style="color: #30aaff">{{ smztlist[1] }}</b
+                    >台
+                  </div>
                 </div>
               </div>
               <div class="right3-r-main-item">
@@ -977,7 +986,10 @@
                 </div>
                 <div class="right3-r-main-item-r">
                   <div class="s1">相机</div>
-                  <div class="s2"><b style="color: #9d83ff">{{smztlist[2]}}</b>台</div>
+                  <div class="s2">
+                    <b style="color: #9d83ff">{{ smztlist[2] }}</b
+                    >台
+                  </div>
                 </div>
               </div>
             </div>
@@ -998,11 +1010,13 @@ import {
   rizongwenyin,
   getNumber,
   juncheguanli,
+  getJieCha,
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
 import Cookies from "js-cookie";
 export default {
+  name: "TaiShi",
   data() {
     return {
       n: 8,
@@ -1020,9 +1034,9 @@ export default {
       //外出人员占比
       wclist: [],
       wylist: [],
-      smztlist:[],
+      smztlist: [],
       config: {
-        header: [ "防疫名称", "现有数量"],
+        header: ["防疫名称", "现有数量"],
         data: [
           ["行1列1", "行1列2"],
           ["行2列1", "行2列2"],
@@ -1084,14 +1098,16 @@ export default {
         { name: "值班通信员", value: "" },
         { name: "值班分队", value: "" },
       ],
+      // 检查督导
+      jianCanName: [],
+      jianCanScore: [],
     };
   },
   created() {
-    if(Cookies.get('shuaxin')!='true'){
-       window.location.reload()
-       
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
     }
-    Cookies.set('shuaxin','true');
+    Cookies.set("shuaxin", "true");
     //大队人员在位数据
     zaiweipeople().then((res) => {
       if (res.code == 200) {
@@ -1104,7 +1120,7 @@ export default {
     });
     //今日值班
     jinrizhiban().then((res) => {
-      if (res.data!=null) {
+      if (res.data != null) {
         this.jrzblist = [];
         for (var i in res.data) {
           if (i == "chiefDutyName") {
@@ -1153,7 +1169,7 @@ export default {
     //涉密移动载体
     getNumber().then((res) => {
       // console.log(res.data[0])
-      this.smztlist=res.data;
+      this.smztlist = res.data;
     });
     this.startTime();
   },
@@ -1743,8 +1759,18 @@ export default {
         myChartss.resize();
       });
     },
-    center4() {
+
+    async center4() {
       var myChart = echarts.init(document.getElementById("center-a-main"));
+      var jc = null;
+      // 检查督导
+      await getJieCha().then((res) => {
+        console.log(res);
+        for (var index = 0; index < res.data.score.length; index++) {
+          res.data.score[index] = res.data.score[index].slice(0, -3);
+        }
+        jc = res.data;
+      });
       var option = {
         color: ["#00CCFF"],
         tooltip: {
@@ -1760,15 +1786,7 @@ export default {
         xAxis: [
           {
             type: "category",
-            data: [
-              "发射一营",
-              "发射二营",
-              "测试营",
-              "测控营",
-              "阵地管理营",
-              "信息系统营",
-              "支援保障营",
-            ],
+            data: jc.name,
             axisTick: {
               alignWithLabel: true,
             },
@@ -1825,7 +1843,7 @@ export default {
                 color: "#ff9000",
               },
             },
-            data: [500, 700, 900, 800, 700, 600, 800],
+            data: jc.score,
           },
           {
             name: "",
@@ -1833,7 +1851,7 @@ export default {
             symbolSize: [30, 10],
             symbolOffset: [0, 5],
             z: 12,
-            data: [500, 700, 900, 800, 700, 600, 800],
+            data: jc.score,
           },
           {
             type: "bar",
@@ -1844,7 +1862,7 @@ export default {
               },
             },
             barWidth: "30",
-            data: [500, 700, 900, 800, 700, 600, 800],
+            data: jc.score,
             markLine: {
               silent: true,
               symbol: "none",