修改

dsk-operate-ui/src/api/monitoring/owner.js

+import request from '@/utils/request'
+
+
+//监控动态
+export function dynamicPage(data) {
+  return request({
+    url: '/monitor/user/company/dynamicPage',
+    method: 'post',
+    data: data
+  })
+}
+//监控动态详情
+export function dynamicDetail(data) {
+  return request({
+    url: '/monitor/user/company/dynamicDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 企业监控列表
+export function companyPage(data) {
+  return request({
+    url: '/monitor/user/system/companyPage',
+    method: 'post',
+    data: data
+  })
+}
+// 模糊查企业联想
+export function companyList(data) {
+  return request({
+    url: '/enterprise/index',
+    method: 'post',
+    data: data
+  })
+}
+// 添加默认监控
+export function defaultAdd() {
+  return request({
+    url: '/monitor/user/add/default',
+    method: 'post',
+  })
+}
+// 添加监控企业
+export function companyAdd(data) {
+  return request({
+    url: '/monitor/user/system/add',
+    method: 'post',
+    data: data
+  })
+}
+// 获取监控推荐企业
+export function queryMonitorCompany(data) {
+  return request({
+    url: '/monitor/user/system/queryMonitorCompany',
+    method: 'post',
+    data: data
+  })
+}
+// 取消监控企业
+export function companyCancel(data) {
+  return request({
+    url: '/monitor/user/system/cancel',
+    method: 'post',
+    data: data
+  })
+}
+// 企业监控详情
+export function companyDetail(data) {
+  return request({
+    url: '/monitor/user/system/detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 监控报告
+export function reportPage(data) {
+  return request({
+    url: '/monitor/user/reportPage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 监控维度设置-类型
+export function rulesSelect() {
+  return request({
+    url: '/monitor/user/push/rulesSelect',
+    method: 'get',
+  })
+}
+
+// 监控维度设置-新增修改
+export function insertOrUpdate(data) {
+  return request({
+    url: '/monitor/user/push/rules/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 监控维度设置
+export function rulesDetail(data) {
+  return request({
+    url: '/monitor/user/push/rulesDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+
+

dsk-operate-ui/src/views/owner/EnterpriseMonitoring.vue

@@ -163,7 +163,7 @@
 </template>
 
 <script>
-  import { companyPage,companyList,companyAdd,companyCancel,queryMonitorCompany,defaultAdd } from '@/api/monitoring/monitoring'
+  import { companyPage,companyList,companyAdd,companyCancel,queryMonitorCompany,defaultAdd } from '@/api/monitoring/owner'
   import { getToken } from '@/utils/auth'
   import skeleton from '../component/skeleton'
   export default {

dsk-operate-ui/src/views/owner/MonitoringDynamics.vue

@@ -159,7 +159,7 @@
 <script>
   import { v4 } from "uuid";
   import {changeTime} from "@/assets/js/common.js"
-  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/monitoring'
+  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/owner'
   import InfoTable from '../detail/party-a/component/infoTable';
   import skeleton from '../component/skeleton'
   export default {

dsk-operate-ui/src/views/owner/MonitoringDynamicsgs.vue

@@ -158,7 +158,7 @@
 <script>
   import { v4 } from "uuid";
   import {changeTime} from "@/assets/js/common.js"
-  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/monitoring'
+  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/owner'
   import InfoTable from '../detail/party-a/component/infoTable';
   import skeleton from '../component/skeleton'
   export default {

dsk-operate-ui/src/views/owner/MonitoringDynamicsjy.vue

@@ -152,7 +152,7 @@
 <script>
   import { v4 } from "uuid";
   import {changeTime} from "@/assets/js/common.js"
-  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/monitoring'
+  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/owner'
   import InfoTable from '../detail/party-a/component/infoTable';
   import skeleton from '../component/skeleton'
   export default {

dsk-operate-ui/src/views/supplier/supplierOverview/index.vue

@@ -867,8 +867,6 @@
         const year = yesterday.getFullYear();
         const month = ('0' + (yesterday.getMonth() + 1)).slice(-2); // 月份是从0开始的
         const day = ('0' + yesterday.getDate()).slice(-2);
-        console.log(`${year}-${month}-${day}`)
-
         let params={
           "beginTime": `${year}-${month}-${day}`,
           "endTime": `${year}-${month}-${day}`
@@ -890,7 +888,6 @@
           params.riskType=this.value2
         }
         riskChange(params).then(res => {
-          console.log(res.data)
           if(res.code === 200){
             this.fxqsList=res.data
             this.initChart1(this.fxqsList)
@@ -1219,18 +1216,23 @@
         // 绘制图表
         let data =[]
         this.viewData.length>0&&this.viewData.map(item=>{
-          data.push({value:Number(item.quantity),name:item.name,money:item.money})
+          data.push({value:Number(item.quantity) ? Number(item.quantity) : 0,name:item.name,money:item.money})
         })
         let option = {
           tooltip: {
             trigger: 'item',
             show: true,
             formatter: function(params) {
-              console.log(params)
+              if(!params.data){
+                params.data={
+                  money:0
+                }
+                params.value=0
+              }
               return `<span style="color:rgba(35, 35, 35, 1);font-size:14px;">${params.name}</span><br>
-            <span style="color:#3D3D3D;font-size:12px;">供应商数量</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.value}</span><br>
-            <span style="color:#3D3D3D;font-size:12px;">履约金额（亿）</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.data.money}</span><br>
-            `
+                <span style="color:#3D3D3D;font-size:12px;">供应商数量</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.value}</span><br>
+                <span style="color:#3D3D3D;font-size:12px;">履约金额（亿）</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.data.money}</span><br>
+              `
             }
           },
           // 左侧小导航图标