Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/views/core/accessPlan/index.vue

@@ -53,7 +53,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-              v-hasPermi="['system:plan:add']">新增计划</el-button>
+              v-hasPermi="['core:accessPlan:add']">新增计划</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -88,11 +88,11 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:plan:edit']">修改</el-button>
+                v-hasPermi="['core:accessPlan:edit']">修改</el-button>
               <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0" icon="el-icon-add"
-                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">下发</el-button>
+                @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['system:device:remove']">删除</el-button>
+                v-hasPermi="['core:accessPlan:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -152,7 +152,7 @@
           </el-date-picker>
         </el-form-item> -->
         <el-form-item prop="endTime" v-if="form.planCycle == 0" label="结束日期">
-          <el-date-picker v-model="form.endTime"  align="right" type="date"
+          <el-date-picker v-model="form.endTime"  :picker-options="endDatepickerOptions" align="right" type="date"
             placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
@@ -202,7 +202,7 @@ export default {
         },
       },
       endDatepickerOptions: {
-        disabledDate: this.disabledDate,
+        disabledDate:this.disabledDate
       },
       // 遮罩层
       loading: true,
@@ -321,22 +321,21 @@ export default {
       this.handleQuery();
     },
     startDateChanged(time) {
-      debugger
-      console.log(time + "*********************")
+  
       if (this.form.startTime > this.form.endTime) {
         this.form.endTime = this.form.startTime;
       }
     },
     disabledDate(time) {
       //小于开始日期禁止选择
-      let startTiem = new Date();
-      startTime.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      let startTime = new Date();
+      startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
       if (this.form.startTime) {
-        startTiem = new Date(this.formatTime(this.form.startTiem, 'YYYY-MM-DD'));
-        startTiem.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+        
+        startTime = new Date(this.formatTime(this.form.startTime, 'YYYY-MM-DD'));
+        startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
       }
-      debugger
-      return time.getTime() < new Date(startTiem).getTime()
+      return time.getTime() < new Date(startTime).getTime()
     },
     /** 搜索按钮操作 */
     handleQuery() {

src/views/system/area/index.vue

@@ -183,6 +183,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        name: [
+          { required: true, message: '请输入区域名称', trigger: 'blur' },
+        ],
+        orgType: [
+          { required: true, message: '请选择机构类型', trigger: 'change' },
+        ],
       }
     };
   },

src/views/system/bind/index.vue

@@ -266,9 +266,9 @@ export default {
       this.handleQuery();
     },
     changeSelectArea(val){
-    
       getAreaByOrg(val).then(response =>{
       this.roleOptions  = response.data;
+    this.  form.areaId=null
       })
     },
     
@@ -317,7 +317,7 @@ export default {
       this.form = {
         id: null,
         areaId: null,
-        enable: "1",
+        enable: "0",
         code: null,
         createTime: null,
         updateId: null,

src/views/system/check/index.vue

@@ -88,7 +88,13 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="16">
-            <el-form-item label="区域名称" prop="areaId">
+            <el-form-item label="归属部门" prop="orgId">
+              <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" @select="changeSelectArea"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="区域名称" v-if="form.orgId!=null" prop="areaId">
               <el-select v-model="form.areaId" placeholder="请选择区域名称">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -99,12 +105,7 @@
           <el-input v-model="form.checkName" placeholder="请输入采集点名称" />
         </el-form-item>
         <el-row>
-          <el-col :span="16">
-            <el-form-item label="归属部门" prop="orgId">
-              <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
+ 
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -121,7 +122,7 @@ import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/syst
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
-import { listArea } from "@/api/system/area";
+import { listArea,getAreaByOrg } from "@/api/system/area";
 export default {
   name: "Check",
   /** 引入基础minxins*/
@@ -228,6 +229,7 @@ export default {
 
       getAreaByOrg(val).then(response => {
         this.roleOptions = response.data;
+        this.form.areaId=null;
       })
     },
     /** 查询区域采集点列表 */

src/views/system/device/index.vue

@@ -25,7 +25,7 @@
           </el-form-item>
           <el-form-item label="资产类别" prop="assetType">
 
-            <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择">
+            <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择" @change="changeSelectDevice">
               <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                 :value="`${dict.value}`"></el-option>
             </el-select>
@@ -34,10 +34,10 @@
           <el-form-item label="设备分类" prop="deviceType">
 
             <el-select style="width: 100%;" v-model="queryParams.deviceType" placeholder="请选择">
-              <el-option v-for="dict in dict.type.sys_device_type" :key="dict.value" :label="dict.label"
-                :value="`${dict.value}`"></el-option>
+                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> 
+
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -63,7 +63,7 @@
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="所属机构" align="center" prop="orgName" />
-
+          <el-table-column label="设备品牌" align="center" prop="deviceName" />
           <el-table-column label="资产类别" align="center" key="assetType" prop="assetType" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType" />
@@ -292,6 +292,7 @@ export default {
   created() {
     this.getDeptTree();
     //this.getList();
+   
   },
   watch: {
     // 根据名称筛选部门树
@@ -421,6 +422,11 @@ export default {
       this.open = true;
       this.title = "新增";
       this.form.orgId = this.selectOrgId;
+      console.log(this.form.orgId)
+      // getHostByOrgId(this.form).then(response => {
+      //   this.form.hostId = null;
+      //   this.hostList = response.data;
+      // })
     },
     changeSelectDevice(val) {
       getDeviceType(val).then(response => {