luowei пре 2 година
родитељ
комит
63f659c898

+ 1 - 1
src/views/core/accessPlan/index.vue

@@ -13,7 +13,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
           <el-form-item label="机构类型" prop="orgType">
-            <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择">
+            <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择" @change="changeSelect">
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                 :value="`${dict.value}`"></el-option>
             </el-select>

+ 7 - 3
src/views/information/configuration/index.vue

@@ -274,10 +274,14 @@ export default {
       })
       console.log(flag,'flag')
       if(!flag) return;
-      let data = {
-        coreResumptionConfiguration:[this.day,this.week,this.month,]
+      let coreResumptionConfiguration = {
+        0:this.day,
+     1: this.week,
+     2: this.month
       };
-      insertConfiguration(data).then(response=>{
+      
+      insertConfiguration(coreResumptionConfiguration).then(response=>{
+        debugger
             this.$modal.msgSuccess("新增成功");
           this.open = false;
         

+ 2 - 2
src/views/system/device/index.vue

@@ -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" />
@@ -75,7 +75,7 @@
               <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
             </template>
           </el-table-column>
-
+          <el-table-column label="设备品牌" align="center" prop="deviceName" />
           <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
           <el-table-column label="有效期至" align="center" prop="checkTime" width="160">
           </el-table-column>