Merge branch 'V0.0.6_iot' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6_iot

src/views/core/accessPlan/index.vue

@@ -40,6 +40,7 @@
                   style="width: 100%"
                   v-model="queryParams.orgType"
                   placeholder="请选择机构类型"
+                  clearable
                   @change="changeSelect"
                 >
                   <el-option
@@ -54,6 +55,7 @@
                 <el-select
                   v-model="queryParams.roleId"
                   placeholder="请选择用户角色"
+                  clearable
                 >
                   <el-option
                     v-for="item in roleList"
@@ -68,6 +70,7 @@
                   style="width: 100%"
                   v-model="queryParams.planCycle"
                   placeholder="请选择任务周期"
+                  clearable
                 >
                   <el-option
                     v-for="dict in dict.type.sys_access_cycle"
@@ -82,6 +85,7 @@
                   style="width: 100%"
                   v-model="queryParams.planStatus"
                   placeholder="请选择任务状态"
+                  clearable
                 >
                   <el-option
                     v-for="dict in dict.type.edu_plan_status"
@@ -530,6 +534,7 @@ export default {
       check: null,
       //角色列表
       roleList: [],
+      allRoleList:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -593,6 +598,7 @@ export default {
   created() {
     allRole().then((response) => {
       this.roleList = response.data;
+      this.allRoleList=response.data;
     });
   },
 
@@ -704,6 +710,10 @@ export default {
       });
     },
     changeSelect(val) {
+      if(!val) {
+        this.roleList=this.allRoleList;
+        return;
+      };
       findRoleByType(val).then((response) => {
         this.roleList = response;
         this.queryParams.roleId = null;

src/views/core/reportForms/intrusionTestReport.vue

@@ -49,7 +49,7 @@
           </el-row>
       </div>
       <div class="main-search-box" style="margin-bottom: 0;">
-        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+        <h1 style="text-align:center;">{{ this.title}}</h1>
       </div>
           <el-table
             border

src/views/core/reportForms/monitorAccessReport.vue

@@ -51,7 +51,7 @@
 
           </div>
           <div class="main-search-box" style="margin-bottom: 0;">
-            <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+            <h1 style="text-align:center;">{{ this.title}}</h1>
           </div>
           <el-table
             border
@@ -312,7 +312,9 @@ getDefaultOrg(node) {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.orgId=
+      this.queryParams.orgId=this.orgId;
+      this.weeks=new Date();
+      this.setWeekNum();
       this.handleQuery();
      // this.getDeptTree();
     },

src/views/core/reportForms/resumptionReport.vue

@@ -69,7 +69,7 @@
           </el-row>
       </div>
       <div class="main-search-box" style="margin-bottom: 0;">
-        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+        <h1 style="text-align:center;">{{ this.title}}</h1>
       </div>
           <el-table
             border

src/views/core/reportForms/safetyInspectReport.vue

@@ -38,7 +38,7 @@
               </el-form-item>
 
         <el-form-item label="机构类型" prop="orgType">
-          <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型"
+          <el-select style="width: 100%;" clearable v-model="queryParams.orgType" placeholder="请选择机构类型"
                   >
             <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                        :value="`${dict.value}`"></el-option>
@@ -72,7 +72,7 @@
     </div>
     <div class="main-search-box" style="margin-bottom: 0;">
       <el-row>
-        <h1 class="title" style="text-align:center;">{{ this.title }}</h1>
+        <h1 style="text-align:center;">{{ this.title }}</h1>
       </el-row>
     </div>
     <el-table

src/views/core/reportForms/selfInspectReport.vue

@@ -66,7 +66,7 @@
     </el-row>
     </div>
     <div class="main-search-box" style="margin-bottom: 0;">
-      <h1 class="title" style="text-align:center;">{{ this.title }}</h1>
+      <h1 style="text-align:center;">{{ this.title }}</h1>
     </div>
     <el-table
       v-loading="loading"

src/views/core/reportForms/serviceBankReport.vue

@@ -54,7 +54,7 @@
 
           </div>
       <div class="main-search-box" style="margin-bottom: 0;">
-        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+        <h1 style="text-align:center;">{{ this.title}}</h1>
       </div>
 
       <el-table

src/views/core/reportForms/standbyPowerReport.vue

@@ -45,7 +45,7 @@
           </el-row>
         </div>
       <div class="main-search-box" style="margin-bottom: 0;">
-        <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
+        <h1 style="text-align:center;">{{ this.title}}</h1>
       </div>
           <el-table
             border

src/views/system/device/index.vue

@@ -22,7 +22,7 @@
                 <el-form-item label="设备类别" prop="assetType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
-                             @change="searchChangeSelectDevice">
+                             @change="searchChangeSelectDevice" clearable>
                     <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                                :value="`${dict.value}`"></el-option>
                   </el-select>
@@ -30,7 +30,7 @@
 
                 <el-form-item label="设备分类" prop="deviceType" label-width="80">
 
-                  <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
+                  <el-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择设备种类">
                     <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
                                :value="item.dictValue"></el-option>
                   </el-select>