From 8af41edabefec3c8fb65dc371dd9d590f7f0c86b Mon Sep 17 00:00:00 2001
From: ccc <raint0810@gmail.com>
Date: Wed, 9 Mar 2022 14:33:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChartsComponents/RightTopChart.vue        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/components/ChartsComponents/RightTopChart.vue

diff --git a/src/components/ChartsComponents/RightTopChart.vue b/src/components/ChartsComponents/RightTopChart.vue
new file mode 100644
index 0000000..38fe9d4
--- /dev/null
+++ b/src/components/ChartsComponents/RightTopChart.vue
@@ -0,0 +1,20 @@
+<!-- 右上柱状图---设备通过人数统计  -->
+<template>
+  <div />
+</template>
+
+<script>
+
+export default {
+  components: {
+  },
+  data() {
+    return {}
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {}
+}
+</script>
-- 
Gitee


From 1a22617ac4afb36cf13295b71255f86ff0676db2 Mon Sep 17 00:00:00 2001
From: zyx <2134208960@qq.com>
Date: Sat, 18 Jun 2022 22:17:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/config.js                           |  2 +-
 .../FacilityManagement/FacilityLists.vue      | 28 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/utils/config.js b/src/utils/config.js
index 74531f7..ec572f2 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  baseUrl: '192.168.1.108:2011'
+  baseUrl: 'localhost:2011'
 }
diff --git a/src/views/FacilityManagement/FacilityLists.vue b/src/views/FacilityManagement/FacilityLists.vue
index a5eba03..801fcac 100644
--- a/src/views/FacilityManagement/FacilityLists.vue
+++ b/src/views/FacilityManagement/FacilityLists.vue
@@ -45,15 +45,18 @@
               width="55"
             />
             <el-table-column prop="deviceId" label="设备编号" width="100" />
+            <el-table-column prop="deviceType" label="设备类型" width="80" />
+            <el-table-column prop="customerId" label="客户主编号" width="80" />
+            <el-table-column prop="areaId" label="区域号" width="70" />
             <el-table-column prop="address" label="设备位置" width="120" />
-            <el-table-column prop="deviceIp" label="IP地址" width="120" />
-            <el-table-column prop="devicePort" label="端口号" width="120" />
+            <el-table-column prop="deviceIp" label="IP地址" width="100" />
+            <el-table-column prop="devicePort" label="端口号" width="80" />
             <el-table-column
               prop="status"
               label="状态"
               :filters="filterData"
               :filter-method="filterHandler"
-              width="180"
+              width="80"
             >
               <template slot-scope="scope">
                 <div>
@@ -78,7 +81,6 @@
                 <span style="margin-left: 10px">{{ scope.row.updateTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="remark" label="备注" />
             <el-table-column label="操作" width="300">
               <template slot-scope="scope">
                 <el-button
@@ -1123,5 +1125,23 @@ export default {
     height: 25px!important;
   }
 }
+.el-table {
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+    width: 8px; /*滚动条宽度*/
+    height: 8px; /*滚动条高度*/
+  }
+  /*定义滚动条轨道 内阴影+圆角*/
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
+    //box-shadow: 0px 1px 3px #f1f1f1 inset; /*滚动条的背景区域的内阴影*/
+    border-radius: 10px; /*滚动条的背景区域的圆角*/
+    background-color: #d1dcff; /*滚动条的背景颜色*/
+  }
+  /*定义滑块 内阴影+圆角*/
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    //box-shadow: 0px 1px 3px #00a0e9 inset; /*滚动条的内阴影*/
+    border-radius: 10px; /*滚动条的圆角*/
+    background-color: #4a74ff; /*滚动条的背景颜色*/
+  }
+}
 </style>
 
-- 
Gitee


