From 992a602d1477c0c723d0155e73b2130cf7e68b65 Mon Sep 17 00:00:00 2001
From: pnoker <pnokers@icloud.com>
Date: Mon, 24 Feb 2020 18:07:47 +0800
Subject: [PATCH] .

---
 src/views/device/Device.vue          |  58 +++++++--------
 src/views/driver/Driver.vue          |   1 +
 src/views/driver/DriverAttribute.vue |   1 +
 src/views/driver/DriverInfo.vue      |  24 +++----
 src/views/point/Point.vue            | 104 +++++++++++++--------------
 src/views/point/PointAttribute.vue   |   3 +
 src/views/point/PointInfo.vue        |  26 +++----
 7 files changed, 107 insertions(+), 110 deletions(-)

diff --git a/src/views/device/Device.vue b/src/views/device/Device.vue
index 57fd133..787d43b 100644
--- a/src/views/device/Device.vue
+++ b/src/views/device/Device.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-    import {deviceApi, groupApi, profileApi,dictionaryApi} from '@/api/manager'
+    import {deviceApi, dictionaryApi} from '@/api/manager'
     import {successMessage} from "@/util/util";
 
     export default {
@@ -69,34 +69,6 @@
                             search: true,
                             searchSpan: 5,
                             disabled: true
-                        }, {
-                            label: '状态',
-                            prop: 'status',
-                            width: 80,
-                            search: true,
-                            searchSpan: 4,
-                            disabled: true,
-                            type: 'select',
-                            searchFilterable: true,
-                            value: 2,
-                            dicData: [
-                                {
-                                    label: '离线',
-                                    value: 0
-                                }, {
-                                    label: '在线',
-                                    value: 1
-                                }, {
-                                    label: '维护',
-                                    value: 2
-                                }, {
-                                    label: '故障',
-                                    value: 3
-                                }, {
-                                    label: '失效',
-                                    value: 4
-                                }
-                            ]
                         }, {
                             label: '所属模板',
                             prop: 'profileId',
@@ -129,6 +101,34 @@
                                     trigger: 'click'
                                 }
                             ]
