修改

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

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

dsk-operate-ui/src/api/system/config.js

@@ -16,6 +16,21 @@ export function getConfig(configId) {
     method: 'get'
   });
 }
+// 根据参数键名查询参数值
+export function configKey(configId) {
+  return request({
+    url: '/system/config/key/' + configId,
+    method: 'get'
+  });
+}
+// 根据键修改值
+export function configUpdate(data) {
+  return request({
+    url: '/system/config/updateValue',
+    method: 'PUT',
+    data: data
+  });
+}
 
 // 根据参数键名查询参数值
 export function getConfigKey(configKey) {

dsk-operate-ui/src/api/system/supplierBad.js

+import request from '@/utils/request';
+import { parseStrEmpty } from "@/utils/ruoyi";
+
+// 推送分页列表
+export function pageList(query) {
+  return request({
+    url: '/sysPush/pageList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 添加推送人
+export function sysPush(data) {
+  return request({
+    url: '/sysPush',
+    method: 'post',
+    data: data
+  });
+}
+
+// 修改推送状态
+export function updateStatus(data) {
+  return request({
+    url: '/sysPush/updateStatus',
+    method: 'put',
+    data: data
+  });
+}
+// 删除推送人
+export function sysPushDel(id) {
+  return request({
+    url: '/sysPush/' + id,
+    method: 'delete'
+  });
+}

dsk-operate-ui/src/assets/js/common.js

@@ -92,8 +92,29 @@ let checkTag = function(str, oldTag, newTag) { //str字符串， oldTag当前标
   return newHtml
 }
 
+let changeTime = function(item){
+  let value = Number(item)
+  let now = new Date().getTime()
+  if( now-value<1000*60*59 ) {
+    if( (now-value)/(1000*60) ){
+      return Math.ceil((now-value)/(1000*60))+'分钟前'
+    }else{
+      return '1分钟前'
+    }
+  }else if(now-value<1000*60*60*23) {
+    return Math.ceil((now-value)/(1000*60*60))+'小时前'
+  }else {
+    let YMD = new Date(value)
+    let Y = YMD.getFullYear() + '-';//年
+    let M =(YMD.getMonth() + 1 < 10 ? '0' + (YMD.getMonth() + 1) : YMD.getMonth() + 1) + '-';//月
+    let D =(YMD.getDate() < 10 ? '0' + YMD.getDate() : YMD.getDate());//日
+    return Y+M+D
+  }
+}
+
 export {
   encodeStr,
+  changeTime,
   changePath,
   saveFixed,
   removeTag,

dsk-operate-ui/src/router/index.js

@@ -103,6 +103,21 @@ export const constantRoutes = [
   //     }
   //   ]
   // },
+  {
+    path: '/monitoring/MonitoringReportDetails',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/monitoring/MonitoringReportDetails/:id',
+        component: () => import('@/views/monitoring/MonitoringReportDetails'),
+        name: 'MonitoringDynamics',
+        meta: { title: '监控报告详情', noCache: false },
+      }
+    ]
+  },
+
   {
     path: '',
     component: Layout,

dsk-operate-ui/src/views/monitoring/MonitoringReport.vue

@@ -3,133 +3,45 @@
     <div class="app-container MonitoringReport">
       <div class="header">
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="监控日报" name="first"></el-tab-pane>
-          <el-tab-pane label="监控周报" name="second"></el-tab-pane>
-          <el-tab-pane label="监控月报" name="third"></el-tab-pane>
+          <el-tab-pane label="监控日报" name="1"></el-tab-pane>
+          <el-tab-pane label="监控周报" name="2"></el-tab-pane>
+          <el-tab-pane label="监控月报" name="3"></el-tab-pane>
         </el-tabs>
       </div>
       <div class="report-content">
-        <div class="list">
+        <div class="list" v-for="item in dataList">
           <div class="list-title">
             <div class="flex-box query-box">
               <div class="flex-box query-params">
-                <span class="common-title">今日</span>
+                <span class="common-title">{{item.period}}</span>
               </div>
               <div class="flex-box query-ability">
                 共<span style="color:#0081FF;padding: 0 4px;">13</span>家企业发生<span style="color:#F7965B;padding: 0 4px;">651</span>条动态信息
               </div>
             </div>
           </div>
-          <div class="item">
+          <div class="item" v-for="i in item.list">
             <div class="item-left">
-              <!--<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <!--<img v-else src="@/assets/images/enterprise.png" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <img src="@/assets/images/enterprise.png"/>
+              <img v-if="i.logoUrl" :src="i.logoUrl" :alt="i.companyOrstaffName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
+              <img v-else src="@/assets/images/enterprise.png" :alt="i.companyOrstaffName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
             </div>
             <div class="item-right">
               <p class="right-title">
-                <span>中国铁建集团</span>
+                <router-link  :to="`/monitoring/MonitoringReportDetails/${i.companyOrstaffId}`" tag="a" class="a-link companyName">{{i.companyOrstaffName}}</router-link>
               </p>
               <p class="card-right-p">
                 <span class="right-label">提示：</span>
-                <span class="right-color color1">11</span>
+                <span class="right-color color1">{{i.promptCount}}</span>
                 <span class="right-label">正向：</span>
-                <span class="right-color color1">21</span>
+                <span class="right-color color1">{{i.positiveCount}}</span>
                 <span class="right-label">低风险：</span>
-                <span class="right-color color1">31</span>
+                <span class="right-color color1">{{i.lowRiskCount}}</span>
                 <span class="right-label">中风险：</span>
-                <span class="right-color color1">41</span>
+                <span class="right-color color1">{{i.middleRiskCount}}</span>
                 <span class="right-label">高风险：</span>
-                <span class="right-color color1">1</span>
+                <span class="right-color color1">{{i.highRiskCount}}</span>
               </p>
-              <div class="tips">新增<span>654</span>条动态信息</div>
-            </div>
-          </div>
-          <div class="item">
-            <div class="item-left">
-              <!--<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <!--<img v-else src="@/assets/images/enterprise.png" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <img src="@/assets/images/enterprise.png"/>
-            </div>
-            <div class="item-right">
-              <p class="right-title">
-                <span>中国铁建集团</span>
-              </p>
-              <p class="card-right-p">
-                <span class="right-label">提示：</span>
-                <span class="right-color color1">11</span>
-                <span class="right-label">正向：</span>
-                <span class="right-color color2">21</span>
-                <span class="right-label">低风险：</span>
-                <span class="right-color color3">31</span>
-                <span class="right-label">中风险：</span>
-                <span class="right-color color4">41</span>
-                <span class="right-label">高风险：</span>
-                <span class="right-color color5">1</span>
-              </p>
-              <div class="tips">新增<span>654</span>条动态信息</div>
-            </div>
-          </div>
-        </div>
-        <div class="list">
-          <div class="list-title">
-            <div class="flex-box query-box">
-              <div class="flex-box query-params">
-                <span class="common-title">昨日</span>
-              </div>
-              <div class="flex-box query-ability">
-                共<span style="color:#0081FF;padding: 0 4px;">13</span>家企业发生<span style="color:#F7965B;padding: 0 4px;">651</span>条动态信息
-              </div>
-            </div>
-          </div>
-          <div class="item">
-            <div class="item-left">
-              <!--<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <!--<img v-else src="@/assets/images/enterprise.png" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <img src="@/assets/images/enterprise.png"/>
-            </div>
-            <div class="item-right">
-              <p class="right-title">
-                <span>中国铁建集团</span>
-              </p>
-              <p class="card-right-p">
-                <span class="right-label">提示：</span>
-                <span class="right-color color1">11</span>
-                <span class="right-label">正向：</span>
-                <span class="right-color color1">21</span>
-                <span class="right-label">低风险：</span>
-                <span class="right-color color1">31</span>
-                <span class="right-label">中风险：</span>
-                <span class="right-color color1">41</span>
-                <span class="right-label">高风险：</span>
-                <span class="right-color color1">1</span>
-              </p>
-              <div class="tips">新增<span>654</span>条动态信息</div>
-            </div>
-          </div>
-          <div class="item">
-            <div class="item-left">
-              <!--<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <!--<img v-else src="@/assets/images/enterprise.png" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />-->
-              <img src="@/assets/images/enterprise.png"/>
-            </div>
-            <div class="item-right">
-              <p class="right-title">
-                <span>中国铁建集团</span>
-              </p>
-              <p class="card-right-p">
-                <span class="right-label">提示：</span>
-                <span class="right-color color1">11</span>
-                <span class="right-label">正向：</span>
-                <span class="right-color color2">21</span>
-                <span class="right-label">低风险：</span>
-                <span class="right-color color3">31</span>
-                <span class="right-label">中风险：</span>
-                <span class="right-color color4">41</span>
-                <span class="right-label">高风险：</span>
-                <span class="right-color color5">1</span>
-              </p>
-              <div class="tips">新增<span>654</span>条动态信息</div>
+              <div class="tips">新增<span style="color:#0081FF;padding: 0 4px;">{{i.dynamicTotal}}</span>条动态信息</div>
             </div>
           </div>
         </div>
@@ -138,26 +50,40 @@
 </template>
 
 <script>
+  import { reportPage } from '@/api/monitoring/monitoring'
   export default {
     name: 'MonitoringReport',
     data() {
       return {
-        activeName:'first',
+        activeName:'1',
         dataList:[
           {
             time:'今日',
             list:[]
           }
-        ]
+        ],
+        queryParams:{
+          pageNum:1,
+          pageSize:10,
+          condition:{
+            reportType:1
+          }
+        }
       }
     },
     created() {
-
+      this.querySubmit()
     },
     methods: {
-
+      async querySubmit() {
+        reportPage(this.queryParams).then(res => {
+          console.log(res)
+          this.dataList=res.rows
+        })
+      },
       handleClick() {
-
+        this.queryParams.condition.reportType=Number(this.activeName)
+        this.querySubmit()
       }
     }
   }