From 4d96fbc457e74de83c470bf99a3ef48669a43bd2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 14:37:24 +0800
Subject: [PATCH] 代码优化

---
 src/views/property/components/propertyEdit.vue |    7 +-
 src/views/authority/role.vue                   |  140 +++++++++++++++++++---------------------------
 2 files changed, 61 insertions(+), 86 deletions(-)

diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 1233dfb..aee0950 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -1,50 +1,23 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               @row-del="rowDel"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+      :permission="permissionList" :before-open="beforeOpen" @row-del="rowDel" @row-update="rowUpdate"
+      @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   v-if="permission.role_delete"
-                   plain
-                   @click="handleDelete">删 除
+        <el-button type="danger" size="small" icon="el-icon-delete" v-if="permission.role_delete" plain
+          @click="handleDelete">删 除
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-setting"
-                   @click="handleRole"
-                   v-if="userInfo.role_name.includes('admin')"
-                   plain>权限设置
+        <el-button size="small" icon="el-icon-setting" @click="handleRole" v-if="userInfo.role_name.includes('admin')"
+          plain>权限设置
         </el-button>
       </template>
     </avue-crud>
-    <el-dialog title="角色权限配置"
-               append-to-body
-               :visible.sync="box"
-               width="345px">
+    <el-dialog title="角色权限配置" append-to-body :visible.sync="box" width="345px">
       <el-tabs type="border-card">
         <el-tab-pane label="权限">
-          <el-tree :data="menuGrantList"
-                   show-checkbox
-                   node-key="id"
-                   ref="treeMenu"
-                   :default-checked-keys="menuTreeObj"
-                   :props="props">
+          <el-tree :data="menuGrantList" show-checkbox node-key="id" ref="treeMenu" :default-checked-keys="menuTreeObj"
+            :props="props">
           </el-tree>
         </el-tab-pane>
         <!-- <el-tab-pane label="数据权限">
@@ -67,19 +40,29 @@
         </el-tab-pane> -->
       </el-tabs>
 
-      <span slot="footer"
-            class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
         <el-button @click="box = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
       </span>
     </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {add, getList, getRoleList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
-  import {mapGetters} from "vuex";
+  import {
+    add,
+    getList,
+    getRoleList,
+    getRole,
+    getRoleTreeById,
+    grant,
+    grantTree,
+    remove,
+    update
+  } from "@/api/system/role";
+  import {
+    mapGetters
+  } from "vuex";
   import website from '@/config/website';
 
   export default {
@@ -118,19 +101,16 @@
           viewBtn: true,
           dialogWidth: 900,
           dialogClickModal: false,
-          column: [
-            {
+          column: [{
               label: "角色名称",
               prop: "roleName",
               search: true,
               span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色名称",
-                  trigger: "blur"
-                }
-              ]
+              rules: [{
+                required: true,
+                message: "请输入角色名称",
+                trigger: "blur"
+              }]
             },
             // {
             //   label: "所属租户",
@@ -158,13 +138,11 @@
               prop: "roleAlias",
               search: true,
               span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色别名",
-                  trigger: "blur"
-                }
-              ]
+              rules: [{
+                required: true,
+                message: "请输入角色别名",
+                trigger: "blur"
+              }]
             },
             {
               label: "上级角色",
@@ -176,26 +154,22 @@
               props: {
                 label: "title"
               },
-              rules: [
-                {
-                  required: false,
-                  message: "请选择上级角色",
-                  trigger: "click"
-                }
-              ]
+              rules: [{
+                required: false,
+                message: "请选择上级角色",
+                trigger: "click"
+              }]
             },
             {
               label: "角色排序",
               prop: "sort",
               type: "number",
               span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: "请输入角色排序",
-                  trigger: "blur"
-                }
-              ]
+              rules: [{
+                required: true,
+                message: "请输入角色排序",
+                trigger: "blur"
+              }]
             }
           ]
         },
@@ -229,7 +203,7 @@
       }
     },
     methods: {
-      initData(roleId){
+      initData(roleId) {
         getRoleTreeById(roleId).then(res => {
           const column = this.findObject(this.option.column, "parentId");
           column.dicData = res.data.data;
@@ -276,10 +250,10 @@
       },
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
           .then(() => {
             return remove(row.id);
           })
@@ -342,10 +316,10 @@
           return;
         }
         this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
           .then(() => {
             return remove(this.ids);
           })
diff --git a/src/views/property/components/propertyEdit.vue b/src/views/property/components/propertyEdit.vue
index 6ad9299..f994763 100644
--- a/src/views/property/components/propertyEdit.vue
+++ b/src/views/property/components/propertyEdit.vue
@@ -38,8 +38,9 @@
         <!-- </el-radio-group> -->
 
         <div v-if="item.choicesType == 3">
-          <!-- <div>{{item1.optionName}}</div> -->
-          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
+
+          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1" style="display: flex;">
+            <div>{{item1.optionName}}:</div>
             <el-input-number v-model="item1.numbers" @change="handleChange" :min="0" :max="25"
               :label="item1.optionName"></el-input-number>
           </div>
@@ -311,4 +312,4 @@
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3