Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-big into duhanyu

src/api/netManage/index.js

@@ -148,3 +148,10 @@ export function screenqinglang() {
     method: 'get'
   })
 }
+// 查询举报地图处置率
+export function screenreportmap() {
+  return request({
+    url: '/tcZz/networkEcology/screen/screenreportmap',
+    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-10-17 10:50:57
+ * @LastEditTime: 2023-10-23 10:13:46
  * @Description:
 -->
 <template>
@@ -30,7 +30,8 @@
 </template>
 
 <script>
-import { networkreport } from '@/api/zongzhi/manage.js'
+// import { networkreport } from '@/api/zongzhi/manage.js'
+import { screenreportmap } from "@/api/netManage/index.js"
 export default {
   data() {
     return {
@@ -38,6 +39,11 @@ export default {
       completedPercent: 0
     }
   },
+  methods:{
+    isInteger(obj){
+      return typeof obj === 'number' && obj % 1 === 0;      //是整数，则返回true，否则返回false
+    }
+  },
   mounted() {
     // this.reportTotalCount = 45
     // this.completedPercent = 100
@@ -45,10 +51,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
-    // });
+    screenreportmap().then(res => {
+      this.reportTotalCount = res.data.count
+      this.completedPercent = this.isInteger(res.data.rate) ? res.data.rate : res.data.rate.toFixed(2)
+    });
     // 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-10-20 17:21:26
+ * @LastEditTime: 2023-10-23 16:51:32
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentLeft.vue
 -->
 <template>
@@ -665,7 +665,7 @@ export default {
   methods: {
     // 工作动态信息获取
     getDynamicData() {
-      listGzdt({isStatus:1, areaId:1}).then(res=>{
+      listGzdt({isStatus:1}).then(res=>{
         this.dongtaiTotal = res.total;
         this.dynamicList = [...this.dynamicList, ...res.rows];
       })
@@ -683,7 +683,7 @@ export default {
         this.tableHeader = ["账号ID", "URL"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        listBzhan({ pageNum: 1, pageSize: 10, type: 1, isStatus:1, areaId:1 }).then(res=>{
+        listBzhan({ pageNum: 1, pageSize: 10, type: 1, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号ID"] = item.zhId;
@@ -696,7 +696,7 @@ export default {
         this.tableHeader = ["账号ID", "URL"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        listBzhan({ pageNum: 1, pageSize: 10, type: 2, isStatus:1, areaId:1 }).then(res=>{
+        listBzhan({ pageNum: 1, pageSize: 10, type: 2, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号ID"] = item.zhId;
@@ -709,7 +709,7 @@ export default {
         this.tableHeader = ["账号ID", "简介"];
         this.zoologyWidth = "1200px";
         this.tableData = [];
-        listTtsum({ pageNum: 1, pageSize: 10, type: 1, isStatus:1, areaId:1 }).then(res=>{
+        listTtsum({ pageNum: 1, pageSize: 10, type: 1, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号ID"] = item.zhId;
@@ -722,7 +722,7 @@ export default {
         this.tableHeader = ["账号ID", "简介"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        listTtsum({ pageNum: 1, pageSize: 10, type: 2, isStatus:1, areaId:1}).then(res=>{
+        listTtsum({ pageNum: 1, pageSize: 10, type: 2, isStatus:1}).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号ID"] = item.zhId;
@@ -735,7 +735,7 @@ export default {
         this.tableHeader = ["账号ID", "行业属性"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        listVx({ pageNum: 1, pageSize: 10, isStatus:1, areaId:1 }).then(res=>{
+        listVx({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号ID"] = item.zhId;
@@ -749,7 +749,7 @@ export default {
         this.tableHeader = ["网站名称", "真实IP", "网站域名", "备案许可证号"];
         this.zoologyWidth = "2000px";
         this.tableData = [];
-        listWz({ pageNum: 1, pageSize: 10, isStatus:1, areaId:1 }).then(res=>{
+        listWz({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["网站名称"] = item.webName;
@@ -764,7 +764,7 @@ export default {
         this.tableHeader = ["账号名称", "认证", "地区"];
         this.zoologyWidth = "1000px";
         this.tableData = [];
-        listWb({ pageNum: 1, pageSize: 10, isStatus:1, areaId:1 }).then(res=>{
+        listWb({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号名称"] = item.zhName;
@@ -778,7 +778,7 @@ export default {
         this.tableHeader = ["账号", "简介", "粉丝数"];
         this.zoologyWidth = "1500px";
         this.tableData = [];
-        listDy({ pageNum: 1, pageSize: 10, isStatus:1, areaId:1 }).then(res=>{
+        listDy({ pageNum: 1, pageSize: 10, isStatus:1 }).then(res=>{
           res.rows.map((item) => {
             let obj = {};
             obj["账号"] = item.userName;
@@ -861,7 +861,7 @@ export default {
       this.currentIndex = status;
       if (this.currentIndex == 1) {
         // listEnterprise(this.queryParams).then((res) => {
-        listZdqyml({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+        listZdqyml({...this.queryParams,isStatus:1}).then(res => {
           this.currentPageData = res.rows;
           this.tableKey = [
             { name: "企业名称", value: "enterpriseName" },
@@ -887,7 +887,7 @@ export default {
         });
       } else if (this.currentIndex == 2) {
         // listDomain(this.queryParams).then((res) => {
-        listZdlyjg({...this.queryParams,isStatus:1, areaId:1}).then((res) => {
+        listZdlyjg({...this.queryParams,isStatus:1}).then((res) => {
           this.currentPageData = res.rows;
           this.tableKey = [
             {
@@ -904,7 +904,7 @@ export default {
         });
       } else if (this.currentIndex == 3) {
         // listWork(this.queryParams).then((res) => {
-        listZdgzxm({...this.queryParams,isStatus:1, areaId:1}).then((res) => {
+        listZdgzxm({...this.queryParams,isStatus:1}).then((res) => {
           this.currentPageData = res.rows;
           this.tableKey = [
             { name: "推进单位", value: "tjUnit" },
@@ -1010,68 +1010,85 @@ export default {
     async networkPlatformClickTwo(params) {
       // console.log(params, "====");
       this.tableData = [];
-      let res = await listPlatform(params);
+      // let res = await listPlatform(params);
       if (params.type == 1) {
+        listWz({ ...params, 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);
           });
+        })
       } else if (params.type == 2) {
+        listDy({ ...params, 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.tableData.sort((a, b) => b.粉丝数 - a.粉丝数);
       } else if (params.type == 3) {
+        listVx({ ...params, 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);
           });
+        })
       } else if (params.type == 4) {
+        listWb({ ...params, 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);
           });
+        })
       } else if (params.type == 5) {
+        listTtsum({ ...params, 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);
           });
+        })
       } else if (params.type == 6) {
+        listTtsum({ ...params, 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);
           });
+        })
       } else if (params.type == 7) {
+        listBzhan({ ...params, 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);
           });
+        })
       } else if (params.type == 8) {
+        listBzhan({ ...params, 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.currentPageData = this.tableData;
     },
@@ -1084,7 +1101,9 @@ export default {
         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,'fileName')
+        console.log(fileUrl,'fileUrl')
+        if (fileUrl.length < 1 || fileName.length < 1 || fileName == "" || fileUrl == "") return;
         if (fileName.length > 0) {
           fileName.forEach((item, index) => {
             this.tableData.push({

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

@@ -3,7 +3,7 @@
  * @Author: kery.chen
  * @Description: 总体概览右侧
  * @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2023-10-21 15:43:07
+ * @LastEditTime: 2023-10-23 16:50:10
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -146,7 +146,7 @@
             style="margin-bottom: 18px"
           >
             <img
-              :src=" imgUrl + item"
+              :src=" item"
               style="width: 355px; height: 269px; background-size: 100% 100%"
             />
           </div>
@@ -366,13 +366,13 @@ export default {
     // 清朗专项行动动态
     async zhuanxiangList(){
       // let res = await zhuanxiang();
-      listQlzxxddt({isStatus:1, areaId:1}).then(res=>{
+      listQlzxxddt({isStatus:1}).then(res=>{
         let imgArr
         this.qlzxdtList = JSON.parse(JSON.stringify(res.rows))
         for(let i = 0; i < this.qlzxdtList.length; i++){
           imgArr = this.qlzxdtList[i].imageUrl
           imgArr = imgArr.split(',')
-          this.qlzxdtList[i].imageUrl = this.imgUrl + imgArr[0]
+          this.qlzxdtList[i].imageUrl = imgArr[0]
         }
       })
     },

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

@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-20 17:29:53
+ * @LastEditTime: 2023-10-23 14:21:38
  * @Description:
 -->
 <template>
@@ -366,7 +366,7 @@ export default {
   },
   methods: {
     getWz() {
-      listFb({...this.queryParams,isStatus:1,type:1, areaId:1}).then(res => {
+      listFb({...this.queryParams,isStatus:1,type:1}).then(res => {
       // listArticle(this.queryParams).then(res => {
         this.dataList = [...this.dataList, ...res.rows]
         this.total = res.total

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

@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-20 17:30:40
+ * @LastEditTime: 2023-10-23 14:21:50
  * @Description:
 -->
 <template>
@@ -362,7 +362,7 @@ export default {
   },
   methods: {
     getWz() {
-      listFb({...this.queryParams,isStatus:1,type:2, areaId:1}).then(res => {
+      listFb({...this.queryParams,isStatus:1,type:2}).then(res => {
         this.dataList = [...this.dataList, ...res.rows]
       })
     },

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

@@ -2,7 +2,7 @@
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-21 15:17:22
+ * @LastEditTime: 2023-10-23 14:23:00
  * @Description:
 -->
 <template>
@@ -507,7 +507,7 @@ export default {
      * 文明志愿者
      */
     getZyz(title) {
-      listWlwmzyz({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+      listWlwmzyz({...this.queryParams,isStatus:1}).then(res => {
       // listVolunteer(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
@@ -525,7 +525,7 @@ export default {
     },
     /** 网络安全官 */
     getNetAdmin(title) {
-      listAqg({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+      listAqg({...this.queryParams,isStatus:1}).then(res => {
       // listSafetyadmin(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
@@ -546,7 +546,7 @@ export default {
     },
     /** 网评员 */
     getNetPj(title) {
-      listWpy({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+      listWpy({...this.queryParams,isStatus:1}).then(res => {
       // listCommentator(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
@@ -569,7 +569,7 @@ export default {
      * 网络大V
      */
     getNetPt(title) {
-      listWldv({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+      listWldv({...this.queryParams,isStatus:1}).then(res => {
       // listPingtai(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
@@ -589,7 +589,7 @@ export default {
      * 网络安全支持企业
      */
     getZcEnterprise(title) {
-      listWlaqzcqy({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+      listWlaqzcqy({...this.queryParams,isStatus:1}).then(res => {
       // listNetSafetyZcUnit(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
@@ -606,7 +606,7 @@ export default {
      * 民情负责人
      */
     getFzr(title) {
-      listWlmqfzr({...this.queryParams,isStatus:1, areaId:1}).then(res => {
+      listWlmqfzr({...this.queryParams,isStatus:1}).then(res => {
       // listPrincipal(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
@@ -630,7 +630,7 @@ export default {
      * 文章表
      */
     getWz() {
-      listWpwzlyqk({ type: this.status, isStatus:1, areaId:1 }).then(res => {
+      listWpwzlyqk({ type: this.status, isStatus:1 }).then(res => {
       // listArticle({ type: this.status }).then(res => {
         this.dataList = res.rows
       })