+                        }, {
+                            label: '状态',
+                            prop: 'status',
+                            width: 80,
+                            search: true,
+                            searchSpan: 4,
+                            disabled: true,
+                            type: 'select',
+                            searchFilterable: true,
+                            value: 2,
+                            dicData: [
+                                {
+                                    label: '离线',
+                                    value: 0
+                                }, {
+                                    label: '在线',
+                                    value: 1
+                                }, {
+                                    label: '维护',
+                                    value: 2
+                                }, {
+                                    label: '故障',
+                                    value: 3
+                                }, {
+                                    label: '失效',
+                                    value: 4
+                                }
+                            ]
                         }, {
                             label: '备注',
                             prop: 'description',
diff --git a/src/views/driver/Driver.vue b/src/views/driver/Driver.vue
index df5051b..790f9e1 100644
--- a/src/views/driver/Driver.vue
+++ b/src/views/driver/Driver.vue
@@ -39,6 +39,7 @@
                     addBtn: false,
                     viewBtn: true,
                     editBtn: false,
+                    delBtn: false,
                     height: 664,
                     align: 'center',
                     column: [
diff --git a/src/views/driver/DriverAttribute.vue b/src/views/driver/DriverAttribute.vue
index 23b66f7..86dbf15 100644
--- a/src/views/driver/DriverAttribute.vue
+++ b/src/views/driver/DriverAttribute.vue
@@ -40,6 +40,7 @@
                     addBtn: false,
                     viewBtn: true,
                     editBtn: false,
+                    delBtn: false,
                     height: 664,
                     align: 'center',
                     column: [
diff --git a/src/views/driver/DriverInfo.vue b/src/views/driver/DriverInfo.vue
index 8940b82..d8f3d4a 100644
--- a/src/views/driver/DriverInfo.vue
+++ b/src/views/driver/DriverInfo.vue
@@ -42,9 +42,9 @@
                     align: 'center',
                     column: [
                         {
-                            label: '属性',
-                            prop: 'driverAttributeId',
-                            span: 12,
+                            label: '所属模板',
+                            prop: 'profileId',
+                            span: 24,
                             search: true,
                             searchSpan: 12,
                             type: 'tree',
@@ -53,18 +53,14 @@
                             rules: [
                                 {
                                     required: true,
-                                    message: '请选择属性',
+                                    message: '请选择所属模板',
                                     trigger: 'click'
                                 }
                             ]
                         }, {
-                            label: '内容',
-                            prop: 'value',
-                            span: 12
-                        }, {
-                            label: '所属模板',
-                            prop: 'profileId',
-                            span: 24,
+                            label: '属性',
+                            prop: 'driverAttributeId',
+                            span: 12,
                             search: true,
                             searchSpan: 12,
                             type: 'tree',
@@ -73,10 +69,14 @@
                             rules: [
                                 {
                                     required: true,
-                                    message: '请选择所属模板',
+                                    message: '请选择属性',
                                     trigger: 'click'
                                 }
                             ]
+                        }, {
+                            label: '内容',
+                            prop: 'value',
+                            span: 12
                         }, {
                             label: '备注',
                             prop: 'description',
diff --git a/src/views/point/Point.vue b/src/views/point/Point.vue
index 9ba7597..e32f31a 100644
--- a/src/views/point/Point.vue
+++ b/src/views/point/Point.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-    import {pointApi, profileApi,dictionaryApi} from '@/api/manager'
+    import {dictionaryApi, pointApi} from '@/api/manager'
     import {successMessage} from "@/util/util";
 
     export default {
@@ -42,10 +42,27 @@
                     align: 'center',
                     column: [
                         {
+                            label: '所属模板',
+                            prop: 'profileId',
+                            width: 220,
+                            span: 12,
+                            search: true,
+                            searchSpan: 6,
+                            type: 'tree',
+                            dicData: [],
+                            defaultExpandAll: true,
+                            rules: [
+                                {
+                                    required: true,
+                                    message: '请选择所属模板',
+                                    trigger: 'click'
+                                }
+                            ]
+                        }, {
                             label: '位号',
                             prop: 'name',
                             width: 220,
-                            span: 16,
+                            span: 12,
                             search: true,
                             searchSpan: 6,
                             rules: [
@@ -157,37 +174,16 @@
                                 }
                             ]
                         }, {
-                            label: '值',
-                            prop: 'value',
-                            width: 100,
-                            span: 8,
-                            searchSpan: 12,
-                            disabled: true,
-                            value: '--'
-                        }, {
-                            label: '最小值',
-                            prop: 'minimum',
-                            width: 100,
-                            span: 8,
-                            searchSpan: 12,
-                            value: -999999,
-                            rules: [
-                                {
-                                    pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
-                                    message: '请输入 正确格式的最小值'
-                                }
-                            ]
-                        }, {
-                            label: '最大值',
-                            prop: 'maximum',
-                            width: 100,
+                            label: '基值',
+                            prop: 'base',
+                            width: 80,
                             span: 8,
                             searchSpan: 12,
-                            value: 999999,
+                            value: 0,
                             rules: [
                                 {
                                     pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
-                                    message: '请输入 正确格式的最大值'
+                                    message: '请输入 正确格式的基值'
                                 }
                             ]
                         }, {
@@ -208,30 +204,43 @@
                                 }
                             ]
                         }, {
-                            label: '基值',
-                            prop: 'base',
+                            label: '格式',
+                            prop: 'format',
                             width: 80,
                             span: 8,
                             searchSpan: 12,
-                            value: 0,
+                            value: '%.3f',
+                            rules: [
+                                {
+                                    required: true,
+                                    message: '请输入 格式',
+                                    trigger: 'blur'
+                                }
+                            ]
+                        }, {
+                            label: '最小值',
+                            prop: 'minimum',
+                            width: 100,
+                            span: 8,
+                            searchSpan: 12,
+                            value: -999999,
                             rules: [
                                 {
                                     pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
-                                    message: '请输入 正确格式的基值'
+                                    message: '请输入 正确格式的最小值'
                                 }
                             ]
                         }, {
-                            label: '格式',
-                            prop: 'format',
-                            width: 80,
+                            label: '最大值',
+                            prop: 'maximum',
+                            width: 100,
                             span: 8,
                             searchSpan: 12,
-                            value: '%.3f',
+                            value: 999999,
                             rules: [
                                 {
-                                    required: true,
-                                    message: '请输入 格式',
-                                    trigger: 'blur'
+                                    pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+                                    message: '请输入 正确格式的最大值'
                                 }
                             ]
                         }, {
@@ -240,23 +249,6 @@
                             width: 80,
                             span: 8,
                             searchSpan: 12
-                        }, {
-                            label: '所属模板',
-                            prop: 'profileId',
-                            width: 220,
-                            span: 24,
-                            search: true,
-                            searchSpan: 6,
-                            type: 'tree',
-                            dicData: [],
-                            defaultExpandAll: true,
-                            rules: [
-                                {
-                                    required: true,
-                                    message: '请选择所属模板',
-                                    trigger: 'click'
-                                }
-                            ]
                         }, {
                             label: '备注',
                             prop: 'description',
diff --git a/src/views/point/PointAttribute.vue b/src/views/point/PointAttribute.vue
index acba735..8613605 100644
--- a/src/views/point/PointAttribute.vue
+++ b/src/views/point/PointAttribute.vue
@@ -37,7 +37,10 @@
                     index: true,
                     stripe: true,
                     border: true,
+                    addBtn: false,
                     viewBtn: true,
+                    editBtn: false,
+                    delBtn: false,
                     height: 664,
                     align: 'center',
                     column: [
diff --git a/src/views/point/PointInfo.vue b/src/views/point/PointInfo.vue
index 69f78f3..65a7fb5 100644
--- a/src/views/point/PointInfo.vue
+++ b/src/views/point/PointInfo.vue
@@ -42,8 +42,8 @@
                     align: 'center',
                     column: [
                         {
-                            label: '属性',
-                            prop: 'pointAttributeId',
+                            label: '所属设备',
+                            prop: 'deviceId',
                             span: 12,
                             search: true,
                             searchSpan: 8,
@@ -53,17 +53,13 @@
                             rules: [
                                 {
                                     required: true,
-                                    message: '请选择属性',
+                                    message: '请选择所属设备',
                                     trigger: 'click'
                                 }
                             ]
                         }, {
-                            label: '内容',
-                            prop: 'value',
-                            span: 12
-                        }, {
-                            label: '所属设备',
-                            prop: 'deviceId',
+                            label: '所属位号',
+                            prop: 'pointId',
                             span: 12,
                             search: true,
                             searchSpan: 8,
@@ -73,13 +69,13 @@
                             rules: [
                                 {
                                     required: true,
-                                    message: '请选择所属设备',
+                                    message: '请选择所属位号',
                                     trigger: 'click'
                                 }
                             ]
                         }, {
-                            label: '所属位号',
-                            prop: 'pointId',
+                            label: '属性',
+                            prop: 'pointAttributeId',
                             span: 12,
                             search: true,
                             searchSpan: 8,
@@ -89,10 +85,14 @@
                             rules: [
                                 {
                                     required: true,
-                                    message: '请选择所属位号',
+                                    message: '请选择属性',
                                     trigger: 'click'
                                 }
                             ]
+                        }, {
+                            label: '内容',
+                            prop: 'value',
+                            span: 12
                         }, {
                             label: '备注',
                             prop: 'description',