Merge branch 'develop' into release-test

@@ -26,7 +26,7 @@ watch(
       if (tab.fullPath.includes(jionPath)) {
       if (tab.fullPath.includes(jionPath)) {
         pathIndex.value = index
         pathIndex.value = index
       }
       }
-      return tab.fullPath === newRouter.fullPath
+      return tab.fullPath === decodeURIComponent(newRouter.fullPath);
     });
     });
     if (isExist.length == 0) {
     if (isExist.length == 0) {
       if (pathIndex.value != -1 && routerLength > 3) {
       if (pathIndex.value != -1 && routerLength > 3) {
@@ -58,7 +58,7 @@ watch(
     //   }
     //   }
     // })
     // })
     tabbarList.value = list;
     tabbarList.value = list;
-    tabbarActive.value = newRouter.fullPath;
+    tabbarActive.value = decodeURIComponent(newRouter.fullPath);
     userStore.setTabbar(tabbarList.value);
     userStore.setTabbar(tabbarList.value);
     userStore.setActiveTabbar(combPath, newRouter.fullPath);
     userStore.setActiveTabbar(combPath, newRouter.fullPath);
     // nextTick(() => {
     // nextTick(() => {
@@ -79,7 +79,6 @@ const changeTab = (pane: any, ev: any) => {
 };
 };
 const removeTab = (targetName) => {
 const removeTab = (targetName) => {
   // const tabs = tabbarList.value.filter(item => item.visible ?? true);
   // const tabs = tabbarList.value.filter(item => item.visible ?? true);
-  debugger
   const tabs = tabbarList.value;
   const tabs = tabbarList.value;
   let activeName = tabbarActive.value, nextTab: any = {};
   let activeName = tabbarActive.value, nextTab: any = {};
   const setTabs = (activeTab) => {
   const setTabs = (activeTab) => {

@@ -508,6 +508,14 @@ const formInfo = ref<any>({
       default: '',
       default: '',
       col: 'hide',
       col: 'hide',
     },
     },
+    {
+      label: "",
+      type: "input",
+      placeholder: "请输入",
+      field: "subjectDomain",
+      default: '',
+      col: 'hide',
+    },
   ],
   ],
   rules: {
   rules: {
     damName: [
     damName: [
@@ -1226,7 +1234,8 @@ const selectChange = async (val, row, info) => {
     formInfo.value.items.at(4).default = data.length && data[0].dataScale != null ? changeNum(data[0].dataScale, 0) : '';
     formInfo.value.items.at(4).default = data.length && data[0].dataScale != null ? changeNum(data[0].dataScale, 0) : '';
     formInfo.value.items.at(5).defaultValue = data.length ? data[0].caseNumber : '';
     formInfo.value.items.at(5).defaultValue = data.length ? data[0].caseNumber : '';
     formInfo.value.items.at(5).default = data.length && data[0].caseNumber != null ? changeNum(data[0].caseNumber, 0) : '';
     formInfo.value.items.at(5).default = data.length && data[0].caseNumber != null ? changeNum(data[0].caseNumber, 0) : '';
-    formInfo.value.items.at(-1).default = data.length ? data[0].damGuid : '';
+    formInfo.value.items.at(-2).default = data.length ? data[0].damGuid : '';
+    formInfo.value.items.at(-1).default = data.length ? data[0].subjectDomain : '';
     // formInfo.value.items.at(-3).required = data[0].damType != '1' && data[0].damType != '2';
     // formInfo.value.items.at(-3).required = data[0].damType != '1' && data[0].damType != '2';
     // formInfo.value.items.at(-4).required = data[0].damType != '1' && data[0].damType != '2';
     // formInfo.value.items.at(-4).required = data[0].damType != '1' && data[0].damType != '2';
     if (data.length && data[0].coverageArea?.[0]?.[0] != 'all' && data[0].coverageArea) {
     if (data.length && data[0].coverageArea?.[0]?.[0] != 'all' && data[0].coverageArea) {