From b0cc283de35e146a6bd6aa55aa2b9ebe2dac93ae Mon Sep 17 00:00:00 2001
From: zyx <2134208960@qq.com>
Date: Sun, 19 Jun 2022 10:21:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E4=B8=BB=E7=BC=96=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FacilityManagement/FacilityLists.vue      | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/views/FacilityManagement/FacilityLists.vue b/src/views/FacilityManagement/FacilityLists.vue
index 801fcac..ae55408 100644
--- a/src/views/FacilityManagement/FacilityLists.vue
+++ b/src/views/FacilityManagement/FacilityLists.vue
@@ -49,7 +49,7 @@
             <el-table-column prop="customerId" label="客户主编号" width="80" />
             <el-table-column prop="areaId" label="区域号" width="70" />
             <el-table-column prop="address" label="设备位置" width="120" />
-            <el-table-column prop="deviceIp" label="IP地址" width="100" />
+            <el-table-column prop="deviceIp" label="IP地址" width="110" />
             <el-table-column prop="devicePort" label="端口号" width="80" />
             <el-table-column
               prop="status"
@@ -140,12 +140,12 @@
           center
           :close-on-click-modal="false"
         >
-          <div style="margin-left: 15%">
+          <div style="margin-left: 15%; max-height: 450px; overflow: auto">
             <el-form
               ref="modifyInfo"
               :model="modifyInfo"
               :rules="modifyInfoRules"
-              label-width="80px"
+              label-width="100px"
             >
               <el-form-item label="设备ID" prop="deviceId">
                 <el-input
@@ -156,7 +156,30 @@
                   :disabled="ModifyDialogTitle === '编辑设备信息'"
                 />
               </el-form-item>
-
+              <el-form-item label="设备类型" prop="deviceType" v-show="ModifyDialogTitle === '新增设备'">
+                <el-input
+                  v-model="modifyInfo.deviceType"
+                  style="width: 66%"
+                  auto-complete="off"
+                  placeholder="请输入设备类型编号"
+                />
+              </el-form-item>
+              <el-form-item label="客户主编号" prop="customerId" v-show="ModifyDialogTitle === '新增设备'">
+                <el-input
+                  v-model="modifyInfo.customerId"
+                  style="width: 66%"
+                  auto-complete="off"
+                  placeholder="请输入客户主编号"
+                />
+              </el-form-item>
+              <el-form-item label="区域编号" prop="areaId" v-show="ModifyDialogTitle === '新增设备'">
+                <el-input
+                  v-model="modifyInfo.areaId"
+                  style="width: 66%"
+                  auto-complete="off"
+                  placeholder="请输入区域编号"
+                />
+              </el-form-item>
               <el-form-item label="IP地址" prop="deviceIp">
                 <el-input
                   v-model="modifyInfo.deviceIp"
@@ -810,12 +833,18 @@ export default {
       ModifyDialogTitle: '', // 修改信息弹框标题
       modifyInfoRules: {
         deviceId: [{ required: true, message: '请输入设备Id', trigger: 'blur' }],
+        deviceType: [{ required: true, message: '请输入设备类型', triangle: 'blur'}],
+        customerId: [{ required: true, message: '请输入客户主编号', triangle: 'blur'}],
+        areaId: [{ required: true, message: '请输入区域编号', triangle: 'blur'}],
         deviceIp: [{ required: true, message: '请输入IP地址', trigger: 'blur' }],
         devicePort: [{ required: true, message: '请输入端口号', trigger: 'blur' }],
         address: [{ required: true, message: '请输入设备位置', trigger: 'blur' }]
       },
       modifyInfo: {
         deviceId: '',
+        deviceType: '',
+        customerId: '',
+        areaId: '',
         deviceIp: '',
         devicePort: '',
         address: '',
@@ -1001,9 +1030,13 @@ export default {
     // 设备新增
     newDevice() {
       if (this.$refs.modifyInfo) {
+        // 重置表单
         this.$refs.modifyInfo.resetFields()
         this.modifyInfo = {
           deviceId: '',
+          deviceType: '',
+          customerId: '',
+          areaId: '',
           deviceIp: '',
           devicePort: '',
           status: '',
-- 
Gitee