1、告警、工单修复

src/views/device/iotalarm.vue

@@ -151,7 +151,9 @@ export default {
               required: false,
               message: "请输入告警等级 1:严重告警,2:警告告警,3:提示告警",
               trigger: "blur"
-            }]
+            }],
+            editDisplay: false,
+            addDisplay: false
           },
           // {
           //   label: "监测值",
@@ -213,7 +215,7 @@ export default {
           {
             label: "最新告警时间",
             prop: "lastNoticeDate",
-            width:170,
+            labelWidth: 120,
             align:"center",
             hide: true,
             rules: [{
@@ -384,7 +386,7 @@ export default {
           {
             label: "最新告警时间",
             prop: "lastNoticeDate",
-            width:170,
+            labelWidth: 100,
             align:"center",
             hide: true,
             rules: [{

src/views/enterprise/staff.vue

@@ -148,6 +148,7 @@
               searchFilterable: true,
               filterable: true,
               remote: true,
+              cascaderItem: ['enterpriseDeptId'],
               dicUrl: '/api/cyzh-enterprise/enterprise/list?size=100&enterpriseName={{key}}',
               dicFormatter: (res)=>{
                 return res.data.records;
@@ -164,6 +165,39 @@
               hide: true,
               viewDisplay: false
             },
+            {
+              label: "所属部门",
+              prop: "enterpriseDeptName",
+              editDisplay: false,
+              addDisplay: false,
+            },
+            {
+              label: "所属部门",
+              prop: "enterpriseDeptId",
+              type: "select",
+              width: 250,
+              search: true,
+              searchSpan: 6,
+              overHidden: true,
+              searchFilterable: true,
+              filterable: true,
+              remote: true,
+              dicUrl: '/api/cyzh-enterprise/dept/list?size=10&enterpriseId={{key}}',
+              dicFormatter: (res)=>{
+                return res.data.records;
+              },
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
+                required: false,
+                message: "请输入所属部门",
+                trigger: "blur"
+              }],
+              hide: true,
+              viewDisplay: false
+            },
             // {
             //   label: "企业名称",
             //   prop: "enterpriseName",
@@ -576,6 +610,9 @@
         if(row.$enterpriseId){
           row.enterpriseName = row.$enterpriseId;
         }
+        if(row.$enterpriseDeptId){
+          row.enterpriseDeptName = row.$enterpriseDeptId;
+        }
         if (row.avatar.length == 0) {
           row.avatar = '';
         }
@@ -592,6 +629,9 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        if(row.$enterpriseDeptId){
+          row.enterpriseDeptName = row.$enterpriseDeptId;
+        }
         if(row.$enterpriseId){
           row.enterpriseName = row.$enterpriseId;
         }

src/views/estate/guest.vue

@@ -98,7 +98,7 @@
                   label:'女',
                   value:0
                 },{
-                  label: "暂无信息",
+                  label: "未定义",
                   value:-1
                 }
               ],

src/views/order/deviceorder.vue

@@ -142,7 +142,7 @@ export default {
           },
           {
             label: "处理人",
-            prop: "handler",
+            prop: "handlePerson",
             width: 200,
             rules: [{
               required: true,
@@ -152,7 +152,7 @@ export default {
           },
           {
             label: "电话",
-            prop: "phone",
+            prop: "handlePhone",
             rules: [{
               required: true,
               message: "请输入电话",