Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/components/FormViewer/index.vue

@@ -3,7 +3,7 @@
     <div v-show="tabsColumns.length > 1">
       <a-tabs style="width: 100%" @change="tabsChange">
         <a-tab-pane v-for="(colItem, index) in tabsColumns" :tab="colItem.label" :key="index">
-          <BasicForm ref="myDataBaseFormRef" @register="registerForm">
+          <BasicForm ref="tabsFormRef" @register="registerForm">
             <template #CardGroup>
               <CardGourp
                 v-if="cardGroupData.length > 0 && cardGroupData[index]"
@@ -24,7 +24,7 @@
       </a-tabs>
     </div>
     <BasicForm
-      ref="myDataBaseFormRef"
+      ref="formRef"
       @register="registerForm"
       v-if="formModalVisible && tabsColumns.length < 1"
     >
@@ -91,7 +91,8 @@
   const { proxy } = getCurrentInstance();
   const emit = defineEmits(['getFormSuccess']);
   const subTableDataStore = subTableStore();
-
+  const tabsFormRef = ref()
+  const formRef = ref()
   let formColumns: FormSchema[] = [];
   const props = defineProps({
     formConfig: Object,
@@ -315,8 +316,7 @@
       }, 10);
     }
   }
-  async function tabsChange(e) {
-    clearValidate();
+  function tabsChange(e) {
     tabsKey.value = e;
     formColumns.forEach((element) => {
       element.show = false;
@@ -341,6 +341,7 @@
     }
     setTimeout(() => {
       setFieldsValue(FieldsValue.value);
+      clearValidate()
     }, 10);
   }
 
@@ -425,8 +426,19 @@
         }
       }
       console.log(subTableDataStore.getGroupData);
+      let resultObj = {}
+      tabsFormRef.value.forEach((item,index) => {
+        console.log(item.getFieldsValue(),index)
+        let data = item.getFieldsValue()
+        Object.keys(data).forEach(key => {
+          if(!resultObj[key]){
+            resultObj[key] = data[key]
+          }
+        })
+      })
       //卡片组的值赋值给form，优化卡片组必填验证不通过
       setFieldsValue({
+        ...resultObj,
         ...subTableDataStore.getGroupData,
       });
 
@@ -491,7 +503,8 @@
     if (props.formVerison) {
       getFormHistory();
     }
-    clearValidate();
+    tabsFormRef.value && tabsFormRef.value.clearValidate();
+    formRef.value && formRef.value.clearValidate();
   });
   function radioVal() {
     console.log('radioVal');

src/views/sys/exception/Converge/index.vue

@@ -79,12 +79,12 @@ const initMap = () => {
                     type: 'raster',
                     source: 'raster-tiles-geo',
                     minzoom: 0,
-                    maxzoom: 18,
+                    maxzoom: 20,
                 },
             ],
         },
-        maxZoom:17,
-        minZoom:1,
+        maxZoom:18,
+        minZoom:7,
         zoom: 10,
         pitch:0,
         center: [117.984425,35.270654],

src/views/sys/exception/LargeScreenMap/index.vue

@@ -468,11 +468,12 @@ const handlerDealCountry = (countyName:String = "临沂市"):void=>{
 
         axios({
             method:"get",
-            url:`http://175.27.168.120:8080/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Axianjie&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=xzqmc%20like%20%27%25${filterName}%25%27`,
+            // url:`http://175.27.168.120:8080/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Axianjie&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=xzqmc%20like%20%27%25${filterName}%25%27`,
+            url:`http://120.222.154.7:8090/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Ashijie&maxFeatures=50&outputFormat=application%2Fjson`,
         }).then(res=>{
             handlerLoadCountyLayer(res.data);
         });
-    }else if(countyName){
+    } else if(countyName){
         center = MAP_VIEWER[countyName].center;
         zoom = MAP_VIEWER[countyName].zoom;
         handlerLocation([center['lng'],center['lat']],zoom);
@@ -480,7 +481,8 @@ const handlerDealCountry = (countyName:String = "临沂市"):void=>{
 
         axios({
             method:"get",
-            url:`http://175.27.168.120:8080/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Axianjie&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=xzqmc%20like%20%27%25${filterName}%25%27`,
+            // url:`http://175.27.168.120:8080/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Axianjie&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=xzqmc%20like%20%27%25${filterName}%25%27`,
+            url: `http://120.222.154.7:8090/geoserver/linyishi/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=linyishi%3Axianjie&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=xzqdm_1%20like%20%27%25${filterName}%25%27`,
         }).then(res=>{
             handlerLoadCountyLayer(res.data);
         })

src/views/sys/exception/mapComponent/top_title.vue

@@ -214,11 +214,11 @@
 <style lang="less" scoped>
   .screen-header-container {
     width: 100%;
-    // height: 130px;
+    height: 100px;
     // background-image: url('/public/statistical/header.png');
     // background-size: 100% 96px;
     background:
-      url('/public/statistical/mask.png') no-repeat top left / 100% 130px,
+      url('/public/statistical/mask.png') no-repeat top left / 100% 100px,
       url('/public/statistical/header.png') no-repeat top left / 100% 96px;
     position: absolute;
     top: 0px;