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

.env.development

@@ -5,5 +5,6 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dashboard'
 
 VUE_APP_BASE_API2 = 'http://192.168.0.106:9027'
+VUE_APP_BASE_API3 = 'http://39.101.188.84:9027'
 
 BASE_API = 'http://10.10.3.35:9070'

src/api/zongzhi/manage.js

@@ -0,0 +1,43 @@
+import request from "@/utils/request.js";
+
+// 清朗专项行动数据统计 /zongzhi/managescreen/action
+export function managescreen() {
+  return request({
+    url: "/zongzhi/managescreen/action",
+    method: "get",
+  });
+}
+
+// 举报总数和处置率
+export function networkreport() {
+  return request({
+    url: "/zongzhi/managescreen/networkreport",
+    method: "get",
+  });
+}
+
+// 清朗专项
+export function zhuanxiang(query) {
+  return request({
+    url: "/zongzhi/managescreen/actiondynamicst",
+    method: "get",
+    params: query,
+  });
+}
+
+// 举报事件年度分类统计
+export function reportbyyear(query) {
+  return request({
+    url: "/zongzhi/managescreen/reportbyyear",
+    method: "get",
+    params: query,
+  });
+}
+
+// 清朗专项行动动态
+export function zhuanxiangInfo(id) {
+  return request({
+    url: "/zongzhi/zhuanxiang/" + id,
+    method: "get",
+  });
+}

src/api/zongzhi/st.js

@@ -101,6 +101,15 @@ export function listDongtai(query) {
   });
 }
 
+// 查询详情
+export function dongtaiInfo(id) {
+  return request({
+    url: `/zongzhi/dongtai/${id}`,
+    method: "get",
+  });
+}
+
+
 // 查询等保系统列表
 export function listSystem(query) {
   return request({
@@ -197,14 +206,6 @@ export function listDanger(query) {
     params: query,
   });
 }
-// 清朗专项行动动态
-export function zhuanxiang(query) {
-  return request({
-    url: "/zongzhi/zhuanxiang/list",
-    method: "get",
-    params: query,
-  });
-}
 
 // 查询安全隐患详细
 export function getDanger(id) {
@@ -268,4 +269,4 @@ export function networkAppraiser() {
     url: "/zongzhi/network/appraiser",
     method: "get",
   });
-}
+}

