Merge branch 'v0.1.1_alarm' into V1.0.11

src/views/core/outIn/letter/dialog.addletter.vue

@@ -65,7 +65,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item prop="effectiveDays" label="有效天数">
-                <el-input-number style="width: 100%" :disabled='true' v-model="formData.effectiveDays" :min="1" :max="365"></el-input-number>
+                <el-input-number style="width: 100%" :disabled='true' v-model="formData.effectiveDays" :min="1" ></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/views/core/reportForms/drill.vue

@@ -29,7 +29,6 @@
                     v-model="queryParams.orgId"
                     @defaultOrg="getDefaultOrg"
                     @click="clickTreeNode"
-                    hangsheTree
                   ref="orgTree"
                   :showCheckSub="false"
                   ></org-tree>
@@ -146,9 +145,9 @@ export default {
     },
   },
   mounted() {
-    if (this.deptOptions) {
-      this.queryParams.orgId = this.orgId;
-    }
+    // if (this.deptOptions) {
+    //   this.queryParams.orgId = this.orgId;
+    // }
   },
   computed: {
     ...mapGetters(["orgId"]),

src/views/core/reportForms/eduTraining.vue

@@ -16,7 +16,6 @@
                     v-model="queryParams.orgId"
                     @defaultOrg="getDefaultOrg"
                     @click="clickTreeNode"
-                    hangsheTree
                   ref="orgTree"
                   :showCheckSub="false"
                   ></org-tree>
@@ -145,9 +144,9 @@ export default {
     },
   },
   mounted() {
-    if (this.deptOptions) {
-      this.queryParams.orgId = this.orgId;
-    }
+    // if (this.deptOptions) {
+    //   this.queryParams.orgId = this.orgId;
+    // }
   },
   computed: {
     ...mapGetters(["orgId"]),

src/views/iot/videoDiagnosis/index.vue

@@ -335,10 +335,12 @@ export default {
       this.handleQuery();
     },
     lostDurationText(duration) {
-      if (!duration || duration=='0') {
+      if (!duration) {
+        return "未知";
+      }
+      if (duration=='0') {
         return "未丢失";
       }
-
       let str = "";
       let hour = Math.floor(duration / 60);
       if (hour > 0) {

src/views/system/device/index.vue

@@ -19,8 +19,8 @@
                 <el-input clearable v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                           @keyup.enter.native="handleQuery"/>
               </el-form-item>
-              <el-form-item label="资产分类" prop="assetType" label-width="80">
-                <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择资产分类"
+              <el-form-item label="设备类别" prop="assetType" label-width="80">
+                <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择设备类别"
                            @change="queryAssetSelectChange" @clear="clearAsset" clearable>
                   <el-option v-for="item in getAssetDict('AssetDeviceType',-1)" :key="item.id" :label="item.name"
                              :value="item.id"></el-option>
@@ -72,7 +72,7 @@
             <el-table-column label="地区" align="left" prop="affiliatedArea"/>
             <el-table-column label="行社" align="left" prop="affiliatedBank"/>
             <el-table-column label="所属机构" align="left" prop="orgName"/>
-            <el-table-column label="资产分类" align="center" key="assetType" prop="assetType"/>
+            <el-table-column label="设备类别" align="center" key="assetType" prop="assetType"/>
             <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType"/>
             <el-table-column label="设备名称" align="center" prop="deviceName"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -123,7 +123,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="资产编号" prop="assetNo">
               <el-input
                 v-model="form.assetNo"
@@ -131,28 +131,17 @@
                 maxlength="50"
               />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="设备名称" prop="deviceName">
-              <el-input
-                v-model="form.deviceName"
-                placeholder="请输入设备名称"
-                maxlength="50"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
+          </el-col> -->
           <el-col :span="12">
-            <el-form-item label="资产分类" prop="assetType">
+            <el-form-item label="设备类别" prop="assetType">
               <el-select style="width: 100%" v-model="form.assetType" :popper-append-to-body="false"
-                         placeholder="请选择资产分类" @change="assetSelectChange">
+                         placeholder="请选择设备类别" @change="assetSelectChange">
                 <el-option v-for="item in getAssetDict('AssetDeviceType',-1)" :key="item.id" :label="item.name"
                            :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="设备分类" prop="deviceType">
               <el-select style="width: 100%" :popper-append-to-body="false" clearable v-model="form.deviceType"
@@ -164,8 +153,17 @@
           </el-col>
         </el-row>
 
-
         <el-row>
+          
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入设备名称"
+                maxlength="50"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="设备品牌" prop="deviceBrand">
               <el-select style="width: 100%" v-model="form.deviceBrand" placeholder="请选择设备品牌"
@@ -175,6 +173,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+
+        <el-row>
+          
           <el-col :span="12">
             <el-form-item label="设备型号" prop="deviceModel">
               <el-select @change="brandSelectChange1" style="width: 100%" v-model="form.deviceModel"
@@ -186,7 +189,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
             <el-form-item label="采购日期" prop="purchasingTime">
               <el-date-picker style="width: 100%" clearable v-model="form.purchasingTime" type="date"
@@ -243,7 +246,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -323,11 +326,11 @@ export default {
         assetNo: [{required: true, message: "请输入资产编号", trigger: "change"}],
         deviceName: [{required: true, message: "请输入设备名称", trigger: "change"}],
         orgId: [{required: true, message: "请选择所属机构", trigger: "blur"}],
-        assetType: [{required: true, message: '请选择资产分类', trigger: 'change'}],
+        assetType: [{required: true, message: '请选择设备类别', trigger: 'change'}],
         /*  hostId: [{required: true, message: '请选择主机', trigger: 'change'}],
           channel: [{required: true, message: '请输入通道号', trigger: 'change'}],*/
         deviceType: [{required: true, message: "请选择设备分类", trigger: "change"}],
-        deviceStatus: [{required: true, message: "请选择资产状态", trigger: "blur"}],
+        // deviceStatus: [{required: true, message: "请选择资产状态", trigger: "blur"}],
       },
       // 遮罩层
       loading: true,
@@ -412,7 +415,7 @@ export default {
         inBook: 0,
         purchasingTime: null,
         assetNo: null,
-        deviceStatus: null,
+        deviceStatus: 1,
       },
       // 表单校验
 
@@ -634,7 +637,7 @@ export default {
         checkTime: null,
         maintenanceTerm: null,
         useTime: null,
-        deviceStatus: null,
+        deviceStatus: 1,
         hostId: null,
         channel: null,
         definition: "1",

src/views/system/user/index.vue

@@ -1020,7 +1020,7 @@ export default {
         postIds: [],
         roleIds: [],
         isLock: "0",
-        isManage: "Y",
+        isManage: "N",
       };
       this.resetForm("form");
     },