Merge branch 'duhanyu' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/taicangZongzhi into dev

src/api/publicOpinion/index.js

@@ -16,7 +16,7 @@ export function yuqingMsgStats() {
         method: 'get',
     })
 }
-//动态筛选
+//动态筛选大屏幕接口（弃用）
 export function sift() {
     return request({
         url: '/zongzhi/opinionscreen/sentimentfilter',
@@ -43,4 +43,11 @@ export function yqbg() {
         url: '/zongzhi/opinionscreen/sentimentreport',
         method: 'get',
     })
+}
+//动态筛选列表
+export function dtsxListGet(){
+    return request({
+        url: '/zongzhi/sx/list',
+        method: 'get',
+    })
 }

src/views/privateOrder/security/components/ReportingStatistics.vue

@@ -376,7 +376,7 @@ export default {
       territorialTB().then((res) => {
         res.data.forEach((value, index) => {
           this.piedata.push({
-            name: this.$filterDict('1',value.areaId,true),
+            name: this.$filterDict('1',`[${value.areaId}]`,true),
             value: value.count,
             percent: value.pt,
             img: require(`@/assets/privateOrder/general/${

src/views/privateOrder/security/components/componentRight.vue

@@ -30,7 +30,7 @@
                 <span>{{ notificationFinishList[3].completionCount }}</span>
                 <span>/{{ notificationFinishList[3].notificationCount }}</span>
               </div>
-              <div>{{ notificationFinishList[3].completionPercent }}</div>
+              <div>{{ notificationFinishList[3].completionPercent | numFilter }}%</div>
             </div>
           </div>
           <div class="right_table_list">
@@ -45,12 +45,11 @@
               class="table_item"
             >
               <div class="item_one">
-                百分比
                 {{ notificationStatus(item.timeRangeFlag) }}
               </div>
               <div class="item_two">{{ item.notificationCount }}</div>
               <div class="item_three">{{ item.completionCount }}</div>
-              <div class="item_four">{{ item.completionPercent }}</div>
+              <div class="item_four">{{ item.completionPercent | numFilter }}%</div>
             </div>
           </div>
         </div>
@@ -233,7 +232,7 @@
 </template>
 
 <script>
-import {safeRisks,tbFinish} from '@/api/wlSafe'
+import { safeRisks, tbFinish } from "@/api/wlSafe";
 import { listDanger, getDanger, listTb, getTb } from "@/api/zongzhi/st.js";
 import vueSeamlessScroll from "vue-seamless-scroll";
 import ModuleTitle from "../../common/ModuleTitle.vue";
@@ -338,13 +337,13 @@ export default {
           timeRangeFlag: 3,
           notificationCount: 0,
           completionCount: 0,
-          completionPercent: '',
+          completionPercent: "",
         },
         {
           timeRangeFlag: 4,
           notificationCount: 0,
           completionCount: 0,
-          completionPercent: '',
+          completionPercent: "",
         },
       ],
       animate: true,
@@ -421,7 +420,7 @@ export default {
     }, 6000);
     //大屏安全隐患数据
     this.safeListDP();
-    this.getTBOver()
+    this.getTBOver();
     // this.announceChange()
 
     // getSafeHazardSatistic().then((res) => {
@@ -457,18 +456,19 @@ export default {
         });
       });
     },
- /**
+    /**
      * 通报完成情况
      */
-    getTBOver(){
-      tbFinish().then(res=>{
+    getTBOver() {
+      tbFinish().then((res) => {
         console.log(res);
-        res.data.forEach((value1,index1)=>{
-          this.notificationFinishList[index1].notificationCount  =value1.count 
-          this.notificationFinishList[index1].completionCount  =value1.complete
-          this.notificationFinishList[index1].completionPercent  =value1.pt  * 100 + '%'
-        })
-      })
+        res.data.forEach((value1, index1) => {
+          this.notificationFinishList[index1].notificationCount = value1.count;
+          this.notificationFinishList[index1].completionCount = value1.complete;
+          this.notificationFinishList[index1].completionPercent =
+            value1.pt * 100;
+        });
+      });
     },
     /**
      * 最新隐患
@@ -568,7 +568,6 @@ export default {
         })
           .then(({ data }) => {
             if (data) {
-              
               this.dialogDetails = true;
               this.$nextTick(() => {
                 docx.renderAsync(data, this.$refs.file1); // 渲染到页面预览

src/views/privateOrder/sentiment/components/componentLeft.vue

@@ -76,7 +76,7 @@
                 :step="oldNewsCount" -->
               <NumberGrow
                 class="yV"
-                :value="dtsx.count1"
+                :value="dtsx.jcxxCount"
                 :step="oldNewsCount"
               ></NumberGrow>
             </div>
@@ -85,19 +85,19 @@
               <!-- :value="newsCount - warningCount" -->
               <NumberGrow
                 class="bV"
-                :value="dtsx.count2"
+                :value="dtsx.pcxxCount"
                 :step="oldNewsCount - oldWarningCount"
               ></NumberGrow>
             </div>
             <div class="total">
               <div class="name">舆情预警</div>
               <div class="warn">
-                {{ dtsx.pt }}
+                {{ dtsx.yqyjCount || 0 }}
               </div>
               <div class="total_info">
                 <!-- :value="warningCount" -->
                 <NumberGrow
-                  :value="dtsx.count3"
+                  :value="dtsx.yqyjZb"
                   :step="oldWarningCount"
                 ></NumberGrow>
               </div>
@@ -228,7 +228,7 @@ import {
 } from "@/api/common";
 import { title } from "../../../../settings";
 //=======
-import { yuqingChart, yuqingMsgStats, sift } from "@/api/publicOpinion";
+import { yuqingChart, yuqingMsgStats, dtsxListGet } from "@/api/publicOpinion";
 import { yuqingListA, getWlyq } from "@/api/consensusList";
 
 export default {
@@ -499,6 +499,7 @@ export default {
     // 获取舆情走势图的数据
     getyqData() {
       yuqingChart().then((res) => {
+        console.log(res);
         this.allDate = res.data;
         //已经排序过的数组
         this.allDate.sort(function (a, b) {
@@ -541,6 +542,7 @@ export default {
     getyqMsgStats() {
       yuqingMsgStats().then((res) => {
         let arr = res.data;
+        if(!arr) return
         this.Statistics.forEach((value1, index1) => {
           arr.forEach((value2, index2) => {
             if (value1.type == value2.type) {
@@ -551,9 +553,8 @@ export default {
           });
         });
       });
-      sift().then((res) => {
-        console.log(res);
-        this.dtsx = res.data[0];
+      dtsxListGet().then((res) => {
+        this.dtsx = res.rows[0];
       });
     },
     // 折线图

src/views/privateOrder/sentiment/components/mediaPie.vue

@@ -93,6 +93,7 @@ export default {
     getData() {
       yuqingTypes({ type: "1" }).then((res) => {
         res.data.forEach((value, index) => {
+          if(!value) return
           this.types.forEach((value1, index1) => {
             if (value.type == value1) {
               this.piedata[index1].value = value.pt;

src/views/privateOrder/sentiment/components/sentimentPie.vue

@@ -42,35 +42,35 @@ export default {
       imgList: [
         {
           url: require("@/assets/sentimeent/1.png"),
-          type: 9,
+          type: 1,
         },
         {
           url: require("@/assets/sentimeent/2.png"),
-          type: 10,
+          type: 2,
         },
         {
           url: require("@/assets/sentimeent/3.png"),
-          type: 11,
+          type: 3,
         },
         {
           url: require("@/assets/sentimeent/4.png"),
-          type: 12,
+          type: 4,
         },
         {
           url: require("@/assets/sentimeent/5.png"),
-          type: 13,
+          type: 5,
         },
         {
           url: require("@/assets/sentimeent/6.png"),
-          type: 14,
+          type: 6,
         },
         {
           url: require("@/assets/sentimeent/7.png"),
-          type: 15,
+          type: 7,
         },
         {
           url: require("@/assets/sentimeent/8.png"),
-          type: 16,
+          type: 8,
         },
       ],
       piedata: [
@@ -128,6 +128,8 @@ export default {
     getData() {
       yuqingTypes({ type: "2" }).then((res) => {
         res.data.forEach((value, index) => {
+          console.log(value);
+          if(!value) return
           this.imgList.forEach((value1, index1) => {
             if (value.type == value1.type) {
               this.piedata[index1].value = value.pt;