src/views/privateOrder/ecosphere/components/componentCenter.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { networkreport } from '@/api/zongzhi/st.js'
+import { networkreport } from '@/api/zongzhi/manage.js'
 export default {
   data() {
     return {

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

@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览左侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2023-08-21 16:01:49
+ * @LastEditTime: 2023-08-22 17:20:02
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentLeft.vue
 -->
 <template>
@@ -267,7 +267,7 @@
           highlight-current-row
           @row-click="rowClick"
         >
-          <!-- <el-table-column
+          <el-table-column
             label="序号"
             type="index"
             :index="
@@ -277,7 +277,7 @@
             "
             width="80"
             align="center"
-          /> -->
+          />
           <template v-for="item in tableHeader">
             <el-table-column
               v-if="item !== '序号'"
@@ -483,7 +483,7 @@
 <script>
 import vueSeamlessScroll from 'vue-seamless-scroll'
 import ModuleTitle from '../../common/ModuleTitle.vue'
-import { listEnterprise, listDomain, listWork, listDongtai, listPlatform } from '@/api/zongzhi/st.js'
+import { listEnterprise, listDomain, listWork, listDongtai, listPlatform, dongtaiInfo } from '@/api/zongzhi/st.js'
 import {
   getBilibiliData,
   getRedBookData,
@@ -494,6 +494,7 @@ import {
   getWeibo,
   getTikTok
 } from '@/api/common'
+import { downloadTwo } from '@/utils/safesoft'
 const docx = require('docx-preview')
 import pdf from 'vue-pdf'
 import axios from 'axios'
@@ -610,7 +611,8 @@ export default {
       zoologyWidth: '',
       fileExtension: '',
       pdfUrl: '',
-      numPages: ''
+      numPages: '',
+      dongtaiTotal:0
     }
   },
   computed: {
@@ -632,24 +634,30 @@ export default {
   destroyed() {
     clearInterval(this.threeTimer)
     clearInterval(this.zoologyTimer)
+    clearInterval(this.time2)
   },
   mounted() {
     this.zoologyIconData = this.zoologyIconList.slice(0, 4)
-    this.getDynamicData() // 工作动态信息获取
+    
     // this.getZoologyData() // 网络平台信息获取
     this.getZoologyChange() // 网络平台按钮切换
     this.inventoryChange() // 三份清单自动切换
+    this.getDynamicData() // 工作动态信息获取
+    
+    this.time2 = setInterval(() => { // 安全隐患列表
+      if (this.dynamicList.length >= this.dongtaiTotal) {
+        clearInterval(this.time2)
+      } else {
+        this.getDynamicData()
+      }
+    }, 500)
   },
   methods: {
     // 工作动态信息获取
-    getDynamicData() {
-      listDongtai().then(res => {
-        console.log(res)
-        this.dynamicList = res.data
-        // this.dtTotal = res.total
-      })
-      // const tableObject = require('./data.json')
-      // this.dynamicList = tableObject['工作动态']
+    async getDynamicData() {
+      let res = await listDongtai()
+      this.dongtaiTotal = res.data.count
+      this.dynamicList = [...this.dynamicList, ...res.data.list]
     },
 
     // 网络平台信息获取
@@ -669,10 +677,10 @@ export default {
         let res = await listPlatform({type:type});
         res.rows.map((item)=>{
           let obj = {}
-          obj['账号ID'] = item.name
-          obj['URL'] = item.dns
-          this.tableData.push(obj)
-        })
+            obj['账号ID'] = item.name
+            obj['URL'] = item.dns
+            this.tableData.push(obj)
+          })
         // res['T_DATA_BILIBILI[]'].forEach((item) => {
         //   this.tableData.push({ 账号ID: item.account_id, URL: item.url })
         // })
@@ -1021,20 +1029,29 @@ export default {
       this.currentPage = val
       this.setCurrentPageData()
     },
-    dynamicClick(item) {
-      console.log('数据', item)
-      this.tableHeader.push({ name: '材料路径', value: 'name' })
-      const fileName = item.materialsFileName.split(',')
-      const fileUrl = item.materialsFileUrl.split(',')
-
+    async dynamicClick(item) {
+      this.tableData = []
+      this.currentPage = 1
+      this.pageSize = 10
+      let data = await dongtaiInfo(item.id)
+      console.log(data)
+      this.tableHeader= ['材料名称']
+      this.dialogTitle = data.data.materialsName
+      const fileName = data.data.materialsFileName.split(',')
+      const fileUrl = data.data.materialsFileUrl.split(',')
+      console.log(fileName)
       if (fileName.length > 0) {
+        // TODO:缺截取点前面的字符
         fileName.forEach((item, index) => {
-          this.tableData.push({ name: item, url: fileUrl[index] })
+          this.tableData.push({ '材料名称': item,'材料路径':fileUrl[index] })
         })
+        this.networkPlatformDataTwo()
       } else {
         this.tableData = []
       }
       this.dynamicStatus = true
+
+      
       // this.dialogTitle = val.dynamicName
       // this.tableData = val.fileList
       // this.tableHeader = []
@@ -1049,39 +1066,47 @@ export default {
       // this.setCurrentPageData()
       // this.dynamicStatus = true
     },
+    networkPlatformDataTwo() {
+      this.total = this.tableData.length
+      this.totalPage = Math.ceil(this.tableData.length / this.pageSize)
+      this.totalPage = this.totalPage === 0 ? 1 : this.totalPage
+      this.setCurrentPageData()
+    },
     rowClick(row) {
       console.log(row)
       this.dialogDetails = true
       // console.log(row)
-      // this.fileExtension = row['材料路径'].substring(
-      //   row['材料路径'].lastIndexOf('.') + 1
-      // )
-      // console.log('fileExtension', this.fileExtension)
-      // if (['png', 'jpg', 'jpeg'].includes(row.材料路径.substring(row.材料路径.lastIndexOf('.') + 1))) {
-      //   this.imgSrc = `${process.env.NODE_ENV === 'production' ? window._CONFIG['fileNginxUrl'] : '/fileApi'}${row['材料路径']}`
-      //   this.dialogImg = true
-      // } else if (this.fileExtension === 'docx' || this.fileExtension === 'doc') {
-      //   axios({
-      //     method: 'get',
-      //     responseType: 'blob', // 设置响应文件格式
-      //     url: `${
-      //       process.env.NODE_ENV === 'production'
-      //         ? window._CONFIG['fileNginxUrl']
-      //         : '/fileApi'
-      //     }${row['材料路径']}`
-      //   }).then(({ data }) => {
-      //     if (data) {
-      //       this.dialogDetails = true
-      //       this.$nextTick(() => {
-      //         docx.renderAsync(data, this.$refs.file) // 渲染到页面预览
-      //       })
-      //     }
-      //   })
-      // } else if (this.fileExtension === 'pdf') {
-      //   this.getNumPages(`${process.env.NODE_ENV === 'production' ? window._CONFIG['fileNginxUrl'] : '/fileApi'}${row['材料路径']}`)
-      // }
+      this.fileExtension = row['材料路径'].substring(
+        row['材料路径'].lastIndexOf('.') + 1
+      )
+      console.log('fileExtension', this.fileExtension)
+      if (['png', 'jpg', 'jpeg'].includes(row.材料路径.substring(row.材料路径.lastIndexOf('.') + 1))) {
+        this.imgSrc = `${process.env.NODE_ENV === 'production' ? window._CONFIG['fileNginxUrl'] : '/fileApi'}${row['材料路径']}`
+        this.dialogImg = true
+      } else if (this.fileExtension === 'docx' || this.fileExtension === 'doc') {
+        axios({
+          method: 'get',
+          responseType: 'blob', // 设置响应文件格式
+          url: `${
+            process.env.NODE_ENV === 'production'
+              ? window._CONFIG['fileNginxUrl']
+              : '/fileApi'
+          }${row['材料路径']}`
+        }).then(({ data }) => {
+          if (data) {
+            this.dialogDetails = true
+            this.$nextTick(() => {
+              docx.renderAsync(data, this.$refs.file) // 渲染到页面预览
+            })
+          }
+        })
+      } else if (this.fileExtension === 'pdf') {
+        console.log('window._CONFIG[fileNginxUrl]',window._CONFIG['fileNginxUrl'])
+        this.getNumPages(`${process.env.NODE_ENV === 'production' ? window._CONFIG['fileNginxUrl'] : '/fileApi'}${row['材料路径']}`)
+      }
     },
     getNumPages(url) {
+      // console.log(url)
       axios({
         method: 'GET',
         url: url, // 后台接口

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

@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览右侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2023-08-22 08:57:33
+ * @LastEditTime: 2023-08-22 14:16:17
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -110,7 +110,7 @@
                 <div class="img-item" :data-curData="index">
                   <div
                     :style="{
-                      backgroundImage: 'url(' + item.imgList[0].url + ')',
+                      backgroundImage: 'url(' + imgUrl + item.zhuanxiangImg[0] + ')',
                     }"
                     :data-curData="index"
                     style="
@@ -137,21 +137,21 @@
       <!-- 弹窗 -->
       <div v-if="qlzfDialogFlag" class="qlzf-dialog">
         <div class="close" @click="qlzfDialogFlag = false"></div>
-        <div class="title">{{ eldialogData.title }}</div>
+        <div class="title">{{ eldialogData.zhuanxiangTitle }}</div>
         <div class="qlzf-dialog_left">
           <div
-            v-for="(item, index) in eldialogData.imgList"
+            v-for="(item, index) in eldialogData.zhuanxiangImg"
             :key="index"
             style="margin-bottom: 18px"
           >
             <img
-              :src="item.url"
+              :src=" imgUrl + item"
               style="width: 355px; height: 269px; background-size: 100% 100%"
             />
           </div>
         </div>
         <div class="right">
-          <div class="qlzf-dialog_right" v-html="eldialogData.content"></div>
+          <div class="qlzf-dialog_right" v-html="eldialogData.zhuanxiangContent"></div>
         </div>
       </div>
     </div>
@@ -162,7 +162,7 @@
 window.JSZip = require('jszip')
 import { qlzxdtData } from './json'
 import { getreportNum } from '@/api/common'
-import { zhuanxiang, managescreen } from '@/api/zongzhi/st.js'
+import { zhuanxiang, managescreen, zhuanxiangInfo, reportbyyear } from '@/api/zongzhi/manage.js'
 import { echartsJump } from '../../../../../public/static/echartsJump'
 import { download } from "@/utils/safesoft"
 import vueSeamlessScroll from 'vue-seamless-scroll'
@@ -181,7 +181,7 @@ export default {
         { url: require('@/assets/ecosphere/清朗专项行动图/1-3.png') },
         { url: require('@/assets/ecosphere/清朗专项行动图/1-4.png') }
       ],
-      qlzxdtList: null,
+      qlzxdtList: [],
       number: 0,
       reportingTimer: null,
       pieData: [
@@ -303,7 +303,9 @@ export default {
       qlzfDialogFlag: false,
       eldialogData: null,
       yhxiTotal: 0,
-      wgptTotal: 0
+      wgptTotal: 0,
+      imgUrl:null,
+      zhuanxiangTotal:0,
     }
   },
   computed: {
@@ -323,22 +325,31 @@ export default {
   created() {},
   destroyed() {
     clearInterval(this.reportingTimer)
+    clearInterval(this.time)
   },
   mounted() {
-    this.qlzxdtList = qlzxdtData
-    // this.zhuanxiangList()
+    // this.qlzxdtList = qlzxdtData
+    this.imgUrl = process.env.VUE_APP_BASE_API3
     // 开启定时器旋转
     this.reportingProcessTimer()
+    this.zhuanxiangList()                 // 清朗专项行动动态
+    this.managescreenData()               // 行动数据统计
+    this.reportbyyearDate()               // 举报事件年度分类统计
     
-    this.inItPie()
     // getreportNum().then(res => {
     //   this.pieData[0].value = res.data.reportTotalCount - 12
     //   this.inItPie()
     // })
   },
   methods: {
-    itemClick(e) {
-      this.eldialogData = this.qlzxdtList[e.target.dataset.curdata]
+    async itemClick(e) {
+      // console.log(this.qlzxdtList[e.target.dataset.curdata])
+      let data = await zhuanxiangInfo(this.qlzxdtList[e.target.dataset.curdata].id)
+      
+      let eldialogData = JSON.parse(JSON.stringify(data.data))
+      eldialogData.zhuanxiangImg = eldialogData.zhuanxiangImg.split(',')
+      // this.eldialogData = this.qlzxdtList[e.target.dataset.curdata]
+      this.eldialogData = eldialogData
       this.qlzfDialogFlag = true
     },
     changeImg(item, index) {
@@ -348,20 +359,84 @@ export default {
     async zhuanxiangList(){
       let res = await zhuanxiang();
       let imgArr
-      let qlzxdtList = JSON.parse(JSON.stringify(res.rows))
-      this.qlzxdtList = qlzxdtList
-      for(let i = 0; i < qlzxdtList.length; i++){
-        imgArr = qlzxdtList[i].zhuanxiangImg
+      this.qlzxdtList = JSON.parse(JSON.stringify(res.data))
+      for(let i = 0; i < this.qlzxdtList.length; i++){
+        imgArr = this.qlzxdtList[i].zhuanxiangImg
         imgArr = imgArr.split(',')
         this.qlzxdtList[i].zhuanxiangImg = imgArr
-        for(let j = 0; j < imgArr.length; j++){
-          imgArr[j] = process.env.VUE_APP_BASE_API3 + imgArr[j]
+      }
+    },
+    //  行动数据统计
+    async managescreenData(){
+      let res = await managescreen()
+      let data = res.data
+      let arr1 = [],arr2 = []
+      data.map((item)=>{
+        item.zhuanxiangTime = this.getDate(item.zhuanxiangTime)
+        if(item.type == 1) {
+          arr1.push(item)
+        }else if(item.type == 2){
+          arr2.push(item)
         }
+      })
+      this.qlzfDataStatistics[1].data.map((item)=>{
+        arr2.map((arr)=>{
+          if(item.name == arr.zhuanxiangTime) {
+            item.num = arr.count
+          }
+        })
+      })
+      this.qlzfDataStatistics[0].data.map((item)=>{
+        arr1.map((arr)=>{
+          if(item.name == arr.zhuanxiangTime) {
+            item.num = arr.count
+          }
+        })
+      })
+    },
+    // 举报事件年度分类统计
+    async reportbyyearDate(){
+      let data = await reportbyyear();
+      let arr = []
+      for(let i = 0; i < data.data.length; i++){
+        let obj = {}
+        obj.name = data.data[i].source == '1' ? '上级下发' : data.data[i].source == '2' ? '部门转发' : data.data[i].source == '3' ? '小程序' : '无效' 
+        obj.value = data.data[i].count
+        arr.push(obj)
+      }
+      this.pieData = arr;
+      this.inItPie()
+    },
+    // 计算时间
+    getDate(date){
+      switch(date){
+        case '01':
+          return '1月';
+        case '02':
+          return '2月';
+        case '03':
+          return '3月';
+        case '04':
+          return '4月';
+        case '05':
+          return '5月';
+        case '06':
+          return '6月';
+          case '07':
+          return '7月';
+        case '08':
+          return '8月';
+        case '09':
+          return '9月';
+        case '10':
+          return '10月';
+        case '11':
+          return '11月';
+        case '12':
+          return '12月';
+        default :
+          break;
       }
-      // zhuanxiang().then(res => {
-        
-      //   console.log(this.qlzxdtList)
-      // })
     },
     // 饼图
     inItPie() {

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

@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览左侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2022-10-31 14:46:40
+ * @LastEditTime: 2023-08-22 11:04:28
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\security\\components\\componentLeft.vue
 -->
 <template>

vue.config.js

@@ -61,7 +61,7 @@ module.exports = {
         }
       },
       '/fileApi': {
-        target: 'http://47.116.52.164:10002/sitefiles/wxb/', // 这是本地地址
+        target: 'http://39.101.188.84:9027', // 这是本地地址  http://47.116.52.164:10002/sitefiles/wxb/
         ws: false,
         changeOrigin: true,
         pathRewrite: {