Merge branch 'lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-big

src/api/netManage/index.js

@@ -0,0 +1,135 @@
+import request from '@/utils/request'
+
+// 查询工作动态列表
+export function listGzdt(query) {
+  return request({
+    url: '/tcZz/netManage/gzdt/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询工作动态详细
+export function getGzdt(id) {
+  return request({
+    url: '/tcZz/netManage/gzdt/' + id,
+    method: 'get'
+  })
+}
+// 查询重点企业名录列表
+export function listZdqyml(query) {
+  return request({
+    url: '/tcZz/netManage/zdqyml/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询重点领域监管列表
+export function listZdlyjg(query) {
+  return request({
+    url: '/tcZz/netManage/zdlyjg/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询重点工作项目列表
+export function listZdgzxm(query) {
+  return request({
+    url: '/tcZz/netManage/zdgzxm/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询网站列表
+export function listWz(query) {
+  return request({
+    url: '/tcZz/netManage/wz/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询抖音列表
+export function listDy(query) {
+  return request({
+    url: '/tcZz/netManage/dy/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询微信列表
+export function listVx(query) {
+  return request({
+    url: '/tcZz/netManage/vx/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询微博列表
+export function listWb(query) {
+  return request({
+    url: '/tcZz/netManage/wb/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询今日头条、快手列表
+export function listTtsum(query) {
+  return request({
+    url: '/tcZz/netManage/ttsum/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询B站、小红书列表
+export function listBzhan(query) {
+  return request({
+    url: '/tcZz/netManage/bzhan/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询举报事件年度分类统计列表
+export function listJbsjndfltj(query) {
+  return request({
+    url: '/tcZz/netManage/jbsjndfltj/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询清朗专项行动动态列表
+export function listQlzxxddt(query) {
+  return request({
+    url: '/tcZz/netManage/qlzxxddt/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询清朗专项行动动态详细
+export function getQlzxxddt(id) {
+  return request({
+    url: '/tcZz/netManage/qlzxxddt/' + id,
+    method: 'get'
+  })
+}
+// 查询清郎专项行动数据统计列表
+export function listQlzxxdsjtj(query) {
+  return request({
+    url: '/tcZz/netManage/qlzxxdsjtj/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询举报地图列表
+export function listJbmap(query) {
+  return request({
+    url: '/tcZz/netManage/jbmap/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询举报地图详细
+export function getJbmap(id) {
+  return request({
+    url: '/tcZz/netManage/jbmap/' + id,
+    method: 'get'
+  })
+}

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

@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-21 14:12:54
  * @LastEditors: JC9527
- * @LastEditTime: 2023-08-21 16:54:37
+ * @LastEditTime: 2023-10-17 10:50:57
  * @Description:
 -->
 <template>
@@ -45,10 +45,10 @@ export default {
     //   this.reportTotalCount = res.data.reportTotalCount
     //   this.completedPercent = res.data.completedPercent
     // })
-    networkreport().then(res => {
-      this.reportTotalCount = res.data.count
-      this.completedPercent = res.data.handle
-    });
+    // networkreport().then(res => {
+    //   this.reportTotalCount = res.data.count
+    //   this.completedPercent = res.data.handle
+    // });
     // console.log(data)
     
   }

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-30 14:28:57
+ * @LastEditTime: 2023-10-17 16:26:01
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentLeft.vue
 -->
 <template>
@@ -157,7 +157,7 @@
               <div class="item_txt">
                 <!-- materialsName -->
                 <span :data-id="item.id">
-                  {{ item.name }}
+                  {{ item.title }}
                 </span>
               </div>
               <div class="item_bottom" :data-id="item.id">
@@ -486,23 +486,18 @@
 import vueSeamlessScroll from "vue-seamless-scroll";
 import ModuleTitle from "../../common/ModuleTitle.vue";
 import {
-  listEnterprise,
-  listDomain,
-  listWork,
-  listDongtai,
-  listPlatform,
-  dongtaiInfo,
-} from "@/api/zongzhi/st.js";
-import {
-  getBilibiliData,
-  getRedBookData,
-  getToDayHeadlineData,
-  getQuickData,
-  getWechat,
-  getWebsite,
-  getWeibo,
-  getTikTok,
-} from "@/api/common";
+  listWz,
+  listDy,
+  listVx,
+  listWb,
+  listTtsum,
+  listBzhan,
+  listGzdt,
+  getGzdt,
+  listZdqyml,
+  listZdlyjg,
+  listZdgzxm,
+} from "@/api/netManage/index.js";
 import { downloadTwo } from "@/utils/safesoft";
 const docx = require("docx-preview");
 import pdf from "vue-pdf";
@@ -668,10 +663,12 @@ export default {
   },
   methods: {
     // 工作动态信息获取
-    async getDynamicData() {
-      let res = await listDongtai();
-      this.dongtaiTotal = res.data.count;
-      this.dynamicList = [...this.dynamicList, ...res.data.list];
+    getDynamicData() {
+      listGzdt({isStatus:1}).then(res=>{
+        console.log(res)
+        this.dongtaiTotal = res.total;
+        this.dynamicList = [...this.dynamicList, ...res.rows];
+      })
     },
 
     // 网络平台信息获取
@@ -683,180 +680,116 @@ export default {
       this.zoologyIconStatus = true;
       let res = await listPlatform({ pageNum: 1, pageSize: 10, type: type });
       if (val === "B站") {
-        // getBilibiliData().then((res) => {
         this.tableHeader = ["账号ID", "URL"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        // this.tableData = [
-        //   { 账号ID: 1, URL: 'https://www.bilibili.com/' }
-        // ]
+        listBzhan({ pageNum: 1, pageSize: 10, type: 1, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号ID"] = item.name;
-          obj["URL"] = item.dns;
+            obj["账号ID"] = item.zhId;
+            obj["URL"] = item.url;
             this.tableData.push(obj);
           });
-        // res['T_DATA_BILIBILI[]'].forEach((item) => {
-        //   this.tableData.push({ 账号ID: item.account_id, URL: item.url })
-        // })
-        // })
+          this.total = res.total;
+        })
       } else if (val === "小红书") {
-        // getRedBookData().then((res) => {
         this.tableHeader = ["账号ID", "URL"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        // this.tableData = [
-        //   { 账号ID: 1, URL: 'https://www.xiaohongshu.com/explore' }
-        // ]
-        // res['T_DATA_RED_BOOK[]'].forEach((item) => {
-        //   this.tableData.push({ 账号ID: item.account_id, URL: item.url })
-        // })
+        listBzhan({ pageNum: 1, pageSize: 10, type: 2, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号ID"] = item.name;
-          obj["URL"] = item.dns;
+            obj["账号ID"] = item.zhId;
+            obj["URL"] = item.url;
             this.tableData.push(obj);
           });
-        // })
+          this.total = res.total;
+        })
       } else if (val === "今日头条") {
-        // getToDayHeadlineData().then((res) => {
         this.tableHeader = ["账号ID", "简介"];
         this.zoologyWidth = "1200px";
         this.tableData = [];
-        // this.tableData = [
-        //   { 账号ID: 1, 简介: '今日头条是北京字节跳动科技有限公司开发的一款基于数据挖掘的推荐引擎产品，为用户推荐信息、提供连接人与信息的服务的产品。由张一鸣于2012年3月创建，2012年8月发布第一个版本。' }
-        // ]
+        listTtsum({ pageNum: 1, pageSize: 10, type: 1, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号ID"] = item.name;
+            obj["账号ID"] = item.zhId;
             obj["简介"] = item.intro;
             this.tableData.push(obj);
           });
-        // res['T_DATA_TODAY_HEADLINE[]'].forEach((item) => {
-        //   this.tableData.push({
-        //     账号ID: item.account_id,
-        //     简介: item.introduction
-        //   })
-        // })
-        // })
+          this.total = res.total;
+        })
       } else if (val === "快手") {
-        // getQuickData().then((res) => {
         this.tableHeader = ["账号ID", "简介"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        // this.tableData = [
-        //   { 账号ID: 1, 简介: '快手是北京快手科技有限公司旗下的产品。快手 [1-2]的前身，叫“GIF快手”，诞生于2011年3月，最初是一款用来制作、分享GIF图片的手机应用。2012年11月，快手从纯粹的工具应用转型为短视频社区，用于用户记录和分享生产、生活的平台。后来随着智能手机、平板电脑的普及和移动流量成本的下降，快手在2015年以后迎来市场' }
-        // ]
+        listTtsum({ pageNum: 1, pageSize: 10, type: 2, isStatus:1}).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号ID"] = item.name;
+            obj["账号ID"] = item.zhId;
             obj["简介"] = item.intro;
             this.tableData.push(obj);
           });
-        // res['T_DATA_QUICK_WORKER[]'].forEach((item) => {
-        //   this.tableData.push({
-        //     账号ID: item.account_id,
-        //     简介: item.introduction
-        //   })
-        // })
-        // })
+          this.total = res.total;
+        })
       } else if (val === "微信") {
-        // getWechat().then((res) => {
         this.tableHeader = ["账号ID", "行业属性"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        // this.tableData = [
-        //   { 账号ID: 1, 行业属性: '自媒体' }
-        // ]
+        listVx({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号ID"] = item.name;
-          obj["行业属性"] = this.getProps(item.props);
+            obj["账号ID"] = item.zhId;
+            // obj["行业属性"] = this.getProps(item.props);
+            obj["行业属性"] = item.tmt;
             this.tableData.push(obj);
           });
-        // res['T_DATA_WECHAT[]'].forEach((item) => {
-        //   this.tableData.push({
-        //     账号ID: item.account_id,
-        //     行业属性: item.introduction
-        //   })
-        // })
-        // })
+          this.total = res.total;
+        })
       } else if (val === "网站") {
-        // getWebsite().then((res) => {
         this.tableHeader = ["网站名称", "真实IP", "网站域名", "备案许可证号"];
         this.zoologyWidth = "2000px";
         this.tableData = [];
-        // this.tableData.push({
-        //   网站名称: '百度',
-        //   真实IP: '220.181.111.188',
-        //   网站域名: 'https://www.xiaohongshu.com/explore',
-        //   备案许可证号: '京ICP证030173号',
-        //   numOrder: 1
-        // })
+        listWz({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["网站名称"] = item.name;
-          obj["真实IP"] = item.ipAddress;
-          obj["网站域名"] = item.dns;
-          obj["备案许可证号"] = item.licenceNum;
+            obj["网站名称"] = item.webName;
+            obj["真实IP"] = item.trueIp;
+            obj["网站域名"] = item.webDns;
+            obj["备案许可证号"] = item.icp;
             this.tableData.push(obj);
           });
-        // res['T_big_screen_website_data[]'].forEach((item) => {
-        //   const startIndex = item.licence_num.indexOf('备')
-        //   const endIndex = item.licence_num.lastIndexOf('号')
-        //   this.tableData.push({
-        //     网站名称: item.website_name,
-        //     真实IP: item.acturally_ip,
-        //     网站域名: item.website_domain,
-        //     备案许可证号: item.licence_num,
-        //     numOrder: item.licence_num.substring(startIndex + 1, endIndex)
-        //   })
-        // })
-        this.tableData.sort((a, b) => a.numOrder - b.numOrder);
-        // })
+          this.total = res.total;
+        })
       } else if (val === "微博") {
-        // getWeibo().then((res) => {
         this.tableHeader = ["账号名称", "认证", "地区"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        // res['T_big_screen_weibo_data[]'].forEach((item) => {
-        // this.tableData.push({
-        //   账号名称: '大红矛',
-        //   认证: '微博原创视频博主',
-        //   地区: '北京'
-        // })
+        listWb({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号名称"] = item.name;
-          obj["认证"] = item.authentication;
-          obj["地区"] = item.area;
+            obj["账号名称"] = item.zhName;
+            obj["认证"] = item.approve;
+            obj["地区"] = item.areaId;
             this.tableData.push(obj);
           });
-        // })
-        // })
+          this.total = res.total;
+        })
       } else if (val === "抖音") {
-        // getTikTok().then((res) => {
         this.tableHeader = ["账号", "简介", "粉丝数"];
         this.zoologyWidth = "1500px";
         this.tableData = [];
-        // res['T_big_screen_tik_tok[]'].forEach((item) => {
-        // this.tableData.push({
-        //   账号: '1124693722',
-        //   简介: '无',
-        //   粉丝数: 25
-        // })
+        listDy({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
-          obj["账号"] = item.name;
+            obj["账号"] = item.userName;
             obj["简介"] = item.intro;
-          obj["粉丝数"] = item.fansNum;
+            obj["粉丝数"] = item.fsCount;
             this.tableData.push(obj);
           });
+          this.total = res.total;
+        })
         this.tableData.sort((a, b) => b.粉丝数 - a.粉丝数);
-
-        // })
       }
-      this.total = res.total;
       this.currentPageData = this.tableData;
       this.zoologyIconStatus = true;
       // this.networkPlatformData()
@@ -927,58 +860,62 @@ export default {
     inventoryBtn(status, val) {
       this.currentIndex = status;
       if (this.currentIndex == 1) {
-        listEnterprise(this.queryParams).then((res) => {
+        // listEnterprise(this.queryParams).then((res) => {
+        listZdqyml({...this.queryParams,isStatus:1}).then(res => {
           this.currentPageData = res.rows;
           this.tableKey = [
             { name: "企业名称", value: "enterpriseName" },
             {
               name: "企业类型",
               value: "enterpriseType",
-              dictType: "tc_enter_type",
+              // dictType: "tc_enter_type",
             },
             {
               name: "互联网业务",
-              value: "networkYewu",
-              dictType: "tc_inlet_yewu",
+              // value: "networkYewu",
+              value: "netYw",
+              // dictType: "tc_inlet_yewu",
             },
-            { name: "监管部门", value: "jianguanBumen" },
-            { name: "单位地址", value: "address" },
+            { name: "监管部门", value: "depJg" },
+            { name: "单位地址", value: "unitAddress" },
             { name: "联系人", value: "linkMan" },
-            { name: "联系电话", value: "phoneNum" },
-            { name: "网址或平台名称", value: "productName" },
+            { name: "联系电话", value: "linkTel" },
+            { name: "网址或平台名称", value: "url" },
             { name: "域名", value: "dns" },
           ];
           this.total = res.total;
         });
       } else if (this.currentIndex == 2) {
-        listDomain(this.queryParams).then((res) => {
+        // listDomain(this.queryParams).then((res) => {
+        listZdlyjg({...this.queryParams,isStatus:1}).then((res) => {
           this.currentPageData = res.rows;
           this.tableKey = [
             {
               name: "企业类型",
               value: "enterpriseType",
-              dictType: "tc_enter_type",
+              // dictType: "tc_enter_type",
             },
-            { name: "重点监管监管对象", value: "zdjgContent" },
-            { name: "法律法规令禁止的有关行为", value: "weifaXingwei" },
-            { name: "主要监管部门", value: "dep" },
-            { name: "主要依据", value: "zhuyaoYiju" },
+            { name: "重点领域监管内容", value: "jgObgj" },
+            { name: "法律法规令禁止的有关行为", value: "jzxw" },
+            { name: "主要监管部门", value: "jgDep" },
+            { name: "主要依据", value: "zyyj" },
           ];
           this.total = res.total;
         });
       } else if (this.currentIndex == 3) {
-        listWork(this.queryParams).then((res) => {
+        // listWork(this.queryParams).then((res) => {
+        listZdgzxm({...this.queryParams,isStatus:1}).then((res) => {
           this.currentPageData = res.rows;
           this.tableKey = [
-            { name: "推进单位", value: "unitName" },
-            { name: "项目名称", value: "projectName" },
-            { name: "项目内容", value: "projectContent" },
+            { name: "推进单位", value: "tjUnit" },
+            { name: "项目名称", value: "itemName" },
+            { name: "项目内容", value: "itemContent" },
             {
               name: "项目类型",
-              value: "projectType",
-              dictType: "tc_item_type",
+              value: "itemType",
+              // dictType: "tc_item_type",
             },
-            { name: "项目联系人", value: "projectLinkMan" },
+            { name: "项目联系人", value: "itemLinkMan" },
           ];
           this.total = res.total;
         });
@@ -1142,14 +1079,12 @@ export default {
       this.tableData = [];
       this.currentPage = 1;
       this.pageSize = 10;
-      let data = await dongtaiInfo(e.target.dataset.id);
-      // console.log(data)
       this.tableHeader = ["材料名称"];
-      this.dialogTitle = data.data.materialsName;
-      const fileName = data.data.materialsFileName.split(",");
-      const fileUrl = data.data.materialsFileUrl.split(",");
+      getGzdt(e.target.dataset.id).then(data=>{
+        this.dialogTitle = data.data.title;
+        const fileName = data.data.fileName.split(",");
+        const fileUrl = data.data.fileUrl.split(",");
         if (fileUrl.length < 1 || fileName.length < 1) return;
-      // console.log(fileName)
         if (fileName.length > 0) {
           fileName.forEach((item, index) => {
             this.tableData.push({
@@ -1162,6 +1097,7 @@ export default {
           this.tableData = [];
         }
         this.dynamicStatus = true;
+      })
 
       // this.dialogTitle = val.dynamicName
       // this.tableData = val.fileList
@@ -1314,8 +1250,8 @@ export default {
           responseType: "blob", // 设置响应文件格式
           url: `${
             process.env.NODE_ENV === "production"
-              ? window._CONFIG["fileNginxUrl"]
-              : "/fileApi"
+              ? window._CONFIG["fileNginxUrl"] : process.env.VUE_APP_BASE_API2
+              // : "/fileApi"
           }/网信办大屏内容文档/网络管理/约谈流程/${val}.docx`,
         }).then(({ data }) => {
           if (data) {

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-24 13:26:32
+ * @LastEditTime: 2023-10-17 15:36:11
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -111,7 +111,7 @@
                 <div class="img-item" :data-curData="index">
                   <div
                     :style="{
-                      backgroundImage: 'url(' + item.zhuanxiangImg + ')',
+                      backgroundImage: 'url(' + item.imageUrl + ')',
                     }"
                     :data-curData="index"
                     style="
@@ -138,10 +138,10 @@
       <!-- 弹窗 -->
       <div v-if="qlzfDialogFlag" class="qlzf-dialog">
         <div class="close" @click="qlzfDialogFlag = false"></div>
-        <div class="title">{{ eldialogData.zhuanxiangTitle }}</div>
+        <div class="title">{{ eldialogData.title }}</div>
         <div class="qlzf-dialog_left">
           <div
-            v-for="(item, index) in eldialogData.zhuanxiangImg"
+            v-for="(item, index) in eldialogData.imageUrl"
             :key="index"
             style="margin-bottom: 18px"
           >
@@ -152,7 +152,7 @@
           </div>
         </div>
         <div class="right">
-          <div class="qlzf-dialog_right" v-html="eldialogData.zhuanxiangContent"></div>
+          <div class="qlzf-dialog_right" v-html="eldialogData.content"></div>
         </div>
       </div>
     </div>
@@ -164,6 +164,12 @@ window.JSZip = require('jszip')
 import { qlzxdtData } from './json'
 import { getreportNum } from '@/api/common'
 import { zhuanxiang, managescreen, zhuanxiangInfo, reportbyyear } from '@/api/zongzhi/manage.js'
+import {
+  listJbsjndfltj,
+  listQlzxxddt,
+  getQlzxxddt,
+  listQlzxxdsjtj,
+} from "@/api/netManage/index.js";
 import { echartsJump } from '../../../../../public/static/echartsJump'
 import { download } from "@/utils/safesoft"
 import vueSeamlessScroll from 'vue-seamless-scroll'
@@ -345,72 +351,100 @@ export default {
   methods: {
     async itemClick(e) {
       // console.log(this.qlzxdtList[e.target.dataset.curdata])
-      let data = await zhuanxiangInfo(this.qlzxdtList[e.target.dataset.curdata].id)
-      
+      // let data = await zhuanxiangInfo(this.qlzxdtList[e.target.dataset.curdata].id)
+      getQlzxxddt(this.qlzxdtList[e.target.dataset.curdata].id).then(data=>{
         let eldialogData = JSON.parse(JSON.stringify(data.data))
-      eldialogData.zhuanxiangImg = eldialogData.zhuanxiangImg.split(',')
-      // this.eldialogData = this.qlzxdtList[e.target.dataset.curdata]
+        eldialogData.imageUrl = eldialogData.imageUrl.split(',')
         this.eldialogData = eldialogData
         this.qlzfDialogFlag = true
+      })
     },
     changeImg(item, index) {
       item.index = index
     },
     // 清朗专项行动动态
     async zhuanxiangList(){
-      let res = await zhuanxiang();
+      // let res = await zhuanxiang();
+      listQlzxxddt({isStatus:1}).then(res=>{
         let imgArr
-      this.qlzxdtList = JSON.parse(JSON.stringify(res.data))
+        this.qlzxdtList = JSON.parse(JSON.stringify(res.rows))
         for(let i = 0; i < this.qlzxdtList.length; i++){
-        imgArr = this.qlzxdtList[i].zhuanxiangImg
+          imgArr = this.qlzxdtList[i].imageUrl
           imgArr = imgArr.split(',')
-        this.qlzxdtList[i].zhuanxiangImg = this.imgUrl + imgArr[0]
+          this.qlzxdtList[i].imageUrl = this.imgUrl + imgArr[0]
         }
+      })
     },
     //  行动数据统计
     async managescreenData(){
-      let res = await managescreen()
-      let data = res.data || []
+      // let res = await managescreen()
+      listQlzxxdsjtj({isStatus:1}).then(res=>{
+        let data = res.rows || []
         let arr1 = [],arr2 = []
+        let arr = []
         data.map((item)=>{
-        item.zhuanxiangTime = this.getDate(item.zhuanxiangTime)
+          item.dateTime = this.getDate(item.dateTime)
+          arr.push(item)
           if(item.type == 1) {
             arr1.push(item)
           }else if(item.type == 2){
             arr2.push(item)
           }
         })
+        console.log(arr,'arr')
         this.qlzfDataStatistics[1].data.map((item)=>{
-        arr2.map((arr)=>{
-          if(item.name == arr.zhuanxiangTime) {
-            item.num = arr.count
+          // arr2.map((arr)=>{
+          arr.map((arr)=>{
+            if(item.name == arr.dateTime) {
+              item.num = arr.count2
             }
           })
         })
         this.qlzfDataStatistics[0].data.map((item)=>{
-        arr1.map((arr)=>{
-          if(item.name == arr.zhuanxiangTime) {
-            item.num = arr.count
+          // arr1.map((arr)=>{
+          arr.map((arr)=>{
+            if(item.name == arr.dateTime) {
+              item.num = arr.count1
             }
           })
         })
+      })
     },
     // 举报事件年度分类统计
     async reportbyyearDate(){
-      let data = await reportbyyear();
+      // let data = await reportbyyear();
       let arr = []
-      for(let i = 0; i < data.data.length; i++){
+      for(let i = 1; i < 5; 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
+        listJbsjndfltj({type:i}).then(data=>{
+          // console.log(data)
+          let value = 0
+          data.rows.forEach(item=>{
+            value += item.count
+            obj.value = value;
+            obj.name = item.type == '1' ? '上级下发' : item.type == '2' ? '部门转发' : item.type == '3' ? '无效' : '小程序'
             arr.push(obj)
+          })
+          arr = arr.filter((item, index, self)=>{
+            return self.indexOf(item) == index;
+          })
+        })
       }
-      this.pieData = arr;
+      // 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){
+      const result = /-(\d{2})-/.exec(date);
+      if (result !== null && result.length > 1) {
+        const month = result[1];
+        switch(month){
           case '01':
             return '1月';
           case '02':
@@ -438,7 +472,41 @@ export default {
           default :
             break;
         }
+      } else {
+        console.log('没有找到月份');
+      }
     },
+    // 计算时间
+    // 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;
+    //   }
+    // },
     // 饼图
     inItPie() {
       const chartDom = document.getElementById('pie')

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

@@ -24,15 +24,15 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <div class="col_title">苏州编号</div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <div class="col_title">举报时间</div>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <div class="col_ctn_little">{{ currentMsg.szbh }}</div>
           </el-col>
           <el-col :span="8">
@@ -58,7 +58,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="col_ctn_little">{{ currentMsg.jbnr }}</div>
+            <div class="col_ctn_little" v-html='currentMsg.jbnr'></div>
+            <!-- <div class="col_ctn_little">{{ currentMsg.jbnr }}</div> -->
           </el-col>
         </el-row>
       </div>
@@ -71,6 +72,10 @@
 import mapboxgl from 'mapbox-gl'
 import 'mapbox-gl/dist/mapbox-gl.css'
 import { reportList, reportInfo } from '@/api/zongzhi/manage'
+import {
+  listJbmap,
+  getJbmap,
+} from "@/api/netManage/index.js";
 export default {
   data() {
     return {
@@ -94,14 +99,15 @@ export default {
     }
   },
   async mounted() {
-    let data = await reportList()
+    // let data = await reportList();
+    listJbmap({isStatus:1}).then(data=>{
       let arr = []
-    data.data.map((item)=>{
+      data.rows.map((item)=>{
         let obj = {}
         obj.id = item.id
         obj.lng = item.longitude
         obj.lat = item.latitude
-      obj.title = item.jbdx
+        obj.title = item.jbObj
         arr.push(obj)
       })
       this.pointList = arr
@@ -130,10 +136,11 @@ export default {
             .addTo(map)
           el.addEventListener('click', () => {
             // 点击事件里去修改内容
-          reportInfo(item.id).then(res=>{
-            let { jbdx, jbbh, jbTime, address, content } = res.data
-            _this.currentMsg.jbdx = jbdx
-            _this.currentMsg.szbh = jbbh
+            // reportInfo(item.id).then(res=>{
+            getJbmap(item.id).then(res=>{
+              let { jbObj, number, jbTime, address, content } = res.data
+              _this.currentMsg.jbdx = jbObj
+              _this.currentMsg.szbh = number
               _this.currentMsg.jbsj = jbTime
               _this.currentMsg.dz = address
               _this.currentMsg.jbnr = content
@@ -160,6 +167,7 @@ export default {
         })
       })
       this.map = map
+    })
   },
   methods: {}
 }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
- * @LastEditors: lough
- * @LastEditTime: 2022-11-15 16:43:05
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-10-16 16:16:22
  * @Description:
 -->
 <template>
@@ -97,7 +97,7 @@
             :key="idx"
             class="text"
           >
-            <span class="text-inner" :data-item="JSON.stringify(item)">{{ item.articleTitle }}</span>
+            <span class="text-inner" :data-item="JSON.stringify(item)">娄江欣语 | {{ item.articleTitle }}</span>
           </div>
         </vue-seamless-scroll>
         </div>