From 83e57c92b4eb7d732afe7f529ca909f94d43249b Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Fri, 26 Dec 2025 11:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E6=B5=B7=E5=8D=97?=
 =?UTF-8?q?=E4=B8=8D=E8=B0=83getLastData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/admin/components/navBar/classic.vue | 11 +++++++----
 .../bearingCapacity/userManagement/index.vue    | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/layouts/admin/components/navBar/classic.vue b/src/layouts/admin/components/navBar/classic.vue
index 1f63952a..ffa422e9 100644
--- a/src/layouts/admin/components/navBar/classic.vue
+++ b/src/layouts/admin/components/navBar/classic.vue
@@ -29,7 +29,7 @@ import { getLastData } from '@/api/systerm'
 const Version: any = ref(null)
 const config = useConfig()
 const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
         config.setLayout('menuCollapse', true)
@@ -37,9 +37,12 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
-    getLastData({ versionType: 'WEB' }).then(res => {
-        Version.value = res.data.versionName
-    })
+    if(!VITE_FLAG){
+         getLastData({ versionType: 'WEB' }).then(res => {
+            Version.value = res.data.versionName
+        })
+    }
+   
     document.title = getTheme.name
 })
 </script>
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index da54f72a..5c0ac06c 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -56,8 +56,10 @@
                     </el-form-item>
 
                     <el-form-item label="区域" prop="regionList">
-                        <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" />
+                        <!-- <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" /> -->
+                        <el-cascader v-model="form.regionList" :props="props" :options="areaList"  style="width: 100%"  placeholder="请选择区域" />
                     </el-form-item>
+                 
                     <el-form-item label="详细地址：" prop="area">
                         <el-input
                             clearable
@@ -93,6 +95,8 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import equipment from './equipment.vue'
 import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+
 defineOptions({
     name: 'estimate/photovoltaic'
 })
@@ -104,7 +108,8 @@ const disabled = ref(false)
 const TableHeaderRef = ref()
 const equipmentRef = ref()
 const title = ref('')
-const areaList: any = dictData.areaSelect()
+//const areaList: any = dictData.areaSelect()
+const areaList = ref([])
 const userShow: any = ref('Power_Station_Users')
 
 const form = ref({
@@ -263,14 +268,20 @@ tableStore.table.params.userType = ''
 provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
+
+
 })
 const useChange = (e: string) => {
     userShow.value = uesrList.filter(item => item.id == e)[0].code
 }
 // 新增
-const add = () => {
+const add = async () => {
     disabled.value = false
     title.value = '新增承载能力待评估用户'
+
+    await getAreaDept().then(res => {
+        areaList.value = JSON.parse(JSON.stringify(res.data))
+    })
     dialogVisible.value = true
 }
 // 保存