成果的部分修正，两个新专题在共同文件里添加

src/views/demo/audit/util.ts

@@ -11,6 +11,8 @@ export const typenameKey = {
   '重点问题I类': 'zd1tblx',
   '重点问题II类': 'zd2tblx',
   '巡查审计': 'xcsjtblx',
+  '生态保护红线监管': 'stbhhxjgtblx',
+  '生态修复': 'stxftblx',
 }
 export const SubjectKeyObj = {
   '巡查审计': 'Subject_XCSJ', //巡查审计
@@ -20,6 +22,8 @@ export const SubjectKeyObj = {
   '耕地非粮化': 'Subject_GDFLH', //耕地非粮化
   '重点问题I类': 'Subject_ZDWT1', //重点问题I类
   '重点问题II类': 'Subject_ZDWT2', //重点问题II类
+  '生态保护红线监管': 'Subject_STBHHXJG',  //生态保护红线监管
+  '生态修复': 'Subject_STXF',  //生态修复
 }
 export const codeObj = {
   '违法用地': '0000001',
@@ -29,6 +33,8 @@ export const codeObj = {
   '耕地非粮化': '0000004',
   '重点问题I类': '0000005',
   '重点问题II类': '0000006',
+  '生态保护红线监管': '0000007',
+  '生态修复': '0000008',
 }
 export const columns: BasicColumn[] = [
   {

src/views/demo/system/achievement/Display/AttributeWindow.vue

@@ -8,14 +8,14 @@
         class="item"
         v-for="(item, index) in detailDataArr"
         :key="index"
-        v-show="item.name && item.value"
+        v-show="item.name || item.value"
       >
         <div class="item-title">
           {{ item.name != '' && item.name != null && item.name != 'null' ? item.name : '暂无属性' }}
         </div>
         <div class="item-value">
           {{
-            item.value != '' && item.value != null && item.value != 'null' ? item.value : '暂无数据'
+            item.value != '' && item.value != null && item.value != 'null' ? item.value : '无数据'
           }}
         </div>
       </div>
@@ -54,9 +54,14 @@
           return item.itemValue.toLowerCase() == key.toLowerCase();
         });
         if (enObj) {
-          detail.name = enObj.itemName ? enObj.itemName : null;
+          if (enObj.enabledMark == 1) {
+            detail.name = enObj.itemName ? enObj.itemName : '';
+          } else if (enObj.enabledMark == 0) {
+            // 停用
+            detail.name = '暂无属性名' + '（' + enObj.itemValue + '）';
+          }
         } else {
-          detail.name = '暂无属性名';
+          detail.name = '暂无属性名' + '（' + key + '）';
         }
         detail.value = detailData[key];
         detailDataArr.value.push(detail);

src/views/demo/system/achievement/Display/index.vue

@@ -791,12 +791,7 @@
   const initNameList: any = ref([]);
   function getSysDataItemDetail() {
     getLoad({ code: 'geoservermanagement' }).then((res) => {
-      initNameList.value = res.map((item) => {
-        return {
-          itemName: item.itemName,
-          itemValue: item.itemValue,
-        };
-      });
+      initNameList.value = res;
     });
   }
 

src/views/demo/system/geoservermanagement/clound/uploadFrom.vue

@@ -118,7 +118,21 @@
   const formRef = ref();
 
   const props = defineProps(['uploadForm', 'isEdit']);
-  const uploadFrom = ref(props.uploadForm);
+  const uploadFrom = ref({
+    serverName: '',
+    countyname: undefined,
+    spatialRef: undefined,
+    dataSourceType: '',
+    dataType: '',
+    dataTable: '',
+    shpPath: '',
+    shpFileName: '',
+    shpFileList: [],
+    appendPath: '',
+    headers: [] as any,
+    style: '',
+    styleName: undefined,
+  });
   const isEdit = ref(props.isEdit);
   const emit = defineEmits([
     'uploadFormSubmit',
@@ -130,10 +144,11 @@
   watch(
     () => props.uploadForm,
     () => {
-      uploadFrom.value = props.uploadForm;
+      uploadFrom.value = cloneDeep(props.uploadForm);
     },
     {
       deep: true,
+      immediate: true,
     },
   );
 
@@ -308,7 +323,6 @@
   function addLayerSubmitAfter(addlayer) {
     // 图层样式
     getGeoStylePage();
-    console.log(addlayer);
     uploadFrom.value.styleName = addlayer.styleName;
     uploadFrom.value.style = addlayer.style;
     addLayerOpen.value = false;

src/views/demo/system/geoservermanagement/index.vue

@@ -127,6 +127,7 @@
       <UploadFrom
         ref="uploadFormRef"
         :uploadForm="uploadFrom"
+        :maskClosable="false"
         :isEdit="isEdit"
         @uploadFormSubmit="uploadFormSubmit"
       />
@@ -477,7 +478,7 @@
     if (rows.length == 0) {
       return createMessage.warn('请勾选一个图层进行编辑');
     }
-    uploadFrom.value = rows[0];
+    uploadFrom.value = cloneDeep(rows[0]);
     current.value = 0;
     editModalShow.value = true;
     setDataSourceType(uploadFrom.value.dataSourceType);
@@ -497,6 +498,7 @@
   }
   // 关闭编辑窗口
   function handleEditClose() {
+    uploadFormRef.value.clearValidation();
     editModalShow.value = false;
   }
 
@@ -532,12 +534,7 @@
   const initNameList: any = ref([]);
   function getSysDataItemDetail() {
     getLoad({ code: 'geoservermanagement' }).then((res) => {
-      initNameList.value = res.map((item) => {
-        return {
-          itemName: item.itemName,
-          itemValue: item.itemValue,
-        };
-      });
+      initNameList.value = res;
     });
   }
 

src/views/demo/util.ts

@@ -52,4 +52,6 @@ export const SubjectKeyList = {
   '0000004': 'Subject_GDFLH', //耕地非粮化
   '0000005': 'Subject_ZDWT1', //重点问题I类
   '0000006': 'Subject_ZDWT2', //重点问题II类
+  '0000007': 'Subject_STBHHXJG',  //生态保护红线监管
+  '0000008': 'Subject_STXF',  //生态修复
 }

src/views/demo/workflow/flowcode.ts

@@ -27,6 +27,14 @@ export const flowCode = [
     code: '0000002',
     name: '巡察审计',
   },
+  {
+    code: '0000007',
+    name: '生态保护红线监管',
+  },
+  {
+    code: '0000008',
+    name: '生态修复',
+  },
 ];
 export const flowCodeName = (code) => {
   const item = flowCode.find((item) => item.code === code);