From d94ae233bbd0334f6d6cd0977bcb09ff875e7413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Wed, 20 Sep 2023 16:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=9A=90=E6=82=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/wlSafe/index.js                       |   8 ++
 src/views/privateOrder/Screen.vue             | 134 +++++++++---------
 .../security/components/componentRight.vue    |  83 +++++------
 vue.config.js                                 |   2 +-
 5 files changed, 119 insertions(+), 110 deletions(-)

diff --git a/.env.development b/.env.development
index 8331a0c..ea2d4b8 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,6 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = '/dashboard'
 
-VUE_APP_BASE_API2 = 'http://192.168.0.109:9027'
+VUE_APP_BASE_API2 = 'http://39.101.188.84:9027'
 
 BASE_API = 'http://10.10.3.35:9070'
diff --git a/src/api/wlSafe/index.js b/src/api/wlSafe/index.js
index 0632e5b..1303e3a 100644
--- a/src/api/wlSafe/index.js
+++ b/src/api/wlSafe/index.js
@@ -59,3 +59,11 @@ export function departmentList(data) {
     params: data,
   });
 }
+// 查询安全隐患统计列表
+export function listCounty(query) {
+  return request({
+    url: "/zongzhi/county/list",
+    method: "get",
+    params: query,
+  });
+}
diff --git a/src/views/privateOrder/Screen.vue b/src/views/privateOrder/Screen.vue
index ffca71c..51cfd46 100644
--- a/src/views/privateOrder/Screen.vue
+++ b/src/views/privateOrder/Screen.vue
@@ -1,76 +1,76 @@
 <template>
-  <div class="pc">
-    <div class="container">
-      <div class="main-container">
-        <div class="top_nav">
-          <div class="top_left">
-            <router-link
-              v-for="item in menus.slice(0, 2)"
-              :key="item.id"
-              class="nav_item left_nav"
-              active-class="selected_nav"
-              exact
-              :to="{ path: item.path }"
-            >
-              {{ item.name }}
-            </router-link>
-          </div>
-          <div class="center_title">太仓市网络综合治理平台</div>
-          <div class="top_right">
-            <router-link
-              v-for="item in menus.slice(2, 4)"
-              :key="item.id"
-              class="nav_item right_nav"
-              active-class="selected_nav"
-              exact
-              :to="{ path: item.path }"
-            >
-              {{ item.name }}
-            </router-link>
-          </div>
-          <div class="time-wrap">
-            <div class="icon" />
-            <span class="date">{{ now.date }}</span>
-            <span class="time">
-              {{ now.hour + ":" + now.minute + ":" + now.second }}
-            </span>
-          </div>
-          <div class="year-wrap"></div>
+  <!-- <div class="pc"> -->
+  <div class="container">
+    <div class="main-container">
+      <div class="top_nav">
+        <div class="top_left">
+          <router-link
+            v-for="item in menus.slice(0, 2)"
+            :key="item.id"
+            class="nav_item left_nav"
+            active-class="selected_nav"
+            exact
+            :to="{ path: item.path }"
+          >
+            {{ item.name }}
+          </router-link>
         </div>
-        <router-view />
-      </div>
-      <div>
-        <el-button
-          v-if="!dialogDetails && $route.name === '网络舆情'"
-          type="primary"
-          style="
-            background-color: rgba(255, 255, 255, 0.2);
-            position: absolute;
-            top: 160px;
-            left: 1600px;
-            z-index: 9999;
-          "
-          @click="dialogDetails = !dialogDetails"
-          >切换</el-button
-        >
+        <div class="center_title">太仓市网络综合治理平台</div>
+        <div class="top_right">
+          <router-link
+            v-for="item in menus.slice(2, 4)"
+            :key="item.id"
+            class="nav_item right_nav"
+            active-class="selected_nav"
+            exact
+            :to="{ path: item.path }"
+          >
+            {{ item.name }}
+          </router-link>
+        </div>
+        <div class="time-wrap">
+          <div class="icon" />
+          <span class="date">{{ now.date }}</span>
+          <span class="time">
+            {{ now.hour + ":" + now.minute + ":" + now.second }}
+          </span>
+        </div>
+        <div class="year-wrap"></div>
       </div>
