Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/ability/assignedScene/area-add.vue

@@ -90,7 +90,7 @@ export default {
     areaVisible: {
       handler (newVal) {
         this.getSceneArea()
-        this.getArea()
+       // this.getArea()
         this.areaVisibleCopy = newVal
         if (this.modalType == 'add' && newVal) {
           this.getDetail(this.dataForm)
@@ -112,7 +112,8 @@ export default {
 
   data () {
     return {
-      areas: [], // 所属区市
+      areas: [{'name':'市南区'},{'name':'市北区'},{'name':'李沧区'},{'name':'崂山区'},{'name':'西海岸新区'},
+               {'name':'城阳区'},{'name':'即墨区'},{'name':'胶州市'},{'name':'平度市'},{'name':'莱西市'}], // 所属区市
       sceneAreas: [],
       fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
       dataForm: {

front/src/views/home/integrationServices.vue

@@ -156,7 +156,8 @@ export default defineComponent({
     }
     let cityOrArea = ref(0)//0市级 1基层
     let senses = ref([])//场景领域
-    let areas = ref([])//区市
+    let areas = ref([{'name':'市南区'},{'name':'市北区'},{'name':'李沧区'},{'name':'崂山区'},{'name':'西海岸新区'},
+               {'name':'城阳区'},{'name':'即墨区'},{'name':'胶州市'},{'name':'平度市'},{'name':'莱西市'}])//区市
     let clickSensesList = ref([])//多选场景领域
     let clickAreasList = ref([])//多选区域领域
     const searchResultListDom = ref(null)
@@ -254,11 +255,11 @@ export default defineComponent({
       const params1 = {
         pid: '250000'
       }
-      getRegion(params1).then(
-        (res) => {
+      // getRegion(params1).then(
+      //   (res) => {
 
-          areas.value = res.data.data
-        })
+      //     areas.value = res.data.data
+      //   })
     }
 
     // 获取融合服务列表