修改

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

@@ -86,7 +86,7 @@
           <el-button type="primary" @click="handleConfirm">确定取消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" :close-on-click-modal="false">
+      <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" :close-on-click-modal="false" @close="handleCancel1">
         <div class="add-content">
           <div class="enterprise">
             <div class="label">企业名称</div>
@@ -115,7 +115,7 @@
           <el-button type="primary" @click="handleAdd">确定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="pldrVisible" custom-class='dialog-claim' title="批量导入监控企业" width="480px" :close-on-click-modal="false">
+      <el-dialog :visible.sync="pldrVisible" custom-class='dialog-claim' title="批量导入监控企业" width="480px" :close-on-click-modal="false" @close="handleUploadCancel1">
         <div class="upload-content">
           <el-upload
             class="upload-demo"
@@ -219,7 +219,6 @@
     },
     methods: {
       async querySubmit() {
-        console.log(this.queryParams)
         companyPage(this.queryParams).then(res => {
           console.log(res)
           this.isSkeleton = false;
@@ -247,13 +246,18 @@
         let data={
           cid:this.cid
         }
-        companyAdd(data).then(res => {
-          this.qyVisible=false;
-          this.companyName=''
-          this.dataList=[]
-          this.$message.success("新增成功");
-          this.querySubmit()
-        })
+        if(this.cid.length > 0){
+          companyAdd(data).then(res => {
+            this.qyVisible=false;
+            this.companyName=''
+            this.dataList=[]
+            this.$message.success("新增成功");
+            this.querySubmit()
+          })
+        }else {
+          this.$message.warning("请选择要添加的企业");
+        }
+
 
       },
       radioBtn(val){
@@ -385,7 +389,12 @@
         a.remove();
       },
       submitUpload() {
-        this.$refs.upload.submit();
+        if(this.fileList.length > 0){
+          this.$refs.upload.submit();
+        }else {
+          this.$message.warning("请选择要上传的内容");
+        }
+
       },
     }
   }

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

@@ -447,26 +447,16 @@
             this.querySubmit()
             break;
           case 2:
-            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 3))
-            this.queryParams.condition.endTime = this.formatDate(endTime)
-            this.querySubmit()
-            break;
-          case 3:
             this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 7))
             this.queryParams.condition.endTime = this.formatDate(endTime)
             this.querySubmit()
             break;
-          case 4:
-            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 15))
-            this.queryParams.condition.endTime = this.formatDate(endTime)
-            this.querySubmit()
-            break;
-          case 5:
+          case 3:
             this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 30))
             this.queryParams.condition.endTime = this.formatDate(endTime)
             this.querySubmit()
             break;
-          case 6:
+          case 4:
             this.date=[]
             break;
           default: