资源查看的修改

src/api/sys/tag.ts

@@ -17,8 +17,14 @@ const locationType = { apiUrl2: true };
  * @param: 1:用户登录tokenV2
  */
 export const getAllTags = (params: any) => {
+    let param = {
+        2: 1,
+        3: 999999999,
+        4: JSON.stringify({}),
+        ...params
+    }
     return new Promise<void>((resolve) => {
-        defHttp.post({ ...locationType, url: Api.FindPageInfoByJson, params: params }, { joinParamsToUrl: true }).then((res) => {
+        defHttp.post({ ...locationType, url: Api.FindPageInfoByJson, params: param }, { joinParamsToUrl: true }).then((res) => {
             resolve(res)
         })
     })

src/views/dataAdmin/dataAdmin/resVersion/ResDetailModal.vue

@@ -283,22 +283,22 @@ export default defineComponent({
                 1: session.getItem('tokenV2')
             }
             let allTags = await getAllTags(param)
-            if (allTags.status === '0' && allTags.result) {
+            if (allTags.status === '0') {
                 let allTagArr = JSON.parse(allTags.result)
                 let keepingUnitObj = {}
                 let rbOfficeObj = {}
                 let secretLevelObj = {}
                 let epsgCodeObj = {}
                 let serviceTagsObj = {}
-                allTagArr.forEach(item => {
+                allTagArr.items.forEach(item => {
                     //管理部门
-                    item.type === '管理部门' && (keepingUnitObj[item.code] = item.name)
+                    item.type === '管理部门' && (keepingUnitObj[item.codeName] = item.name)
                     //责任科室
-                    item.type === '责任科室' && (rbOfficeObj[item.code] = item.name)
+                    item.type === '责任科室' && (rbOfficeObj[item.codeName] = item.name)
                     //密级
-                    item.type === '密级' && (secretLevelObj[item.code] = item.name)
+                    item.type === '密级' && (secretLevelObj[item.codeName] = item.name)
                     //EPSG code
-                    item.type === 'EPSG code' && (epsgCodeObj[item.code] = item.name)
+                    item.type === 'EPSG code' && (epsgCodeObj[item.codeName] = item.name)
                     //资源标签
                     serviceTagsObj[item.code] = item.name
                     if (metaInfo.value.keywords) {
@@ -310,6 +310,7 @@ export default defineComponent({
                         metaInfo.value.serviceTags = resStr.slice(0, -1)
                     }
                 })
+                console.log(allTagArr)
                 metaInfo.value.keepingunit = keepingUnitObj[metaInfo.value.keepingunit]
                 metaInfo.value.rboffice = rbOfficeObj[metaInfo.value.rboffice]
                 metaInfo.value.secretlevel = secretLevelObj[metaInfo.value.secretlevel]

src/views/dataAdmin/dataAdmin/version/ResDetailModal.vue

@@ -283,22 +283,22 @@ export default defineComponent({
                 1: session.getItem('tokenV2')
             }
             let allTags = await getAllTags(param)
-            if (allTags.status === '0' && allTags.result) {
+            if (allTags.status === '0') {
                 let allTagArr = JSON.parse(allTags.result)
                 let keepingUnitObj = {}
                 let rbOfficeObj = {}
                 let secretLevelObj = {}
                 let epsgCodeObj = {}
                 let serviceTagsObj = {}
-                allTagArr.forEach(item => {
+                allTagArr.items.forEach(item => {
                     //管理部门
-                    item.type === '管理部门' && (keepingUnitObj[item.code] = item.name)
+                    item.type === '管理部门' && (keepingUnitObj[item.codeName] = item.name)
                     //责任科室
-                    item.type === '责任科室' && (rbOfficeObj[item.code] = item.name)
+                    item.type === '责任科室' && (rbOfficeObj[item.codeName] = item.name)
                     //密级
-                    item.type === '密级' && (secretLevelObj[item.code] = item.name)
+                    item.type === '密级' && (secretLevelObj[item.codeName] = item.name)
                     //EPSG code
-                    item.type === 'EPSG code' && (epsgCodeObj[item.code] = item.name)
+                    item.type === 'EPSG code' && (epsgCodeObj[item.codeName] = item.name)
                     //资源标签
                     serviceTagsObj[item.code] = item.name
                     if (metaInfo.value.keywords) {

src/views/resource/plat/item/child/DetailModal.vue

@@ -294,22 +294,23 @@ export default defineComponent({
                 1: session.getItem('tokenV2')
             }
             let allTags = await getAllTags(param)
-            if (allTags.status === '0' && allTags.result) {
+            if (allTags.status === '0') {
                 let allTagArr = JSON.parse(allTags.result)
+                console.log(allTagArr)
                 let keepingUnitObj = {}
                 let rbOfficeObj = {}
                 let secretLevelObj = {}
                 let epsgCodeObj = {}
                 let serviceTagsObj = {}
-                allTagArr.forEach(item => {
+                allTagArr.items.forEach(item => {
                     //管理部门
-                    item.type === '管理部门' && (keepingUnitObj[item.code] = item.name)
+                    item.type === '管理部门' && (keepingUnitObj[item.codeName] = item.name)
                     //责任科室
-                    item.type === '责任科室' && (rbOfficeObj[item.code] = item.name)
+                    item.type === '责任科室' && (rbOfficeObj[item.codeName] = item.name)
                     //密级
-                    item.type === '密级' && (secretLevelObj[item.code] = item.name)
+                    item.type === '密级' && (secretLevelObj[item.codeName] = item.name)
                     //EPSG code
-                    item.type === 'EPSG code' && (epsgCodeObj[item.code] = item.name)
+                    item.type === 'EPSG code' && (epsgCodeObj[item.codeName] = item.name)
                     //资源标签
                     serviceTagsObj[item.code] = item.name
                     if (metaInfo.value.keywords) {

src/views/systemAdmin/system/tag/index copy.vue

@@ -151,7 +151,7 @@ export default defineComponent({
                 }
                 getAllTags(param).then(res => {
                     let resData = JSON.parse(res.result)
-                    resData.forEach((item, index) => {
+                    resData.items.forEach((item, index) => {
                         item.time = moment(item.createtime).format('YYYY-MM-DD HH:mm:ss'),
                             item.state = `状态${index + 1}`
                     })