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

src/api/netManage/index.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 查询约谈流程列表
+export function listYtlc(query) {
+  return request({
+    url: '/tcZz/netManage/ytlc/list',
+    method: 'get',
+    params: query
+  })
+}
 // 查询工作动态列表
 export function listGzdt(query) {
   return request({

src/api/networkEcology/index.js

@@ -0,0 +1,91 @@
+import request from '@/utils/request'
+
+// 查询网络大V列表
+export function listWldv(query) {
+  return request({
+    url: '/tcZz/networkEcology/wldv/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网评员列表
+export function listWpy(query) {
+  return request({
+    url: '/tcZz/networkEcology/wpy/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网络安全官列表
+export function listAqg(query) {
+  return request({
+    url: '/tcZz/networkEcology/aqg/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网络安全支持单位列表
+export function listWlaqzcqy(query) {
+  return request({
+    url: '/tcZz/networkEcology/wlaqzcqy/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网络民情负责人列表
+export function listWlmqfzr(query) {
+  return request({
+    url: '/tcZz/networkEcology/wlmqfzr/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网络文明志愿者列表
+export function listWlwmzyz(query) {
+  return request({
+    url: '/tcZz/networkEcology/wlwmzyz/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网评文章录用情况列表
+export function listWpwzlyqk(query) {
+  return request({
+    url: '/tcZz/networkEcology/wpwzlyqk/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询上级媒体、本地发布列表
+export function listFb(query) {
+  return request({
+    url: '/tcZz/networkEcology/fb/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询本级上级网评指令比例（月）列表
+export function listBjsjwp(query) {
+  return request({
+    url: '/tcZz/networkEcology/bjsjwp/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网评员任务完成率（网评系统）列表
+export function listWpyrwwcl(query) {
+  return request({
+    url: '/tcZz/networkEcology/wpyrwwcl/list',
+    method: 'get',
+    params: query
+  })
+}

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-17 17:14:22
+ * @LastEditTime: 2023-10-19 10:52:51
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentLeft.vue
 -->
 <template>
@@ -497,6 +497,7 @@ import {
   listZdqyml,
   listZdlyjg,
   listZdgzxm,
+  listYtlc,
 } from "@/api/netManage/index.js";
 import { downloadTwo } from "@/utils/safesoft";
 const docx = require("docx-preview");
@@ -665,7 +666,6 @@ export default {
     // 工作动态信息获取
     getDynamicData() {
       listGzdt({isStatus:1}).then(res=>{
-        console.log(res)
         this.dongtaiTotal = res.total;
         this.dynamicList = [...this.dynamicList, ...res.rows];
       })
@@ -942,7 +942,7 @@ export default {
       // this.dialogStatus = true
     },
     inventoryBtnTwo(status) {
-      console.log(this.dialogTitle);
+      // console.log(this.dialogTitle);
       const { page, limit } = status;
       this.queryParams.pageNum = page;
       this.queryParams.pageSize = limit;
@@ -964,7 +964,7 @@ export default {
       }, 6000);
     },
     iconClick(row) {
-      console.log(row);
+      // console.log(row);
       if (row.URL) {
         this.href = row.URL;
         this.pageDetails = true;
@@ -1008,7 +1008,7 @@ export default {
       this.networkPlatformClickTwo(this.zooParams);
     },
     async networkPlatformClickTwo(params) {
-      console.log(params, "====");
+      // console.log(params, "====");
       this.tableData = [];
       let res = await listPlatform(params);
       if (params.type == 1) {
@@ -1239,29 +1239,54 @@ export default {
       this.currentPage = 1;
     },
     processDetails(val) {
-      this.fileExtension = "docx";
-
+      // this.fileExtension = "docx";
       if (
         ["生成整改通知书送达回执", "生成约谈通知书", "登记约谈"].includes(val)
       ) {
+        listYtlc({name:val}).then(res=>{
           this.dialogDetails = true;
+          this.dialogTitle = val;
+          console.log(res,'res')
+          this.fileExtension = res.rows[0].fileUrl.substring(
+            res.rows[0].fileUrl.lastIndexOf(".") + 1
+          );
+          if (this.fileExtension == "pdf") {
+            // this.pdfUrl = process.env.VUE_APP_BASE_API2 + row['材料路径'];
+            this.getNumPages(process.env.VUE_APP_BASE_API2 + res.rows[0].fileUrl);
+            // this.dialogDetails = true
+          } else if (
+            this.fileExtension === "docx" ||
+            this.fileExtension === "doc"
+          ) {
             axios({
               method: "get",
               responseType: "blob", // 设置响应文件格式
-          url: `${
-            process.env.NODE_ENV === "production"
-              ? window._CONFIG["fileNginxUrl"] : process.env.VUE_APP_BASE_API2
-              // : "/fileApi"
-          }/网信办大屏内容文档/网络管理/约谈流程/${val}.docx`,
+              url: process.env.VUE_APP_BASE_API2 + res.rows[0].fileUrl,
             }).then(({ data }) => {
               if (data) {
-            this.dialogDetails = true;
                 this.$nextTick(() => {
-              docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+                  docx.renderAsync(data, this.$refs.fileDoc); // 渲染到页面预览
                 });
               }
             });
-        this.dialogTitle = val;
+          }
+        })
+        // axios({
+        //   method: "get",
+        //   responseType: "blob", // 设置响应文件格式
+        //   url: `${
+        //     process.env.NODE_ENV === "production"
+        //       ? window._CONFIG["fileNginxUrl"] : process.env.VUE_APP_BASE_API2
+        //       // : "/fileApi"
+        //   }/网信办大屏内容文档/网络管理/约谈流程/${val}.docx`,
+        // }).then(({ data }) => {
+        //   if (data) {
+        //     this.dialogDetails = true;
+        //     this.$nextTick(() => {
+        //       docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+        //     });
+        //   }
+        // });
       }
     },
   },

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-17 15:36:11
+ * @LastEditTime: 2023-10-19 10:01:06
  * @FilePath     : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
 -->
 <template>
@@ -385,13 +385,13 @@ export default {
         data.map((item)=>{
           item.dateTime = this.getDate(item.dateTime)
           arr.push(item)
-          if(item.type == 1) {
-            arr1.push(item)
-          }else if(item.type == 2){
-            arr2.push(item)
-          }
+          // if(item.type == 1) {
+          //   arr1.push(item)
+          // }else if(item.type == 2){
+          //   arr2.push(item)
+          // }
         })
-        console.log(arr,'arr')
+        // console.log(arr,'arr')
         this.qlzfDataStatistics[1].data.map((item)=>{
           // arr2.map((arr)=>{
           arr.map((arr)=>{
@@ -414,22 +414,74 @@ export default {
     async reportbyyearDate(){
       // let data = await reportbyyear();
       let arr = []
-      for(let i = 1; i < 5; i++){
+      listJbsjndfltj({type:'上级下发'}).then(data=>{
+        let value = 0
         let obj = {}
-        listJbsjndfltj({type:i}).then(data=>{
-          // console.log(data)
+        data.rows.forEach(item=>{
+          value += item.count
+        })
+        obj.value = value;
+        obj.name = '上级下发';
+        arr.push(obj)
+      }).then(res=>{
+        this.pieData = arr;
+        this.inItPie()
+      })
+      listJbsjndfltj({type:'部门转发'}).then(data=>{
         let value = 0
+        let obj = {}
         data.rows.forEach(item=>{
           value += item.count
+        })
         obj.value = value;
-            obj.name = item.type == '1' ? '上级下发' : item.type == '2' ? '部门转发' : item.type == '3' ? '无效' : '小程序'
+        obj.name = '部门转发'
         arr.push(obj)
+      }).then(res=>{
+        this.pieData = arr;
+        this.inItPie()
       })
-          arr = arr.filter((item, index, self)=>{
-            return self.indexOf(item) == index;
+      listJbsjndfltj({type:'无效'}).then(data=>{
+        let value = 0
+        let obj = {}
+        data.rows.forEach(item=>{
+          value += item.count
         })
+        obj.value = value;
+        obj.name = '无效'
+        arr.push(obj)
+      }).then(res=>{
+        this.pieData = arr;
+        this.inItPie()
       })
-      }
+      listJbsjndfltj({type:'小程序'}).then(data=>{
+        let value = 0
+        let obj = {}
+        data.rows.forEach(item=>{
+          value += item.count
+        })
+        obj.value = value;
+        obj.name = '小程序'
+        arr.push(obj)
+      }).then(res=>{
+        this.pieData = arr;
+        this.inItPie()
+      })
+      // for(let i = 1; i < 5; i++){
+      //   let obj = {}
+      //   listJbsjndfltj({type:i}).then(data=>{
+      //     console.log(data,'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;
+      //     })
+      //   })
+      // }
       // let arr = []
       // for(let i = 0; i < data.data.length; i++){
       //   let obj = {}
@@ -438,9 +490,9 @@ export default {
       //   arr.push(obj)
       // }
       // this.pieData = arr;
-      this.inItPie()
     },
     getDate(date){
+      // 2023-10-17 15:14:07  截取月份
       const result = /-(\d{2})-/.exec(date);
       if (result !== null && result.length > 1) {
         const month = result[1];

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

@@ -100,7 +100,7 @@ export default {
   },
   async mounted() {
     // let data = await reportList();
-    listJbmap({isStatus:1}).then(data=>{
+    listJbmap({isStatus:1,pageNum:1,pageSize:50}).then(data=>{
       let arr = []
       data.rows.map((item)=>{
         let obj = {}

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
- * @LastEditors: lough
- * @LastEditTime: 2022-08-26 12:14:48
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-10-18 15:53:14
  * @Description:
 -->
 <template>
@@ -20,10 +20,12 @@
           class="text-row"
           :data-curData="idx"
         >
-          <span :data-curData="idx" :title="item.title">{{ item.articleTitle }}</span>
+          <!-- <span :data-curData="idx" :title="item.title">{{ item.articleTitle }}</span> -->
+          <span :data-curData="idx" :title="item.title">{{ item.title }}</span>
           <div :data-curData="idx" style="text-align: right">
-            <span :title="item.source" :data-curData="idx">{{ $filterDict('tc_yq_media',item.source) }}</span>
-            <span :data-curData="idx">{{ item.releaseTime }}</span>
+            <!-- <span :title="item.source" :data-curData="idx">{{ $filterDict('tc_yq_media',item.source) }}</span> -->
+            <span :title="item.source" :data-curData="idx">{{ item.source }}</span>
+            <span :data-curData="idx">{{ item.dateTime.split('T')[0] }}</span>
             <div />
           </div>
         </div>
@@ -77,7 +79,10 @@
 
 <script>
 import { allProjects, newsList, opinionWarningDetail, sjmtMedia } from '@/api/common'
-import { listArticle } from '@/api/zongzhi/st.js'
+import {
+  listFb,
+} from "@/api/networkEcology/index.js"
+// import { listArticle } from '@/api/zongzhi/st.js'
 import vueSeamlessScroll from 'vue-seamless-scroll'
 export default {
   components: {
@@ -361,7 +366,8 @@ export default {
   },
   methods: {
     getWz() {
-      listArticle(this.queryParams).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

@@ -1,8 +1,8 @@
 <!--
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
- * @LastEditors: lough
- * @LastEditTime: 2022-08-26 12:09:28
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-10-18 15:55:17
  * @Description:
 -->
 <template>
@@ -19,10 +19,10 @@
           class="text-row"
           :data-curData="idx"
         >
-          <span :data-curData="idx" :title="item.title ">{{ item.articleTitle }}</span>
+          <span :data-curData="idx" :title="item.title ">{{ item.title }}</span>
           <div style="text-align: right" :data-curData="idx">
-            <span :title="item.source" :data-curData="idx">{{ $filterDict('tc_yq_media',item.source) }}</span>
-            <span :data-curData="idx">{{ item.releaseTime }}</span>
+            <span :title="item.source" :data-curData="idx">{{ item.source }}</span>
+            <span :data-curData="idx">{{ item.dateTime.split('T')[0] }}</span>
             <div />
           </div>
         </div>
@@ -74,7 +74,10 @@
 
 <script>
 // import { loaclMedia, opinionWarningDetail } from '@/api/common'
-import { listArticle } from '@/api/zongzhi/st.js'
+// import { listArticle } from '@/api/zongzhi/st.js'
+import {
+  listFb,
+} from "@/api/networkEcology/index.js"
 import vueSeamlessScroll from 'vue-seamless-scroll'
 export default {
   components: {
@@ -359,7 +362,7 @@ export default {
   },
   methods: {
     getWz() {
-      listArticle(this.queryParams).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-16 16:16:22
+ * @LastEditTime: 2023-10-18 15:47:10
  * @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.title }}</span>
           </div>
         </vue-seamless-scroll>
         </div>
@@ -214,8 +214,16 @@
 
 <script>
 // import { getReviewArticle } from '@/api/common'
-import { listSafetyadmin, listCommentator, listPingtai, listNetSafetyZcUnit, listPrincipal, listVolunteer, listArticle ,networkArticles} from '@/api/zongzhi/st.js'
-
+// import { listSafetyadmin, listCommentator, listPingtai, listNetSafetyZcUnit, listPrincipal, listVolunteer, listArticle ,networkArticles} from '@/api/zongzhi/st.js'
+import {
+  listWldv,
+  listWpy,
+  listAqg,
+  listWlaqzcqy,
+  listWlmqfzr,
+  listWlwmzyz,
+  listWpwzlyqk,
+} from "@/api/networkEcology/index.js"
 import vueSeamlessScroll from 'vue-seamless-scroll'
 window.JSZip = require('jszip')
 export default {
@@ -418,19 +426,27 @@ export default {
   },
   methods: {
     /**
-     * 录用情况
+     * 录用情况   TODO:需接口要本级录用、苏州级录用、省级及以上录用的篇数
      */
     getNetworkArticles(){
-      networkArticles().then(res=>{
-        for(let key in this.articleType){
-          res.data.forEach(item=>{
-            if(this.$filterDict('tc_wz_type',item.type) == key){
-              this.articleType[key] = item.count
-            }
+      listWpwzlyqk({type:1,isStatus:1}).then(res=>{
+        this.articleType['本级录用'] = res.total;
       })
-        }
-      
+      listWpwzlyqk({type:2,isStatus:1}).then(res=>{
+        this.articleType['苏州级录用'] = res.total;
+      })
+      listWpwzlyqk({type:3,isStatus:1}).then(res=>{
+        this.articleType['省级及以上录用'] = res.total;
       })
+      // networkArticles().then(res=>{
+      //   for(let key in this.articleType){
+      //     res.data.forEach(item=>{
+      //       if(this.$filterDict('tc_wpwzlylx',item.type) == key){
+      //         this.articleType[key] = item.count
+      //       }
+      //     })
+      //   }
+      // })
     },
     /** 重置 */
     reset() {
@@ -485,15 +501,16 @@ export default {
      * 文明志愿者
      */
     getZyz(title) {
-      listVolunteer(this.queryParams).then(res => {
+      listWlwmzyz({...this.queryParams,isStatus:1}).then(res => {
+      // listVolunteer(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
           { name: '姓名', value: 'name' },
           { name: '年龄', value: 'age' },
-          { name: '活动内容', value: 'content' },
+          { name: '活动内容', value: 'activityContent' },
           { name: '单位', value: 'unit' },
           { name: '职务', value: 'duty' },
-          { name: '联系电话', value: 'phoneNum' }
+          { name: '联系电话', value: 'linkTel' }
         ]
         this.total = res.total
         this.dialogTitle = title
@@ -502,17 +519,18 @@ export default {
     },
     /** 网络安全官 */
     getNetAdmin(title) {
-      listSafetyadmin(this.queryParams).then(res => {
+      listAqg({...this.queryParams,isStatus:1}).then(res => {
+      // listSafetyadmin(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
           { name: '单位', value: 'unit' },
-          { name: '第一负责人', value: 'firstPrincipal' },
+          { name: '第一负责人', value: 'fzr' },
           { name: '职务', value: 'duty' },
-          { name: '直接负责人', value: 'directPrincipal' },
+          { name: '直接负责人', value: 'fzr1' },
           { name: '职务_1', value: 'duty1' },
-          { name: '负责科室', value: 'fuzeKeshi' },
-          { name: '网络安全官', value: 'networkAqg' },
-          { name: '职务_2', value: 'duty2' },
+          { name: '负责科室', value: 'fzks' },
+          { name: '网络安全官', value: 'fzr3' },
+          { name: '职务_2', value: 'duty3' },
           { name: '电话', value: 'tel' }
         ]
         this.total = res.total
@@ -522,17 +540,19 @@ export default {
     },
     /** 网评员 */
     getNetPj(title) {
-      listCommentator(this.queryParams).then(res => {
+      listWpy({...this.queryParams,isStatus:1}).then(res => {
+      // listCommentator(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
           { name: '姓名', value: 'name' },
-          { name: '性别', value: 'sex', isDict: true, dictType: 'sys_user_sex' },
+          // { name: '性别', value: 'sex', isDict: true, dictType: 'sys_user_sex' },
+          { name: '性别', value: 'sex' },
           { name: '年龄', value: 'age' },
-          { name: '名族', value: 'nationality' },
-          { name: '政治面貌', value: 'politicsStatus' },
+          { name: '民族', value: 'nationality' },
+          { name: '政治面貌', value: 'zzmm' },
           { name: '单位', value: 'unit' },
-          { name: '移动电话', value: 'phoneNum' },
-          { name: '微信号', value: 'vxNum' }
+          { name: '移动电话', value: 'phoneNumber' },
+          { name: '微信号', value: 'vxNumber' }
         ]
         this.total = res.total
         this.dialogTitle = title
@@ -543,14 +563,16 @@ export default {
      * 网络大V
      */
     getNetPt(title) {
-      listPingtai(this.queryParams).then(res => {
+      listWldv({...this.queryParams,isStatus:1}).then(res => {
+      // listPingtai(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
           { name: '分类', value: 'type' },
-          { name: '账号名称', value: 'name' },
-          { name: '属性', value: 'props', isDict: true, dictType: 'tc_net_sx' },
+          { name: '账号名称', value: 'zhName' },
+          // { name: '属性', value: 'props', isDict: true, dictType: 'tc_net_sx' },
+          { name: '属性', value: 'property' },
           { name: '简介', value: 'intro' },
-          { name: '粉丝数', value: 'fansNum' }
+          { name: '粉丝数', value: 'fsCount' }
         ]
         this.total = res.total
         this.dialogTitle = title
@@ -561,12 +583,13 @@ export default {
      * 网络安全支持企业
      */
     getZcEnterprise(title) {
-      listNetSafetyZcUnit(this.queryParams).then(res => {
+      listWlaqzcqy({...this.queryParams,isStatus:1}).then(res => {
+      // listNetSafetyZcUnit(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
-          { name: '支撑单位', value: 'name' },
+          { name: '支撑单位', value: 'zzUnit' },
           { name: '联系人', value: 'linkMan' },
-          { name: '联系方式', value: 'phoneNum' }
+          { name: '联系方式', value: 'linkTel' }
         ]
         this.total = res.total
         this.dialogTitle = title
@@ -577,15 +600,16 @@ export default {
      * 民情负责人
      */
     getFzr(title) {
-      listPrincipal(this.queryParams).then(res => {
+      listWlmqfzr({...this.queryParams,isStatus:1}).then(res => {
+      // listPrincipal(this.queryParams).then(res => {
         this.tableList = res.rows
         this.tableKey = [
-          { name: '单位', value: 'unitName' },
-          { name: '民情负责人', value: 'fuzeMan' },
+          { name: '单位', value: 'unit' },
+          { name: '民情负责人', value: 'mqFzr' },
           { name: '职务', value: 'duty' },
-          { name: '联系电话', value: 'tel' },
-          { name: '传真号码', value: 'faxNum' },
-          { name: '手机号码', value: 'phoneNum' }
+          { name: '联系电话', value: 'linkTel' },
+          { name: '传真号码', value: 'faxNumber' },
+          { name: '手机号码', value: 'phoneNumber' }
         ]
         this.total = res.total
         this.dialogTitle = title
@@ -600,7 +624,8 @@ export default {
      * 文章表
      */
     getWz() {
-      listArticle({ type: this.status }).then(res => {
+      listWpwzlyqk({ type: this.status, isStatus:1 }).then(res => {
+      // listArticle({ type: this.status }).then(res => {
         this.dataList = res.rows
       })
     },

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: lough
  * @Date: 2021-12-17 10:07:07
- * @LastEditors: lough
- * @LastEditTime: 2022-11-15 14:16:58
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-10-18 16:49:10
  * @Description:
 -->
 <template>
@@ -70,7 +70,11 @@
 
 <script>
 import { getComplete } from "@/api/common";
-import { listBjsj, listWpyrwwcl } from "@/api/zongzhi/st.js";
+// import { listBjsj, listWpyrwwcl } from "@/api/zongzhi/st.js";
+import {
+  listBjsjwp,
+  listWpyrwwcl,
+} from "@/api/networkEcology/index.js"
 export default {
   components: {},
   filters: {
@@ -102,31 +106,45 @@ export default {
   mounted() {
     this.getpercentageData();
     this.getNetworkAppraiser();
+
+
     // this.sjdata = Math.round(this.sjNum)
     // this.bjdata = Math.round(this.bjNum)
     // this.inItCylinder()
   },
   methods: {
     getNetworkAppraiser() {
-      listBjsj({ pageNum: 1, pageSize: 2 }).then((res) => {
-        this.sjNum = res.rows[0].percent;
-        this.sjNumName = res.rows[0].name;
-        this.bjNum = res.rows[1].percent;
-        this.bjNumName = res.rows[1].name;
+      // listBjsj({ pageNum: 1, pageSize: 2 }).then((res) => {
+      //   this.sjNum = res.rows[0].percent;
+      //   this.sjNumName = res.rows[0].name;
+      //   this.bjNum = res.rows[1].percent;
+      //   this.bjNumName = res.rows[1].name;
+      //   this.sjdata = Math.round(this.bjNum);
+      //   this.bjdata = Math.round(this.sjNum);
+      //   this.inItCylinder();
+      // });
+      listBjsjwp({ pageNum: 1, pageSize: 1 }).then(res=>{
+        this.bjNum = res.rows[0].count1;
+        this.bjNumName = '本级网评指令比例';
+        this.sjNum = res.rows[0].count2;
+        this.sjNumName = '上级网评指令比例';
         this.sjdata = Math.round(this.bjNum);
         this.bjdata = Math.round(this.sjNum);
         this.inItCylinder();
-      });
+      })
     },
     // 获取任务完成率data
     getpercentageData() {
-      listWpyrwwcl({ pageNum: 1, pageSize: 7 }).then((res) => {
+      // this.percentageName = ['太仓市', '城厢镇', '沙溪镇', '浏河镇', '浮桥镇', '璜泾镇', '双凤镇', '娄东街道', '陆渡街道', '科教新城']
+      listWpyrwwcl({ pageNum: 1, pageSize: 20 }).then((res) => {
+        console.log(res,'resres')
         res.rows.forEach((item) => {
-          let name = JSON.parse(item.areaId);
-          this.percentageName.push(
-            this.$filterDict("town", name[name.length - 1], true)
-          );
-          this.percentageValue.push(item.finish);
+          // let name = JSON.parse(item.areaId);
+          this.percentageName.push(item.unit)
+          // this.percentageName.push(
+          //   this.$filterDict("town", name[name.length - 1], true)
+          // );
+          this.percentageValue.push(item.count);
         });
         this.inItBar();
       });