-      <el-dialog
-        v-if="dialogDetails"
-        v-el-drag-dialog
-        class="screen-dialog"
-        :visible.sync="dialogDetails"
-        width="2530px"
-        top="20px"
-        :modal-append-to-body="true"
-        center
-        :modal="false"
+      <router-view />
+    </div>
+    <div>
+      <el-button
+        v-if="!dialogDetails && $route.name === '网络舆情'"
+        type="primary"
+        style="
+          background-color: rgba(255, 255, 255, 0.2);
+          position: absolute;
+          top: 160px;
+          left: 1600px;
+          z-index: 9999;
+        "
+        @click="dialogDetails = !dialogDetails"
+        >切换</el-button
       >
-        <div class="iframeBox">
-          <commandControl />
-        </div>
-      </el-dialog>
     </div>
+    <el-dialog
+      v-if="dialogDetails"
+      v-el-drag-dialog
+      class="screen-dialog"
+      :visible.sync="dialogDetails"
+      width="2530px"
+      top="20px"
+      :modal-append-to-body="true"
+      center
+      :modal="false"
+    >
+      <div class="iframeBox">
+        <commandControl />
+      </div>
+    </el-dialog>
   </div>
+  <!-- </div> -->
 </template>
 
 <script>
diff --git a/src/views/privateOrder/security/components/componentRight.vue b/src/views/privateOrder/security/components/componentRight.vue
index 397718d..be27159 100644
--- a/src/views/privateOrder/security/components/componentRight.vue
+++ b/src/views/privateOrder/security/components/componentRight.vue
@@ -6,8 +6,8 @@
         <div class="safetyBox">
           <div v-for="(item, idx) in safetyList" :key="idx">
             <div class="safetyBox_item">
-              <div class="pone">{{ item.value | commaFilter }}</div>
-              <div class="ptwo">{{ item.title }}</div>
+              <div class="pone">{{ item.totalNum | commaFilter }}</div>
+              <div class="ptwo">{{ item.typeName }}</div>
             </div>
           </div>
         </div>
@@ -236,7 +236,7 @@
 </template>
 
 <script>
-import { safeRisks, tbFinish } from "@/api/wlSafe";
+import { safeRisks, tbFinish, listCounty } 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";
@@ -292,36 +292,36 @@ export default {
       trouble: { options: ["最新隐患", "通报处置"] },
       // 安全隐患
       safetyList: [
-        {
-          title: "敏感信息泄露漏洞",
-          value: 0,
-          type: 1,
-        },
-        {
-          title: "权限许可和访问控制",
-          type: 2,
-          value: 0,
-        },
-        {
-          title: "未加密登录请求",
-          value: 0,
-          type: 3,
-        },
-        {
-          title: "其他",
-          type: 6,
-          value: 0,
-        },
-        {
-          title: "应用程序测试脚本漏洞",
-          type: 4,
-          value: 0,
-        },
-        {
-          title: "文件上传漏洞",
-          type: 5,
-          value: 0,
-        },
+        // {
+        //   title: "敏感信息泄露漏洞",
+        //   value: 0,
+        //   type: 1,
+        // },
+        // {
+        //   title: "权限许可和访问控制",
+        //   type: 2,
+        //   value: 0,
+        // },
+        // {
+        //   title: "未加密登录请求",
+        //   value: 0,
+        //   type: 3,
+        // },
+        // {
+        //   title: "其他",
+        //   type: 6,
+        //   value: 0,
+        // },
+        // {
+        //   title: "应用程序测试脚本漏洞",
+        //   type: 4,
+        //   value: 0,
+        // },
+        // {
+        //   title: "文件上传漏洞",
+        //   type: 5,
+        //   value: 0,
+        // },
       ],
       // 通报完成情况
       notificationFinishList: [
@@ -450,14 +450,15 @@ export default {
      * 安全隐患大屏数据
      */
     safeListDP() {
-      safeRisks().then((res) => {
-        res.data.forEach((value, index) => {
-          this.safetyList.forEach((value1, index1) => {
-            if (value.type == value1.type) {
-              this.safetyList[index1].value = value.count;
-            }
-          });
-        });
+      listCounty().then((res) => {
+        this.safetyList = res.rows;
+        // res.data.forEach((value, index) => {
+        //   this.safetyList.forEach((value1, index1) => {
+        //     if (value.type == value1.type) {
+        //       this.safetyList[index1].value = value.count;
+        //     }
+        //   });
+        // });
       });
     },
     /**
diff --git a/vue.config.js b/vue.config.js
index 6e02ea5..a5df024 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   // publicPath: './',
-  publicPath: "/demo/taicangzongzhi2",
+  publicPath: "/demo/taicangzongzhi",
   outputDir: "dist",
   assetsDir: "static",
   lintOnSave: process.env.NODE_ENV === "development",