Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-operate-ui/src/api/detail/party-a/qualification.js

@@ -9,9 +9,9 @@ export function certPage(data) {
   })
 }
 // 备案地
-export function recordArea(data) {
+export function recordAreaList(data) {
   return request({
-    url: '/enterpriseCert/recordArea',
+    url: '/enterprise/enterpriseCert/recordAreaList',
     method: 'post',
     data: data
   })
@@ -19,23 +19,23 @@ export function recordArea(data) {
 // 资质变更
 export function certChangePage(data) {
   return request({
-    url: '/enterpriseCert/certChangePage',
+    url: '/enterprise/enterpriseCert/certChangePage',
     method: 'post',
     data: data
   })
 }
 // 备案网站
-export function recordWebSite(data) {
+export function recordWebSiteList(data) {
   return request({
-    url: '/enterpriseCert/recordWebSite',
+    url: '/enterprise/enterpriseCert/recordWebSiteList',
     method: 'post',
     data: data
   })
 }
 // 安许证
-export function lice(data) {
+export function liceList(data) {
   return request({
-    url: '/enterpriseCert/lice',
+    url: '/enterprise/enterpriseCert/liceList',
     method: 'post',
     data: data
   })

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

@@ -34,6 +34,13 @@ export function companyList(data) {
     data: data
   })
 }
+// 添加默认监控
+export function defaultAdd() {
+  return request({
+    url: '/monitor/add/default',
+    method: 'post',
+  })
+}
 // 添加监控企业
 export function companyAdd(data) {
   return request({

dsk-operate-ui/src/views/detail/party-a/qualification/qualification.vue

@@ -21,10 +21,18 @@
         highlight-current-row
       >
         <el-table-column label="序号" width="60" align="left" type="index"></el-table-column>
-        <el-table-column label="资质编号" width="150" prop="certificateNo"></el-table-column>
+        <el-table-column label="资质编号" width="200" prop="certificateNo"></el-table-column>
         <el-table-column label="资质名称" min-width="200" prop="certName"></el-table-column>
-        <el-table-column label="发证日期" width="150" prop="issueDate"></el-table-column>
-        <el-table-column label="有效期" width="150" prop="validityDate"></el-table-column>
+        <el-table-column label="发证日期" width="180" prop="issueDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.issueDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期" width="180" prop="validityDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.validityDate) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="发证机关" min-width="200" prop="authority"></el-table-column>
       </el-table>
       <div class="pagination-box" v-if="show_page && tableDataTotal>queryParams.pageSize">
@@ -37,7 +45,7 @@
 <script>
   import skeleton from '../component/skeleton';
   import { statistic } from '@/api/detail/party-a/index';
-  import { certPage,certChangePage,recordArea,recordWebSite,lice } from '@/api/detail/party-a/qualification';
+  import { certPage,certChangePage,recordAreaList,recordWebSiteList,liceList } from '@/api/detail/party-a/qualification';
   export default {
     name: "qualification",
     components: {
@@ -77,29 +85,36 @@
         };
         let res = await statistic(params);
         if (res.code == 200) {
-          // this.statisticList = res.data.newQualification;
+          let data=res.data.newQualification
           let arr=[]
-          for(let i=0; i<res.data.newQualification.length; i++){
-            if(res.data.newQualification[i].qualificationMount !=0){
-              arr.push(res.data.newQualification[i])
+          for(let i=0; i<data.length; i++){
+            if(data[i].qualificationMount !=0){
+              arr.push(data[i])
             }
           }
-          this.statisticList = arr;
+          let removerList=['资质变更','备案地','备案网站','安许证']
+
+          let arrList=arr.filter(function (item) {
+            return !removerList.includes(item.qualificationParamNameCn)
+          })
+          this.statisticList = arrList;
+
+
           this.stateColor=this.statisticList[0].qualificationParamNameCn;
           this.getCertPage()
 
-          if(this.stateColor === '资质变更'){
-            this.getCertChangePage()
-          }
-          if(this.stateColor === '备案地'){
-            this.getRecordArea()
-          }
-          if(this.stateColor === '备案网站'){
-            this.getRecordWebSite()
-          }
-          if(this.stateColor === '安许证'){
-            this.getLice()
-          }
+          // if(this.stateColor === '资质变更'){
+          //   this.getCertChangePage()
+          // }
+          // if(this.stateColor === '备案地'){
+          //   this.getRecordArea()
+          // }
+          // if(this.stateColor === '备案网站'){
+          //   this.getRecordWebSite()
+          // }
+          // if(this.stateColor === '安许证'){
+          //   this.getLice()
+          // }
 
         }
       },
@@ -122,7 +137,7 @@
         this.isSkeleton = true
         let params = {
           ...this.queryParams,
-          companyId: this.companyId,
+          cid: this.companyId,
         };
         let res = await certChangePage(params);
         if (res.code == 200) {
@@ -134,11 +149,11 @@
         this.isSkeleton = true
         let params = {
           ...this.queryParams,
-          companyId: this.companyId,
+          cid: this.companyId,
         };
-        let res = await recordArea(params);
+        let res = await recordAreaList(params);
         if (res.code == 200) {
-          this.tableData=res.rows;
+          this.tableData=res.data;
           this.isSkeleton = false
         }
       },
@@ -146,11 +161,11 @@
         this.isSkeleton = true
         let params = {
           ...this.queryParams,
-          companyId: this.companyId,
+          cid: this.companyId,
         };
-        let res = await lice(params);
+        let res = await liceList(params);
         if (res.code == 200) {
-          this.tableData=res.rows;
+          this.tableData=res.data;
           this.isSkeleton = false
         }
       },
@@ -158,11 +173,11 @@
         this.isSkeleton = true
         let params = {
           ...this.queryParams,
-          companyId: this.companyId,
+          cid: this.companyId,
         };
-        let res = await recordWebSite(params);
+        let res = await recordWebSiteList(params);
         if (res.code == 200) {
-          this.tableData=res.rows;
+          this.tableData=res.data;
           this.isSkeleton = false
         }
       },

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

@@ -33,6 +33,7 @@
           <div class="total">共 {{tableDataTotal}} 条</div>
           <div class="right">
             <span class="add" @click="addEnterprise">添加企业</span>
+            <span class="add" @click="addDefault" style="width: 110px;">添加默认监控</span>
             <span class="add1" @click="handleBatch">批量监控</span>
           </div>
         </div>
@@ -161,7 +162,7 @@
 </template>
 
 <script>
-  import { companyPage,companyList,companyAdd,companyCancel,queryMonitorCompany } from '@/api/monitoring/monitoring'
+  import { companyPage,companyList,companyAdd,companyCancel,queryMonitorCompany,defaultAdd } from '@/api/monitoring/monitoring'
   import { getToken } from '@/utils/auth'
   import skeleton from '../component/skeleton'
   export default {
@@ -361,6 +362,21 @@
           this.querySubmit()
         })
       },
+      addDefault(){
+        this.$confirm('是否添加所有供应商监控', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          defaultAdd().then(res => {
+            if(res.code === 200){
+              this.$message.success(res.msg);
+            }
+          })
+        }).catch(() => {
+
+        });
+      },
       addEnterprise(){
         this.qyVisible=true;
         this.loading = true