修改城市查询

src/views/achievement/index.vue

@@ -44,7 +44,7 @@
               <el-option v-for="i in technologyList" :key="i.id" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #area>
-              <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" style="width: 100%" />
+              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
             </template>
             <template #file>
               <custom-upload model="file" :list="form.file" :limit="1" url="/files/web/cxyy_achievement/upload" @change="onUpload"></custom-upload>
@@ -72,8 +72,6 @@
 </template>
 
 <script setup>
-// API 引用
-import { getCity } from '@/utils/city'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
 const { t } = useI18n()
@@ -82,6 +80,8 @@ import { AchievementStore } from '@/store/api/platform/achievement'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/system/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const store = AchievementStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
@@ -159,9 +159,6 @@ const examForm = ref({})
 // 请求
 onMounted(async () => {
   loading.value = true
-  getCity().then((response) => {
-    cityList.value = response.address
-  })
   await searchOther()
   await search({ skip, limit })
   loading.value = false
@@ -199,6 +196,9 @@ const searchOther = async () => {
   // 行业
   result = await sectorStore.query({ is_use: '0' })
   if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
 }
 const search = async (query = { skip, limit }) => {
   skip = query.skip

src/views/demand/demand/index.vue

@@ -41,7 +41,7 @@
               <el-option v-for="i in methodList" :key="i.id" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #area>
-              <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" style="width: 100%" />
+              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
             </template>
             <template #tags>
               <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
@@ -63,8 +63,6 @@
 </template>
 
 <script setup>
-// API 引用
-import { getCity } from '@/utils/city'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
 const { t } = useI18n()
@@ -73,6 +71,8 @@ import { DemandStore } from '@/store/api/platform/demand'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/system/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const store = DemandStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
@@ -147,9 +147,6 @@ const examForm = ref({})
 // 请求
 onMounted(async () => {
   loading.value = true
-  getCity().then((response) => {
-    cityList.value = response.address
-  })
   await searchOther()
   await search({ skip, limit })
   loading.value = false
@@ -181,6 +178,9 @@ const searchOther = async () => {
   // 行业
   result = await sectorStore.query({ is_use: '0' })
   if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
 }
 const search = async (query = { skip, limit }) => {
   skip = query.skip

src/views/demand/supply/index.vue

@@ -41,7 +41,7 @@
               <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
             </template>
             <template #area>
-              <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" style="width: 100%" />
+              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
             </template>
             <template #tags>
               <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
@@ -63,8 +63,6 @@
 </template>
 
 <script setup>
-// API 引用
-import { getCity } from '@/utils/city'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
 const { t } = useI18n()
@@ -73,6 +71,8 @@ import { SupplyStore } from '@/store/api/platform/supply'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/system/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const store = SupplyStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
@@ -140,9 +140,6 @@ const examForm = ref({})
 // 请求
 onMounted(async () => {
   loading.value = true
-  getCity().then((response) => {
-    cityList.value = response.address
-  })
   await searchOther()
   await search({ skip, limit })
   loading.value = false
@@ -174,6 +171,9 @@ const searchOther = async () => {
   // 行业
   result = await sectorStore.query({ is_use: '0' })
   if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
 }
 const search = async (query = { skip, limit }) => {
   skip = query.skip

src/views/footplate/index.vue

@@ -48,8 +48,6 @@
 </template>
 
 <script setup>
-// API 引用
-import { getCity } from '@/utils/city'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
 const { t } = useI18n()
@@ -58,6 +56,8 @@ import { FootplateStore } from '@/store/api/platform/footplate'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/system/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const store = FootplateStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
@@ -122,9 +122,6 @@ const examForm = ref({})
 // 请求
 onMounted(async () => {
   loading.value = true
-  getCity().then((response) => {
-    cityList.value = response.address
-  })
   await searchOther()
   await search({ skip, limit })
   loading.value = false
@@ -144,6 +141,9 @@ const searchOther = async () => {
   // 行业
   result = await sectorStore.query({ is_use: '0' })
   if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
 }
 const search = async (query = { skip, limit }) => {
   skip = query.skip

src/views/project/index.vue

@@ -58,7 +58,7 @@
               <el-option v-for="i in cooperateList" :key="i.id" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #area>
-              <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" style="width: 100%" />
+              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
             </template>
           </custom-form>
         </el-col>
@@ -75,8 +75,6 @@
 </template>
 
 <script setup>
-// API 引用
-import { getCity } from '@/utils/city'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
 const { t } = useI18n()
@@ -85,6 +83,8 @@ import { ProjectStore } from '@/store/api/platform/project'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/system/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const store = ProjectStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
@@ -150,9 +150,6 @@ const examForm = ref({})
 // 请求
 onMounted(async () => {
   loading.value = true
-  getCity().then((response) => {
-    cityList.value = response.address
-  })
   await searchOther()
   await search({ skip, limit })
   loading.value = false
@@ -187,6 +184,9 @@ const searchOther = async () => {
   // 行业
   result = await sectorStore.query({ is_use: '0' })
   if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
 }
 const search = async (query = { skip, limit }) => {
   skip = query.skip

src/views/support/index.vue

@@ -26,7 +26,7 @@
               <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
             </template>
             <template #area>
-              <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" style="width: 100%" />
+              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
             </template>
             <template #tags>
               <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
@@ -48,8 +48,6 @@
 </template>
 
 <script setup>
-// API 引用
-import { getCity } from '@/utils/city'
 import { cloneDeep, get } from 'lodash-es'
 const $checkRes = inject('$checkRes')
 const { t } = useI18n()
@@ -58,6 +56,8 @@ import { SupportStore } from '@/store/api/platform/support'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
 import { SectorStore } from '@/store/api/system/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const store = SupportStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
@@ -141,6 +141,9 @@ const searchOther = async () => {
   // 行业
   result = await sectorStore.query({ is_use: '0' })
   if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
 }
 const search = async (query = { skip, limit }) => {
   skip = query.skip

src/views/user/user/index.vue

@@ -41,6 +41,7 @@
 </template>
 
 <script setup>
+import { cloneDeep, get } from 'lodash-es'
 // 组件
 import user from './parts/user.vue'
 import association from './parts/association.vue'
@@ -51,12 +52,11 @@ import incubator from './parts/incubator.vue'
 import state from './parts/state.vue'
 import unit from './parts/unit.vue'
 import investment from './parts/investment.vue'
-// API 引用
-import { getCity } from '@/utils/city'
 import { UserStore } from '@/store/api/user/user'
 import { RoleStore } from '@/store/api/system/role'
 import { DictDataStore } from '@/store/api/system/dictData'
-import { cloneDeep, get } from 'lodash-es'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
 const $checkRes = inject('$checkRes')
 const store = UserStore()
 const dictDataStore = DictDataStore()
@@ -185,7 +185,8 @@ const searchOther = async () => {
   result = await dictDataStore.query({ code: 'isUse', is_use: '0' })
   if ($checkRes(result)) isUseList.value = result.data
   // 城市
-  getCity().then((response) => (cityList.value = response.address))
+  result = await regionStore.query({ level: 'city', parent_code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
   // 角色
   result = await roleStore.query({ is_use: '0' })
   if ($checkRes(result)) roleList.value = result.data