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

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

@@ -446,15 +446,15 @@ export default {
      * 安全隐患大屏数据
      */
     safeListDP() {
-      safeRisks().then(res=>{
+      safeRisks().then((res) => {
         res.data.forEach((value, index) => {
           this.safetyList.forEach((value1, index1) => {
             if (value.type == value1.type) {
-              this.safetyList[index1].value = value.count
+              this.safetyList[index1].value = value.count;
             }
-          })
-        })
-      })
+          });
+        });
+      });
     },
  /**
      * 通报完成情况
@@ -543,7 +543,13 @@ export default {
       this.dialogStatus = true;
     },
     rowDetails(e) {
-        if(!e.target.dataset.url) return
+      if (!e.target.dataset.url) {
+        this.$message({
+          message: "该记录暂无文件！",
+          type: "warning",
+        });
+        return;
+      }
       this.fileExtension = e.target.dataset.url.substring(
         e.target.dataset.url.lastIndexOf(".") + 1
       );
@@ -558,13 +564,18 @@ export default {
           method: "get",
           responseType: "blob", // 设置响应文件格式
           url: process.env.VUE_APP_BASE_API2 + e.target.dataset.url,
-        }).then(({ data }) => {
+        })
+          .then(({ data }) => {
             if (data) {
+              
               this.dialogDetails = true;
               this.$nextTick(() => {
                 docx.renderAsync(data, this.$refs.file1); // 渲染到页面预览
               });
             }
+          })
+          .catch((error) => {
+            this.$message.error(error);
           });
       }
 

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

@@ -70,10 +70,9 @@ export default {
   },
   methods: {
     getDataList() {
-      wordCloud().then((res) => {
-        res.data.forEach((value) => {
+      this.$store.getters.dictObject["tc_cy_type"].forEach((value) => {
         this.data.push({
-            name: this.$filterDict("tc_cy_type", value.type),
+          name: value.dictLabel,
           count: 888,
         });
       });
@@ -81,7 +80,6 @@ export default {
         this.init();
         this.animate();
       });
-      });
     },
     init() {
       const tags = document.querySelectorAll(".tag");