档案调试外部服务

src/style/cus.scss

@@ -9,7 +9,6 @@
   --cus-main-color: #2E81FF;
   --cus-main-color-rgb: 46, 129, 255;
   --cus-main-color-hex-2: #273A58;
-  --el-notification-width: min-content;
 }
 .__hover {
   &:hover {
@@ -302,4 +301,8 @@
 
 em {
   color: red;
+}
+
+.el-notification {
+  width: min-content !important;
 }

src/views/manage/index/theme.vue

@@ -134,7 +134,11 @@ const initText = () => {
 }
 const initDetail = () => {
   state.form = props.transfer.row
-  state.textTable.data = state.form.themeField ? JSON.parse(state.form.themeField) : []
+  try {
+    state.textTable.data = state.form.themeField ? JSON.parse(state.form.themeField) : []
+  } catch (e) {
+    state.textTable.data = []
+  }
 }
 watch(() => props.show, (n) => {
   if (n) {

src/views/manage/service/detail.vue

@@ -270,13 +270,11 @@
               <template v-if="state.params.responseBody.type == 1">
                 <CusFormColumn
                   :span="6"
-                  required
                   v-model:param="state.params.responseBody.json.pathForm.pageNum"
                   label="当前页"
                 />
                 <CusFormColumn
                   :span="6"
-                  required
                   v-model:param="state.params.responseBody.json.pathForm.pageSize"
                   label="每页数"
                 />

src/views/manage/theme/relation-detail.vue

@@ -36,6 +36,7 @@
           link="select"
           :options="DictionaryStore.isMainIndexList"
           :disabled="transfer.hasMain"
+          @change="val => val == 1 ? (state.form.relateIndexId = '', state.form.relationDescription = '') : null"
         />
         <CusFormColumn
           :span="12"
@@ -53,6 +54,7 @@
           link="select"
           :options="transfer.relationOptions"
           static
+          :disabled="state.form.isMain == 1"
         />
         <CusFormColumn
           :span="12"
@@ -68,6 +70,7 @@
           required
           label="关系描述"
           v-model:param="state.form.relationDescription"
+          :disabled="state.form.isMain == 1"
         >
           <template #label>
             <el-tooltip content="输入\n可换行">

src/views/web/archive/index.vue

@@ -175,36 +175,47 @@ const themeConfigCpt = computed(() => {
   const getSearchParam = (item) => {
     // es查询参数
     const param = {}
-    param.indexCode = item.indexTableName
-    if (item.indexOrder) {
-      const obj = {}
-      JSON.parse(item.indexOrder).forEach(s => {
-        obj[s.sortParam] = s.sortType
-      })
-      param.orderBy = obj
-    }
-    if (item.indexCondition) {
-      const arr = []
-      JSON.parse(item.indexCondition).forEach(s => {
-        arr.push({
-          fieldCode: s.indexParam,
-          fieldQueryType: s.condition,
-          fieldQueryValue: route.query[s.themeParam]
+    if (item.type === 'inner_index') {
+      param.indexCode = item.indexTableName
+      if (item.indexOrder) {
+        const obj = {}
+        JSON.parse(item.indexOrder).forEach(s => {
+          obj[s.sortParam] = s.sortType
         })
-      })
-      param.datas = arr
+        param.orderBy = obj
+      }
+      if (item.indexCondition) {
+        const arr: any = []
+        JSON.parse(item.indexCondition).forEach(s => {
+          arr.push({
+            fieldCode: s.indexParam,
+            fieldQueryType: s.condition,
+            fieldQueryValue: route.query[s.themeParam]
+          })
+        })
+        param.datas = arr
+      }
+    } else {
+      param.serviceId = item.indexId
+      if (item.indexCondition) {
+        const obj: any = {}
+        JSON.parse(item.indexCondition).forEach(s => {
+          obj[s.indexParam] = route.query[s.themeParam]
+        })
+        param.serviceMap = obj
+      }
     }
     return param
   }
   const getTableHead = (item) => {
-    const arr = []
+    const arr: any = []
     item.indexFields.forEach(v => {
       arr.push({value: v.fieldKey, label: v.fieldName})
     })
     return arr
   }
   const res = {
-    main: {
+    main: <any>{
       indexStyle: {}
     },
     tabs: new Map(),
@@ -217,10 +228,12 @@ const themeConfigCpt = computed(() => {
     if (v.isMain == 1) {
       state.chartData.layout = v.chartLayout
       res.main = {
+        type: v.type,
         indexTableName: v.indexTableName,
+        indexId: v.indexId,
         indexStyle: v.indexStyle ? JSON.parse(v.indexStyle) : '',
         searchParam: getSearchParam(v),
-        tableHead: getTableHead(v)
+        tableHead: getTableHead(v),
       }
       res.chart.nodes.unshift({
         id: String(v.id),
@@ -228,9 +241,11 @@ const themeConfigCpt = computed(() => {
         weight: v.weight || 100,
         num: 0,
         name: v.indexNameShort,
+        type: v.type,
         indexTableName: v.indexTableName,
+        indexId: v.indexId,
         searchParam: getSearchParam(v),
-        tableHead: getTableHead(v)
+        tableHead: getTableHead(v),
       })
     } else if (v.relateIndexId) {
       res.chart.nodes.push({
@@ -239,17 +254,21 @@ const themeConfigCpt = computed(() => {
         weight: v.weight,
         num: 0,
         name: v.indexNameShort,
+        type: v.type,
         indexTableName: v.indexTableName,
+        indexId: v.indexId,
         searchParam: getSearchParam(v),
-        tableHead: getTableHead(v)
+        tableHead: getTableHead(v),
       })
       res.chart.edges.push({source: String(v.relateIndexId), target: String(v.id), labelText: v.description || '关系描述'})
     } else {
       res.tabs.set(v.indexTableName, {
+        type: v.type,
         indexName: v.indexName,
         indexTableName: v.indexTableName,
+        indexId: v.indexId,
         searchParam: getSearchParam(v),
-        tableHead: getTableHead(v)
+        tableHead: getTableHead(v),
       })
     }
   })
@@ -509,7 +528,12 @@ const initWS = () => {
                 const obj = {
                   edges: [...themeConfigCpt.value.chart.edges],
                   nodes: themeConfigCpt.value.chart.nodes.map(v => {
-                    v.num = json.datas.filter(s => s.indexCode === v.indexTableName)?.[0].data || 0
+                    console.log(v)
+                    if (v.type === 'inner_index') {
+                      v.num = json.datas.filter(s => s.indexCode === v.indexTableName)?.[0]?.data || 0
+                    } else {
+                      v.num = json.datas.filter(s => s.serviceId === v.indexId)?.[0]?.data || 0
+                    }
                     return v
                   })
                 }

src/views/web/list/index.vue

@@ -303,13 +303,13 @@ const currentIndexCpt = computed(() => {
   return JSON.parse(JSON.stringify(obj))
 })
 const tableConfigCpt = computed(() => {
-  const listConfig = []
-  const cardConfig = []
+  const listConfig: any = []
+  const cardConfig: any = []
   let cardMain = {}
   let cardImg = {}
-  const detailConfig = []
+  const detailConfig: any = []
   state.resultParams.indexConfig?.sysIndexFields?.forEach(v => {
-    const obj = {key: v.fieldName, value: v.fieldKey, col: v.labelLength, isImg: v.pictureField == 1}
+    const obj = {key: v.fieldNameCn, value: v.fieldNameEn, col: v.labelLength, isImg: v.pictureField == 1}
     detailConfig.push(obj)
     if (v.searchShow == 1) {
       listConfig.push(obj)