From 0dfa0f233b557ea57cfa7334cb25e0c32720565f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 19 Dec 2024 15:13:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95:=E5=8A=A8=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE:=E7=BC=96=E8=BE=91=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=B4=A6=E6=88=B7:=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=89=A9=E6=A8=A1=E5=9E=8B:=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=20=E7=94=A8=E6=88=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85:=E5=AD=97=E6=AE=B5=E7=BB=9F=E4=B8=80=20=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84:=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/api/backend/org/request.ts    |   3 +-
 ui/dasadmin/src/lang/common/zh-cn/userInfo.ts |   4 +-
 .../views/backend/auth/Enumeration/index.vue  | 227 +++++++++---------
 .../src/views/backend/auth/menu/index.vue     |   6 +-
 .../src/views/backend/auth/model/index.vue    |  12 +-
 .../src/views/backend/auth/org/index.vue      |  30 +--
 .../src/views/backend/auth/org/type.ts        |   2 +-
 .../src/views/backend/auth/user/index.vue     |  33 ++-
 8 files changed, 161 insertions(+), 156 deletions(-)

diff --git a/ui/dasadmin/src/api/backend/org/request.ts b/ui/dasadmin/src/api/backend/org/request.ts
index 18c84b2e..9917729f 100644
--- a/ui/dasadmin/src/api/backend/org/request.ts
+++ b/ui/dasadmin/src/api/backend/org/request.ts
@@ -30,11 +30,12 @@ export const delInstitutionalListReq = (data: delDataType) => {
         url: '/api/org/delete',
         method: 'post',
         data: data,
+    },{
+        showErrorMessage:false
     })
 }
 
 export const getInstitutionalTreeListReq = (data: getTreeDataType) => {
-    console.log(data);
     return createAxios<never, operateDataReturnType<getTreeDataReturnType[]>>({
         url: '/api/org/list',
         method: 'post',
diff --git a/ui/dasadmin/src/lang/common/zh-cn/userInfo.ts b/ui/dasadmin/src/lang/common/zh-cn/userInfo.ts
index 94d7171f..ad27ecbf 100644
--- a/ui/dasadmin/src/lang/common/zh-cn/userInfo.ts
+++ b/ui/dasadmin/src/lang/common/zh-cn/userInfo.ts
@@ -1,8 +1,8 @@
 export default {
     'Last logged in on': '上次登录于',
     'user name': '用户名',
-    'User nickname': '用户昵称',
-    'Please enter a nickname': '请输入昵称',
+    'User nickname': '职员名称',
+    'Please enter a nickname': '请输入名称',
     'e-mail address': '邮箱地址',
     'phone number': '手机号码',
     autograph: '签名',
diff --git a/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue b/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
index 678cac5b..2a8fd88d 100644
--- a/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
@@ -4,7 +4,7 @@
             <el-aside class="defaultAside">
                 <el-main class="treeMain">
                     <el-tree
-                        style="max-width: 600px;margin-top: 2.2%"
+                        style="max-width: 600px; margin-top: 2.2%"
                         ref="TypeTree"
                         :data="TypeData"
                         :props="defaultProps"
@@ -12,13 +12,12 @@
                         @node-click="handleNodeClick"
                         @node-contextmenu="enumContextMenu"
                     />
-
                 </el-main>
             </el-aside>
             <el-container class="defaultMainContainer">
                 <el-header class="defaultHeader">
                     <div class="searchPart">
-                        <el-input v-model="queryName" class="searchInput" placeholder="按名称查询枚举名"></el-input>
+                        <el-input v-model="queryName" class="searchInput" placeholder="按枚举描述查询"></el-input>
                         <el-button @click="clickQuery" type="primary" :icon="Search" class="defaultBtn">查询</el-button>
                     </div>
                     <div class="btnPart">
@@ -27,13 +26,13 @@
                     </div>
                 </el-header>
                 <el-main class="mainPart">
-                    <el-table :data="tableData"  class="tablePart">
-<!--                        <el-table-column type="selection" width="55" />-->
+                    <el-table :data="tableData" class="tablePart">
+                        <!--                        <el-table-column type="selection" width="55" />-->
                         <el-table-column prop="description" label="枚举描述" />
                         <el-table-column prop="value" label="枚举值" />
                         <el-table-column label="操作">
                             <template #default="scope">
-                                <span style="color: #0064aa; cursor: pointer" @click="enumValueEdit(scope)">查看</span>
+                                <span style="color: #0064aa; cursor: pointer" @click="enumValueEdit(scope)">编辑</span>
                                 |
                                 <span style="color: #0064aa; cursor: pointer" @click="fromDelete(scope)">删除</span>
                             </template>
@@ -67,10 +66,9 @@
                     <el-form-item label="名称:" prop="name">
                         <el-input v-model="formInlineAdd.name" placeholder="" clearable />
                     </el-form-item>
-                    <el-form-item label="&nbsp;&nbsp;描述:">
+                    <el-form-item label="描述:" prop="description">
                         <el-input v-model="formInlineAdd.description" placeholder="" clearable />
                     </el-form-item>
-
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
@@ -92,10 +90,9 @@
                     <el-form-item label="名称:" prop="name">
                         <el-input v-model="formInlineEdit.name" placeholder="" clearable />
                     </el-form-item>
-                    <el-form-item label="&nbsp;&nbsp;描述:">
+                    <el-form-item label="描述:" prop="description">
                         <el-input v-model="formInlineEdit.description" placeholder="" clearable />
                     </el-form-item>
-
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
@@ -124,12 +121,8 @@
                         <el-input-number :min="0" v-model="formInlineValue.orderNumber" placeholder="" />
                     </el-form-item>
                     <el-form-item label="&nbsp;&nbsp;是否有效:">
-                        <el-switch @change="addhandleSwitchChange"
-                                   :active-value="1"
-                                   :inactive-value="0"
-                                   v-model="formInlineValue.isActive" />
+                        <el-switch @change="addhandleSwitchChange" :active-value="1" :inactive-value="0" v-model="formInlineValue.isActive" />
                     </el-form-item>
-
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
@@ -149,7 +142,7 @@
                 </template>
             </el-dialog>
             <!--编辑枚举值-->
-            <el-dialog v-model="visibleValueEdit" title="查看枚举值" width="500" :before-close="edithandleClosevalue">
+            <el-dialog v-model="visibleValueEdit" title="编辑枚举值" width="500" :before-close="edithandleClosevalue">
                 <el-form
                     ref="formRef"
                     :inline="true"
@@ -167,12 +160,8 @@
                         <el-input-number :min="0" v-model="fromUpDate.orderNumber" placeholder="" />
                     </el-form-item>
                     <el-form-item label="&nbsp;&nbsp;是否有效:">
-                        <el-switch @change="edithandleSwitchChange"
-                                   :active-value="1"
-                                   :inactive-value="0"
-                                   v-model="fromUpDate.isActive" />
+                        <el-switch @change="edithandleSwitchChange" :active-value="1" :inactive-value="0" v-model="fromUpDate.isActive" />
                     </el-form-item>
-
                 </el-form>
                 <template #footer>
                     <div class="dialog-footer">
@@ -199,7 +188,7 @@
 </template>
 
 <script setup lang="ts">
-import {nextTick, onMounted, reactive, ref} from 'vue'
+import { nextTick, onMounted, reactive, ref } from 'vue'
 import { Search, Plus } from '@element-plus/icons-vue'
 import { ElMessage, FormRules } from 'element-plus'
 import {
@@ -210,17 +199,16 @@ import {
     enumTypeDelete,
     enumValueAdd,
     enumValueDelete,
-    enumValuepageEdit
-} from "/@/api/backend/Enumeration/request";
+    enumValuepageEdit,
+} from '/@/api/backend/Enumeration/request'
 import ContextMenu from '/@/views/backend/auth/model/contextMenu.vue'
-import {delModelReq} from "/@/api/backend/deviceModel/request";
-
+import { delModelReq } from '/@/api/backend/deviceModel/request'
 
 const activeName = ref('1')
 interface Tree {
-    enumId: number,
-    enumName: string,
-    enumDesc: string,
+    enumId: number
+    enumName: string
+    enumDesc: string
 }
 
 const defaultProps = {
@@ -230,16 +218,17 @@ const defaultProps = {
 
 const tableData = ref()
 //const TypeData=ref()
-const TypeData=ref([{
-    id: 0,
-    name: "",
-    description: "枚举类型配置",
-    children: []
-}])
+const TypeData = ref([
+    {
+        id: 0,
+        name: '',
+        description: '枚举类型配置',
+        children: [],
+    },
+])
 const TypeTree = ref()
 const formRef = ref()
-const enumTypeId=ref()
-
+const enumTypeId = ref()
 
 // 搜索查询
 const queryName = ref('')
@@ -260,15 +249,13 @@ const enumTreeTypeList = () => {
             //TypeData.value = res.data
             TypeData.value[0].children = res.data
             nextTick(() => {
-                enumTypeId.value=res.data[0]?.id
+                enumTypeId.value = res.data[0]?.id
                 //TypeTree.value?.setCurrentKey(res.data[0]?.id!, false)
                 TypeTree.value?.setCurrentKey(TypeData.value[0].id!, false)
-                queryListData.description =queryName.value
+                queryListData.description = queryName.value
                 queryListData.enumTypeId = res.data[0].id
-                queryListData.pageNum=currentPage.value,
-                queryListData.pageSize=currentPageSize.value
+                ;(queryListData.pageNum = currentPage.value), (queryListData.pageSize = currentPageSize.value)
                 queryenumValueMethod(queryListData)
-
             })
         } else {
             ElMessage.error({
@@ -280,27 +267,29 @@ const enumTreeTypeList = () => {
 }
 const queryParameter = ref()
 const nodename = ref()
-const curnodeData=ref({
+const curnodeData = ref({
     id: '',
     description: '',
-    name:''
+    name: '',
 })
 const handleNodeClick = (data: any) => {
     queryParameter.value = data
-    enumTypeId.value=data.id
-    queryListData.enumTypeId=data.id
-    queryListData.description=queryName.value
+    enumTypeId.value = data.id
+    queryListData.enumTypeId = data.id
+    queryListData.description = queryName.value
     /*if (currentPage.value !== 1) {
         currentPage.value = 1
         return
     }*/
-    queryListData.pageNum=currentPage.value
-    queryListData.pageSize=currentPageSize.value
-    nodename.value=data.description
-    curnodeData.value.id=data.id
-    curnodeData.value.name=data.name
-    curnodeData.value.description=data.description
-    queryenumValueMethod(queryListData)
+    queryListData.pageNum = currentPage.value
+    queryListData.pageSize = currentPageSize.value
+    nodename.value = data.description
+    curnodeData.value.id = data.id
+    curnodeData.value.name = data.name
+    curnodeData.value.description = data.description
+    if (data.id !== 0) {
+        queryenumValueMethod(queryListData)
+    }
 }
 
 const currentPage = ref(1)
@@ -326,24 +315,30 @@ const rules = reactive<FormRules<RuleForm>>({
             required: true,
             message: '名称不能为空',
             trigger: 'blur',
-        }]
-
+        },
+    ],
+    description: [
+        {
+            required: true,
+            message: '描述不能为空',
+            trigger: 'blur',
+        },
+    ],
 })
 const visibleTypeAdd = ref(false)
 const formInlineAdd = reactive<RuleForm>({
     name: '',
-    description: ''
+    description: '',
 })
 const fromAddType = () => {
     visibleTypeAdd.value = true
     formInlineAdd.name = ''
-    formInlineAdd.description =''
+    formInlineAdd.description = ''
 }
 const handleClose = (done: () => void) => {
     visibleTypeAdd.value = false
 }
 
-
 const onSubmitType = () => {
     formRef.value.validate((valid: any) => {
         if (valid) {
@@ -367,13 +362,11 @@ const onSubmitType = () => {
     })
 }
 
-
-
 //新增枚举值
 interface RuleForm1 {
     enumTypeId: number | string
     value: string
-    description: string| undefined
+    description: string | undefined
     orderNumber: number
     isActive: number
 }
@@ -383,30 +376,29 @@ const rules1 = reactive<FormRules<RuleForm1>>({
             required: true,
             message: '值不能为空',
             trigger: 'blur',
-        }]
-
+        },
+    ],
 })
-const visibleValueAdd= ref(false)
+const visibleValueAdd = ref(false)
 const formInlineValue = reactive<RuleForm1>({
     enumTypeId: enumTypeId.value,
     value: ' ',
     description: ' ',
     orderNumber: 0,
-    isActive:0
+    isActive: 0,
 })
 const fromAddValue = () => {
-    visibleValueAdd.value= true
-    formInlineValue.enumTypeId =enumTypeId.value
+    visibleValueAdd.value = true
+    formInlineValue.enumTypeId = enumTypeId.value
     formInlineValue.value = ''
     formInlineValue.description = ''
-    formInlineValue.orderNumber =0
-    formInlineValue.isActive =0
+    formInlineValue.orderNumber = 0
+    formInlineValue.isActive = 0
 }
 const handleClosevalue = (done: () => void) => {
     visibleValueAdd.value = false
 }
 
-
 const queryenumValueMethod = (data: any) => {
     enumListQuery(data).then((res) => {
         if (res.code == 200) {
@@ -426,10 +418,9 @@ const onSubmitvalue = () => {
         if (valid) {
             enumValueAdd(formInlineValue).then((res: any) => {
                 if (res.code == 200) {
-                    queryListData.description =queryName.value
+                    queryListData.description = queryName.value
                     queryListData.enumTypeId = enumTypeId.value
-                    queryListData.pageNum=currentPage.value,
-                    queryListData.pageSize=currentPageSize.value
+                    ;(queryListData.pageNum = currentPage.value), (queryListData.pageSize = currentPageSize.value)
                     queryenumValueMethod(queryListData)
                     ElMessage({
                         message: res.msg,
@@ -495,10 +486,10 @@ const dialogVisibleDelete1 = (done: () => void) => {
 const fromUpDate = reactive({
     id: '',
     enumTypeId: '',
-    value:'',
-    description : '',
+    value: '',
+    description: '',
     orderNumber: 0,
-    isActive: 0
+    isActive: 0,
 })
 const addhandleSwitchChange = (value: any) => {
     formInlineValue.isActive = value ? 1 : 0
@@ -515,8 +506,6 @@ const enumValueEdit = (data: any) => {
     fromUpDate.description = data.row.description
     fromUpDate.orderNumber = data.row.orderNumber
     fromUpDate.isActive = data.row.isActive
-
-
 }
 
 const edithandleClosevalue = (done: () => void) => {
@@ -527,10 +516,9 @@ const EditonSubmitvalue = () => {
         if (valid) {
             enumValuepageEdit(fromUpDate).then((res: any) => {
                 if (res.code == 200) {
-                    queryListData.description =queryName.value
+                    queryListData.description = queryName.value
                     queryListData.enumTypeId = enumTypeId.value
-                    queryListData.pageNum=currentPage.value,
-                        queryListData.pageSize=currentPageSize.value
+                    ;(queryListData.pageNum = currentPage.value), (queryListData.pageSize = currentPageSize.value)
                     queryenumValueMethod(queryListData)
                     ElMessage({
                         message: res.msg,
@@ -549,14 +537,14 @@ const EditonSubmitvalue = () => {
     })
 }
 
-const visibleTypeEdit=ref(false)
-const formInlineEdit=reactive({
-    id:'',
+const visibleTypeEdit = ref(false)
+const formInlineEdit = reactive({
+    id: '',
     name: '',
-    description: ''
+    description: '',
 })
-const enumTypeEdit = (curnodeData) => {
-    visibleTypeEdit.value=true
+const enumTypeEdit = (curnodeData: any) => {
+    visibleTypeEdit.value = true
     formInlineEdit.id = curnodeData.id
     formInlineEdit.name = curnodeData.name
     formInlineEdit.description = curnodeData.description
@@ -588,10 +576,10 @@ const onSubmitTypeEdit = () => {
     })
 }
 
-const contextMenuTreeData=ref({
-    id:'',
+const contextMenuTreeData = ref({
+    id: '',
     name: '',
-    description: ''
+    description: '',
 })
 
 const enumOperateVisible = ref(false)
@@ -599,19 +587,25 @@ const enumcontextMenuPos = ref({
     x: 0,
     y: 0,
 })
-const enumContextMenu = (event: any,curnodeData) => {
+const enumContextMenu = (event: any, curnodeData: any) => {
     enumcontextMenuPos.value.x = event.pageX
     enumcontextMenuPos.value.y = event.pageY
     contextMenuTreeData.value = curnodeData
-    if(nodename.value=="枚举类型配置"||nodename.value==undefined){
+    if (nodename.value == '枚举类型配置' || nodename.value == undefined) {
         enumOperateVisible.value = false
-    }else{
+    } else {
         enumOperateVisible.value = true
     }
 }
 const delenumType = () => {
-    enumTypeDelete({ id: contextMenuTreeData.value!.id! })
-        .then((res) => {
+    const params = {...queryListData,pageNum:1,pageSize:10,enumTypeId: contextMenuTreeData.value.id}
+    enumListQuery(params).then((res) => {
+        if (res.data?.rows.length) {
+            throw '该枚举类型下存在枚举值，请先删除枚举值!'
+        }else{
+            return enumTypeDelete({ id: contextMenuTreeData.value!.id! })
+        }
+    }).then((res:any) => {
             if (res.code == 200) {
                 enumTreeTypeList()
                 ElMessage({
@@ -626,7 +620,8 @@ const delenumType = () => {
             }
         })
         .catch((err) => {
-            ElMessage.error(err?.response?.data?.msg ?? '删除失败')
+            const msg = typeof err === 'string' ? err : err?.response?.data?.msg 
+            ElMessage.error(msg ?? '删除失败')
         })
 }
 
@@ -636,7 +631,6 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-
 $defaultHeaderHeight: 60px;
 @mixin searchInput($value) {
     margin-right: $value;
@@ -645,47 +639,46 @@ $defaultHeaderHeight: 60px;
 }
 $paginationHeight: 32px;
 
-.Enumeration{
+.Enumeration {
     width: 100%;
     height: 100%;
-    .containerPart{
+    .containerPart {
         height: 100%;
-        .defaultAside{
+        .defaultAside {
             width: 260px;
             height: 100%;
             border-right: 1px solid #eaebed;
-            .el-main{
-                .demo-collapse{
-                    .el-collapse{
+            .el-main {
+                .demo-collapse {
+                    .el-collapse {
                         border: none;
                         border-color: transparent;
                     }
-                    .el-collapse-item{
-                        :deep(.el-collapse-item__arrow){
+                    .el-collapse-item {
+                        :deep(.el-collapse-item__arrow) {
                             pointer-events: auto;
                         }
                         .collapse-title {
                             flex: 1 0 90%;
                             order: 1;
                         }
-                        :deep(.el-collapse-item__header){
+                        :deep(.el-collapse-item__header) {
                             background: #d0e5f2;
                             border-radius: 4px;
                             padding-left: 10px;
-                            text-align:left
+                            text-align: left;
                         }
-                        :deep(.el-collapse-item__wrap){
+                        :deep(.el-collapse-item__wrap) {
                             border: none;
                             border-color: transparent;
                         }
                     }
-
                 }
             }
 
-            .treeMain{
-                .treeTitle{
-                    height:40px;
+            .treeMain {
+                .treeTitle {
+                    height: 40px;
                     background: #d0e5f2;
                     line-height: 40px;
                     display: inline-block;
@@ -695,9 +688,9 @@ $paginationHeight: 32px;
                 }
             }
         }
-        .defaultMainContainer{
+        .defaultMainContainer {
             height: 100%;
-            .defaultHeader{
+            .defaultHeader {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
@@ -718,11 +711,11 @@ $paginationHeight: 32px;
                 height: calc(100% - $paginationHeight);
             }
         }
-        .el-form--inline .el-form-item{
+        .el-form--inline .el-form-item {
             width: 100%;
         }
     }
-    .modelOperate{
+    .modelOperate {
         display: flex;
         flex-direction: column;
         justify-content: space-between;
diff --git a/ui/dasadmin/src/views/backend/auth/menu/index.vue b/ui/dasadmin/src/views/backend/auth/menu/index.vue
index 93dd9114..7239a765 100644
--- a/ui/dasadmin/src/views/backend/auth/menu/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/menu/index.vue
@@ -77,7 +77,7 @@
                         </el-radio-group>
                     </el-form-item>
 
-                    <el-form-item label="&nbsp;&nbsp;动作参数:">
+                    <el-form-item label="&nbsp;&nbsp;菜单路径:">
                         <el-input v-model="fromUpDate.funParam"> </el-input>
                     </el-form-item>
 
@@ -127,7 +127,7 @@
                         </el-radio-group>
                     </el-form-item>
 
-                    <el-form-item label="&nbsp;&nbsp;动作参数:">
+                    <el-form-item label="&nbsp;&nbsp;菜单路径:">
                         <el-input v-model="formInlineAdd.funParam"> </el-input>
                     </el-form-item>
 
@@ -363,7 +363,7 @@ const rules = reactive<FormRules<RuleForm>>({
     ],
 })
 
-// 动作参数
+// 菜单路径
 interface RyReplaceFields {
     children: string
     title: string
diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue
index 3a3bb745..5f9a4019 100644
--- a/ui/dasadmin/src/views/backend/auth/model/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/model/index.vue
@@ -47,6 +47,9 @@
                         placeholder="请输入模型名称"
                         class="searchModelInput"
                     ></el-input>
+                    <el-tooltip effect="light" content="新增物模型" placement="bottom">
+                        <el-button :icon="Plus" @click="openModel('add')"></el-button>
+                    </el-tooltip>
                 </el-header>
                 <el-main class="treeMain">
                     <el-tree
@@ -199,7 +202,7 @@
             <template #default>
                 <div class="modelOperate">
                     <el-button @click="openModel('detail', curContextMenuTreeData)" :icon="Reading">查看</el-button>
-                    <el-button @click="openModel('add')" :icon="DocumentAdd">新增</el-button>
+                    <!-- <el-button @click="openModel('add')" :icon="DocumentAdd">新增</el-button> -->
                     <el-button @click="openModel('edit', curContextMenuTreeData)" :icon="DocumentChecked">修改</el-button>
                     <el-popconfirm title="确认删除？" @confirm="delModel">
                         <template #reference>
@@ -1084,6 +1087,11 @@ $paginationHeight: 32px;
                 display: flex;
                 justify-content: center;
                 align-items: center;
+                gap: 5px;
+                .el-button {
+                    width: 35px;
+                    height: 40px;
+                }
                 .searchModelInput {
                     height: 40px;
                 }
@@ -1169,7 +1177,7 @@ $paginationHeight: 32px;
         justify-content: space-between;
         align-items: center;
         width: 80px;
-        height: 150px;
+        height: 110px;
         .el-button {
             margin: 0;
         }
diff --git a/ui/dasadmin/src/views/backend/auth/org/index.vue b/ui/dasadmin/src/views/backend/auth/org/index.vue
index b258dc75..2c9768a9 100644
--- a/ui/dasadmin/src/views/backend/auth/org/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/org/index.vue
@@ -51,8 +51,8 @@
                 </template>
             </el-form>
             <template #footer>
-                <el-button type="primary" @click="submitAddForm" :disabled="formDisabled">保存</el-button>
-                <el-button @click="closeAddForm">取消</el-button>
+                <el-button v-if="!formDisabled" type="primary" @click="submitAddForm">保存</el-button>
+                <el-button v-if="!formDisabled" @click="closeAddForm">取消</el-button>
             </template>
         </el-dialog>
         <el-container class="defaultContainer">
@@ -81,7 +81,7 @@
                         <el-input v-model="searchTableInput" class="searchInput"></el-input>
                         <el-button @click="searchTable" type="primary" :icon="Search" class="defaultBtn">{{ t('management.search') }}</el-button>
                     </div>
-                    <el-button type="primary" :icon="Plus" class="defaultBtn" @click="addInstitutional(false)">{{ t('management.add') }}</el-button>
+                    <el-button type="primary" :icon="Plus" class="defaultBtn" @click="addInstitutional">{{ t('management.add') }}</el-button>
                 </el-header>
                 <el-main class="defaultMain">
                     <el-table :data="tableData" class="tablePart">
@@ -125,7 +125,7 @@
             <template #default>
                 <div class="modelOperate">
                     <el-button @click="editForm(rightClickMenuData!, true)" :icon="Reading">查看</el-button>
-                    <el-button @click="addInstitutional(true)" :icon="DocumentAdd">新增</el-button>
+                    <el-button @click="addInstitutional" :icon="DocumentAdd">新增</el-button>
                     <el-button @click="editForm(rightClickMenuData!)" :icon="DocumentChecked">修改</el-button>
                     <el-popconfirm title="确认删除？" @confirm="delForm(rightClickMenuData!)">
                         <template #reference>
@@ -308,14 +308,12 @@ const addFormItemList: formItemListType<addDataEnumKeyJointType>[] = [
 ]
 const dialogTitle = ref('新增机构')
 const dialogVible = ref(false)
-const addInstitutional = (rightClick = false) => {
+const addInstitutional = () => {
     dialogTitle.value = '新增机构'
     formModel.value = JSON.parse(JSON.stringify(defaultFormModel))
     formRef.value && formRef.value.resetFields()
     dialogVible.value = true
-    if (!rightClick) {
-        formModel.value.parentOrgId = clickTreeMenuData.value?.id!
-    }
+    formModel.value.parentOrgId = clickTreeMenuData.value?.id!
     formDisabled.value = false
 }
 
@@ -330,7 +328,7 @@ const submitAddForm = () => {
                     .then((res) => {
                         if (res.success) {
                             ElMessage.success('新增成功')
-                            getInstitutionList({ parentOrgId: rightClickMenuData.value?.parentOrgId })
+                            getInstitutionList({ parentOrgId: formModel.value.parentOrgId })
                             dialogVible.value = false
                             refreshTreeData(formModel.value.parentOrgId)
                         } else {
@@ -345,11 +343,10 @@ const submitAddForm = () => {
                     .then((res) => {
                         if (res.success) {
                             ElMessage.success('编辑成功')
-                            getInstitutionList({ parentOrgId: rightClickMenuData.value?.parentOrgId })
+                            getInstitutionList({ parentOrgId: formModel.value.parentOrgId })
                             dialogVible.value = false
-                            refreshTreeData(rightClickMenuData.value!.parentOrgId).then(() => {
-                                refreshTreeData(formModel.value.parentOrgId)
-                            })
+                            refreshTreeData(formModel.value.parentOrgId)
+                            return
                         } else {
                             ElMessage.error(res?.msg ?? '编辑失败')
                         }
@@ -368,7 +365,6 @@ const closeAddForm = () => {
 const getInstitutionList = (data: getDataType = { name: null }) => {
     getInstitutionalListReq(data).then((res) => {
         pageTotal.value = res.total
-        console.log(res.rows)
 
         originData.value = res.rows.map((item) => {
             return {
@@ -447,7 +443,7 @@ const formDisabled = ref(false)
 const editForm = (column: getTreeDataReturnType, onlyOpen = false) => {
     formRef.value?.resetFields()
     formModel.value = JSON.parse(JSON.stringify(column))
-    dialogTitle.value = '编辑机构'
+    dialogTitle.value = onlyOpen ? '查看机构' : '编辑机构'
     dialogVible.value = true
     formDisabled.value = onlyOpen
 }
@@ -457,7 +453,7 @@ const delForm = (column: getTreeDataReturnType) => {
         .then((res) => {
             if (res.success) {
                 ElMessage.success('删除成功')
-                getInstitutionList({ parentOrgId: rightClickMenuData.value?.parentOrgId })
+                getInstitutionList({ parentOrgId: column.parentOrgId })
                 refreshTreeData(column.parentOrgId)
             } else {
                 ElMessage.error(res?.msg ?? '删除失败')
@@ -536,9 +532,7 @@ const getTreeData = (orgId: number | string | null) => {
 const initData = () => {
     getTreeData(null)
         .then((res) => {
-            console.log(res)
             treeData.value = [...res]
-            console.log(treeData.value)
 
             nextTick(() => {
                 treeRef.value?.setCurrentKey(res[0]?.id!, false)
diff --git a/ui/dasadmin/src/views/backend/auth/org/type.ts b/ui/dasadmin/src/views/backend/auth/org/type.ts
index 963b38d2..af471274 100644
--- a/ui/dasadmin/src/views/backend/auth/org/type.ts
+++ b/ui/dasadmin/src/views/backend/auth/org/type.ts
@@ -1,6 +1,6 @@
 export type getDataType = {
     name?: string | null
-    parentOrgId?: string | number
+    parentOrgId?: string | number |null
     province?: string
     city?: string
     county?: string
diff --git a/ui/dasadmin/src/views/backend/auth/user/index.vue b/ui/dasadmin/src/views/backend/auth/user/index.vue
index 9d34dc13..7d118108 100644
--- a/ui/dasadmin/src/views/backend/auth/user/index.vue
+++ b/ui/dasadmin/src/views/backend/auth/user/index.vue
@@ -87,8 +87,8 @@
 
                     <avatar @selectAvatar="selectAddName">
                         <template #randerData>
-                            <el-form-item label="头像选择:" prop="profilePicture">
-                                <el-input v-model="formUserAdd.profilePicture" placeholder="" clearable></el-input>
+                            <el-form-item label="头像选择:" prop="headImage">
+                                <el-input v-model="formUserAdd.headImage" placeholder="" clearable></el-input>
                             </el-form-item>
                         </template>
                     </avatar>
@@ -136,8 +136,8 @@
                     </el-form-item>
                     <avatar @selectAvatar="selectUpdataName">
                         <template #randerData>
-                            <el-form-item label="头像选择:" prop="profilePicture">
-                                <el-input v-model="formUserUpData.profilePicture" placeholder="" clearable></el-input>
+                            <el-form-item label="头像选择:" prop="headImage">
+                                <el-input v-model="formUserUpData.headImage" placeholder="" clearable></el-input>
                             </el-form-item>
                         </template>
                     </avatar>
@@ -180,7 +180,7 @@
                 <template #footer>
                     <div class="dialog-footer">
                         <el-button type="primary" @click="passWordUpdata">保存</el-button>
-                        <el-button  @click="passWordDialog = false">取消</el-button>
+                        <el-button @click="passWordDialog = false">取消</el-button>
                     </div>
                 </template>
             </el-dialog>
@@ -329,7 +329,7 @@ const formUserAdd = reactive({
     phone: '',
     orgId: '',
     roleList: [],
-    profilePicture: '',
+    headImage: '',
 })
 const rules = reactive<FormRules<RuleUser>>({
     account: [
@@ -339,6 +339,13 @@ const rules = reactive<FormRules<RuleUser>>({
             trigger: 'blur',
         },
     ],
+    password:[
+        {
+            required: true,
+            message: '密码不能为空',
+            trigger: 'blur',
+        },
+    ]
 })
 const addUserFromData = () => {
     visibleParam.value = true
@@ -349,7 +356,7 @@ const addUserFromData = () => {
     formUserAdd.phone = ''
     formUserAdd.orgId = ''
     formUserAdd.roleList = []
-    formUserAdd.profilePicture = ''
+    formUserAdd.headImage = ''
 }
 
 const handleCloseParam = (data: any) => {
@@ -361,7 +368,9 @@ const addOnSubmit = () => {
         if (valid) {
             visibleParam.value = false
             formUserAdd.orgId = treeId.value
-
+            if (!formUserAdd.headImage) {
+                formUserAdd.headImage = 'Avatar'
+            }
             userAdd(formUserAdd).then((res) => {
                 if (res.code == 200) {
                     formQuery.orgId = treeId.value
@@ -389,7 +398,7 @@ const formUserUpData = reactive({
     phone: '',
     orgId: '',
     roleList: [],
-    profilePicture: '',
+    headImage: '',
 })
 const viewUsers = (data: any) => {
     formRef.value?.resetFields()
@@ -404,7 +413,7 @@ const viewUsers = (data: any) => {
     formUserUpData.roleList = data.row.roleList.map((item: any) => {
         return item.id
     })
-    formUserUpData.profilePicture = data.row.headImage
+    formUserUpData.headImage = data.row.headImage
 }
 const upDataOnSubmit = () => {
     formRef.value.validate((valid: any) => {
@@ -538,12 +547,12 @@ const passWordUpdata = () => {
 
 // 新增页面头像接受
 const selectAddName = (data: string) => {
-    formUserAdd.profilePicture = data
+    formUserAdd.headImage = data
 }
 
 // 修改页面头像接受
 const selectUpdataName = (data: string) => {
-    formUserUpData.profilePicture = data
+    formUserUpData.headImage = data
 }
 // 分页
 const pagePagination = [20, 50, 100]

From 85aaa5b44396144ce779b9e81aad400f708a27e9 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Thu, 19 Dec 2024 15:16:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 2 +-
 ui/dasadmin/src/views/backend/home/home.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index 603df4b2..d7c38d14 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -301,7 +301,7 @@ const StatusListData = () => {
             objectType: 10002,
             belongProject: '',
             attributesList: [
-                'iwindspeed"',
+                'iwindspeed',
                 'iturbineoperationmode',
                 'iyplevel',
                 'gridlostdetected',
diff --git a/ui/dasadmin/src/views/backend/home/home.vue b/ui/dasadmin/src/views/backend/home/home.vue
index 60024075..5ab59585 100644
--- a/ui/dasadmin/src/views/backend/home/home.vue
+++ b/ui/dasadmin/src/views/backend/home/home.vue
@@ -205,7 +205,7 @@ const StatusListData = () => {
             objectType: 10002,
             belongProject: '',
             attributesList: [
-                'iwindspeed"',
+                'iwindspeed',
                 'iturbineoperationmode',
                 'iyplevel',
                 'gridlostdetected',