From edc5711cfb1873874e484434e07306eb70249eb1 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 7 Jul 2022 15:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=91=97=E5=BD=95=E7=95=8C=E9=9D=A2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=AB=98=E4=BA=AE=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage/deviceManage/device.js    |  4 +-
 .../category/descriptionPreview/index.vue     |  2 +-
 src/views/storeManage/deviceManage/index.vue  | 32 ++++++---------
 .../{ => module}/deviceDetail.vue             | 39 +++++++++++++------
 4 files changed, 43 insertions(+), 34 deletions(-)
 rename src/views/storeManage/deviceManage/{ => module}/deviceDetail.vue (77%)

diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js
index 06ae258..f0ef612 100644
--- a/src/api/storeManage/deviceManage/device.js
+++ b/src/api/storeManage/deviceManage/device.js
@@ -9,13 +9,13 @@ export function add(data) {
 }
 
 export function del(ids) {
-  const data = {
+  const params = {
     id: ids[0]
   }
   return request({
     url: 'api/storeroom/delete',
     method: 'delete',
-    data
+    params
   })
 }
 
diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue
index baea45d..26e654c 100644
--- a/src/views/category/descriptionPreview/index.vue
+++ b/src/views/category/descriptionPreview/index.vue
@@ -263,7 +263,7 @@ export default {
       &:hover,
       &.fields-active {
         color: #fff;
-        background-color: #02255f;
+        background-color: #339CFF;
       }
     }
   }
diff --git a/src/views/storeManage/deviceManage/index.vue b/src/views/storeManage/deviceManage/index.vue
index 8655b8b..245ab89 100644
--- a/src/views/storeManage/deviceManage/index.vue
+++ b/src/views/storeManage/deviceManage/index.vue
@@ -32,16 +32,17 @@
     <!-- 区域列表 -->
     <el-row class="container-main" :gutter="20">
       <el-col class="curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
-        <crudOperation :permission="permission">
-          <template v-slot:left>
+        <div class="crud-opts">
+          <div class="crud-opts-left">
             <el-button v-permission="permission.add" size="mini" icon="el-icon-plus" :disabled="crud.selections[0] && crud.selections[0].id && crud.selections[0].id !== defaultExpandedKeys[0]" @click="crud.toAdd">
               新增
             </el-button>
-          </template>
-          <template v-slot:right>
-            <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
-          </template>
-        </crudOperation>
+            <el-button v-permission="permission.edit" size="mini" icon="el-icon-edit" :disabled="crud.selections.length !== 1 || crud.selections[0].id && crud.selections[0].id === defaultExpandedKeys[0]" @click="crud.toEdit(crud.selections[0])">
+              修改
+            </el-button>
+            <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length !== 1 || crud.selections[0].id && crud.selections[0].id === defaultExpandedKeys[0]" @click="toDelete(crud.selections)">删除</el-button>
+          </div>
+        </div>
         <!--区域树状结构-->
         <div class="container-left" style="min-height: calc(100vh - 242px);margin:20px 0 0 0">
           <span class="right-top-line" />
@@ -52,9 +53,8 @@
         </div>
       </el-col>
       <!-- 设备详情列表 -->
-      <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
-        <span class="right-top-line" />
-        <span class="left-bottom-line" />
+      <!-- <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20"> -->
+      <el-col :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
         <deviceDetail ref="deviceDetail" :permission="permission" :active-add-btn="activeRightBtn" />
       </el-col>
     </el-row>
@@ -62,29 +62,21 @@
 </template>
 
 <script>
-import deviceDetail from './deviceDetail'
+import deviceDetail from './module/deviceDetail'
 import crudDevice from '@/api/storeManage/deviceManage/device'
 import CRUD, { presenter, form } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
 import Vue from 'vue'
 
 const defaultForm = { id: null, name: null, sort: null }
 
 export default {
   name: 'Device',
-  components: { crudOperation, deviceDetail },
+  components: { deviceDetail },
   cruds() {
     return [
       CRUD({
         title: '区域', url: 'api/storeroom/tree',
         crudMethod: { ...crudDevice },
-        optShow: {
-          add: false,
-          edit: true,
-          del: false,
-          download: false,
-          group: false
-        },
         sort: ['sort,asc']
       })
     ]
diff --git a/src/views/storeManage/deviceManage/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue
similarity index 77%
rename from src/views/storeManage/deviceManage/deviceDetail.vue
rename to src/views/storeManage/deviceManage/module/deviceDetail.vue
index c37afae..6bb72e1 100644
--- a/src/views/storeManage/deviceManage/deviceDetail.vue
+++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--工具栏-->
-    <div class="head-container">
+    <div class="head-container" style="padding:0 0 20px 0">
       <crudOperation :permission="permission">
         <template v-slot:left>
           <el-button v-permission="permission.add" size="mini" type="primary" icon="el-icon-plus" :disabled="!activeAddBtn" @click="selectDeviceType">新增</el-button>
@@ -17,6 +17,9 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="字典名称" prop="dicName">
+            <el-input v-model="form.dicName" style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="字典名称" prop="dicName">
             <el-input v-model="form.dicName" style="width: 370px;" />
           </el-form-item>
@@ -45,15 +48,27 @@
         </div>
       </div>
     </el-dialog>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="dicName" label="字典名称" />
-      <el-table-column prop="dicCode" label="字典代码" />
-      <el-table-column prop="dicExplain" label="内容说明" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
+    <div class="container-right" style="min-height: calc(100vh - 242px);">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column prop="dicName" label="所属区域" />
+        <el-table-column prop="dicCode" label="设备状态" />
+        <el-table-column prop="dicExplain" label="设备类型" />
+        <el-table-column prop="dicCode" label="设备厂商" />
+        <el-table-column prop="dicCode" label="设备名称" />
+        <el-table-column prop="dicExplain" label="设备ID" />
+        <el-table-column prop="dicExplain" label="接口IP" />
+        <el-table-column prop="dicExplain" label="端口" />
+        <el-table-column prop="dicExplain" label="绑定设备" />
+        <el-table-column prop="dicExplain" label="绑定参数" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
   </div>
 </template>
 
@@ -115,7 +130,8 @@ export default {
         del: ['admin', 'dict:del']
       },
       deleteVisible: false,
-      deleteData: {}
+      deleteData: {},
+      selectDeviceTypeVisible: false
     }
   },
   methods: {
@@ -166,6 +182,7 @@ export default {
       done()
     },
     selectDeviceType() {
+      this.selectDeviceTypeVisible = true
     }
   }
 }