修改

src/router/index.js

@@ -30,7 +30,7 @@ const router = createRouter({
           meta: { menuId: 'data_sqgl' },
         },
         {
-          path: 'warrantManageDataDetail/:type/:id',
+          path: 'warrantManageDataDetail/:type/:id/:id2',
           name: 'WarrantManageDataDetail',
           component: () => import('../views/warrantManage/Detail.vue'),
           meta: { menuId: 'data_sqgl' },

src/service/servicePublish.js

@@ -55,3 +55,18 @@ export function ServicePublishStop(id, tDataItem) {
         data: { id, tDataItem }
     })
 }
+export function ServiceList(page,limit,quickSearch) {
+    return request({
+        url: '/service/dataService/listForSelect',
+        method: "post",
+        data: {page,limit,quickSearch }
+    })
+}
+//资源信息
+export function resourceDetail(id) {
+    return request({
+        url: '/service/dataResource/resourceById',
+        method: "post",
+        data: {id }
+    })
+}

src/service/warrantManage.js

@@ -2,7 +2,7 @@ import request from "./index2";
 //列表查询
 export function WarrantManageList(page,limit,quickSearch) {
     return request({
-        url: 'service/tApiApplication/listForAudit',
+        url: 'service/dataApplication/listForAudit',
         method: "post",
         data: {page,limit,quickSearch }
     })
@@ -28,7 +28,7 @@ export function AuditDetail(id) {
     return request({
         url: '/service/dataAudit/detailForApplication',
         method: "post",
-        data: { id }
+        data: {id }
     })
 }
 //审核信息保存

src/views/servicePublish/Detail.vue

@@ -21,7 +21,9 @@
             <el-input v-model="form.basicInfo.serviceName" placeholder="请输入内容" clearable></el-input>
           </el-form-item>
           <el-form-item label="资源名称" prop="resourceId">
-            <el-input v-model="form.basicInfo.resourceId" placeholder="请输入内容" clearable></el-input>
+            <el-select v-model="form.basicInfo.resourceId" placeholder="请选择" clearable>
+              <el-option v-for="item in select_resource" :key="item.id" :label="item.tresourceName" :value="item.id"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="服务类型" prop="serviceType">
             <el-select v-model="form.basicInfo.serviceType" placeholder="请选择" clearable>
@@ -34,7 +36,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="发布方式" prop="publishingMode" class="item-row">
-            <el-radio-group v-model="form.basicInfo.publishingMode" @click="showPictureWay(item)">
+            <el-radio-group v-model="form.basicInfo.publishingMode" @change="showPictureWay(form.basicInfo.publishingMode)">
               <el-radio :label="0">在线发布</el-radio>
               <el-radio :label="1">服务注册</el-radio>
             </el-radio-group>
@@ -77,7 +79,7 @@
 import { reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import {onBeforeMount} from "@vue/runtime-core";
-import {ServicePublishAdd, ServicePublishDetail, ServicePublishEdit} from "../../service/servicePublish";
+import {ServiceList, ServicePublishAdd, ServicePublishDetail, ServicePublishEdit} from "../../service/servicePublish";
 import {ElMessage} from "element-plus";
 import createEnum from "../../utils/data/create-enum";
 
@@ -85,8 +87,6 @@ const route = useRoute()
 const router = useRouter()
 
 
-
-
 const uploadState = reactive({
     uploadUrl: 'http://10.81.74.131:8089/data-asset-manage-service/upload/imgUpload',
     headers: { Authorization: "Bearer " },
@@ -147,12 +147,12 @@ const formRules = reactive({
 const showDetail = ref(false)
 const showDetail2 = ref(false)
 function showPictureWay(val) {
-  if (form.basicInfo.publishingMode === 1) {
+  if (val === 0) {
     showDetail.value = false;
     showDetail2.value = true;
   }
-  if (form.basicInfo.publishingMode === 0)
-    {
+  if (val === 1)
+  {
     showDetail.value = true;
     showDetail2.value = false;
   }
@@ -203,6 +203,10 @@ function handleSave() {
   })
 }
 
+const currentPage = ref(1)
+const pageSize = ref(10)
+const quickSearch = ref("{\"serviceName\":\"\"}")
+const select_resource = ref([])
 onBeforeMount(()=> {
   if(route.params.type!=='add') {
     ServicePublishDetail(route.params.id).then(res => {
@@ -218,8 +222,14 @@ onBeforeMount(()=> {
       } else {
           ElMessage({type:'error', message: '查询失败'})
       }
+      showPictureWay(form.basicInfo.publishingMode)
     })
   }
+  ServiceList(currentPage.value, pageSize.value, quickSearch.value).then(res => {
+    if (res.code === 200) {
+      select_resource.value = res.data.records;
+    }
+  })
 })
 </script>
 

src/views/warrantManage/Detail.vue

@@ -20,14 +20,14 @@
           <el-form-item label="服务名称" prop="serviceName">
             <el-input v-model="form.serviceInfo.serviceName" clearable></el-input>
           </el-form-item>
-          <el-form-item label="资源名称" prop="resName">
-            <el-input v-model="form.serviceInfo.resName" clearable></el-input>
+          <el-form-item label="资源名称" prop="tresourceName">
+            <el-input v-model="form.serviceInfo.tresourceName" clearable></el-input>
           </el-form-item>
             <el-form-item label="服务类型" prop="serviceTypeName">
               <el-input v-model="form.serviceInfo.serviceTypeName" clearable></el-input>
             </el-form-item>
-            <el-form-item label="权限类型" prop="permissionType">
-              <el-input v-model="form.serviceInfo.permissionType" clearable></el-input>
+            <el-form-item label="权限类型" prop="permissionTypeName">
+              <el-input v-model="form.serviceInfo.permissionTypeName" clearable></el-input>
             </el-form-item>
           <el-form-item label="发布方式" prop="publishingMode" class="item-row">
             <el-radio-group v-model="form.serviceInfo.publishingMode">
@@ -42,14 +42,14 @@
         <span class="detail-part-title">发布信息</span>
 <!--        // 接口没调-->
         <el-form :model="form.publishInfo" label-position="top" ref="publishInfo" class="form-detail" disabled>
-          <el-form-item label="发布人" prop="proposerId">
-            <el-input v-model="form.publishInfo.proposerId"></el-input>
+          <el-form-item label="发布人" prop="servicePublishUser">
+            <el-input v-model="form.publishInfo.servicePublishUser"></el-input>
           </el-form-item>
           <el-form-item label="所属单位" prop="unitName">
             <el-input v-model="form.publishInfo.unitName"></el-input>
           </el-form-item>
-          <el-form-item label="发布时间" prop="publishTime">
-            <el-input v-model="form.publishInfo.publishTime"></el-input>
+          <el-form-item label="发布时间" prop="servicePublishTime">
+            <el-input v-model="form.publishInfo.servicePublishTime"></el-input>
           </el-form-item>
         </el-form>
         <span class="detail-part-title">申请信息</span>
@@ -107,6 +107,7 @@ import { useRoute, useRouter } from 'vue-router'
 import {onBeforeMount} from "@vue/runtime-core";
 import {ElMessage} from "element-plus";
 import {ApplicationDetail, AuditDetail, AuditSave, ServiceManageDetail} from "../../service/warrantManage";
+import {resourceDetail} from "../../service/servicePublish";
 
 const route = useRoute()
 const router = useRouter()
@@ -178,10 +179,12 @@ onBeforeMount(()=> {
         const data = res.data
         form.serviceInfo.serviceName = data.serviceName
         form.serviceInfo.accessIp = data.accessIp
-        form.serviceInfo.resourceId = data.resourceId   // 去循环这个id  匹配到中文
+        form.serviceInfo.resourceId = data.resourceId
         form.serviceInfo.serviceType = data.serviceType
-        form.serviceInfo.permissionType = data.permissionType // 去循环这个id  匹配到中文
-        form.serviceInfo.publishingMode = data.publishingMode // 去循环这个id  匹配到中文
+        form.serviceInfo.permissionType = data.permissionType
+        form.serviceInfo.publishingMode = data.publishingMode
+        form.publishInfo.servicePublishUser = data.servicePublishUser
+        form.publishInfo.servicePublishTime = data.servicePublishTime
         form.serviceInfo.serviceDescribe = data.serviceDescribe
         switch (data.serviceType) {
           case 0:
@@ -197,9 +200,30 @@ onBeforeMount(()=> {
             form.serviceInfo.serviceTypeName = '动态服务'
             break
         }
+        switch (data.permissionType) {
+          case 0:
+            form.serviceInfo.permissionTypeName = '自由服务'
+            break
+          case 1:
+            form.serviceInfo.permissionTypeName = '安全服务'
+            break
+
+        }
+        resourceDetail(data.resourceId).then(res => {
+          form.serviceInfo.tresourceName = res.data.tresourceName
+          form.serviceInfo.tresourceType = res.data.tresourceType
+          switch (data.tresourceType) {
+            case '0':
+              form.serviceInfo.resourceTypeName = '资源编目'
+              break
+            case '1':
+              form.serviceInfo.resourceTypeName = '专题目录'
+              break
+          }
+
+        })
         ApplicationDetail(data.id).then(res => {
           console.log(res)
-          // 字段对应不上
           form.applyInfo.accessIp = res.data.accessIp  // xx
           form.applyInfo.serviceLife = res.data.serviceLife
           form.applyInfo.dailyVisits = res.data.dailyVisits
@@ -209,17 +233,16 @@ onBeforeMount(()=> {
           form.applyInfo.applicationTime = res.data.applicationTime
           form.applyInfo.applicationReason = res.data.applicationReason
         })
-        AuditDetail(data.id).then(res => {
-          // console.log(res)  //kongde
-          form.CheckInfo.auditorId = res.data.auditorId
-          form.CheckInfo.auditorTime = res.data.auditorTime
-          form.CheckInfo.auditReason = res.data.auditReason
-          console.log(form)
-        })
       } else {
         ElMessage({type:'error', message: '查询失败'})
       }
     })
+    AuditDetail(route.params.id2).then(res => {
+      form.CheckInfo.auditorId = res.data.auditorId
+      form.CheckInfo.auditorTime = res.data.auditorTime
+      form.CheckInfo.auditReason = res.data.auditReason
+      console.log(form)
+    })
   }
 })
 

src/views/warrantManage/Index.vue

@@ -6,7 +6,7 @@
         <el-table-column type="index" :index="indexCreate" label="序号" min-width="50"/>
         <el-table-column label="服务名称" min-width="100" prop="serviceName" show-overflow-tooltip/>
         <el-table-column label="服务类型" min-width="100" prop="serviceTypeName" show-overflow-tooltip/>
-        <el-table-column label="资源名称" min-width="100" prop="resourceId" show-overflow-tooltip/>
+        <el-table-column label="资源名称" min-width="100" prop="tresourceName" show-overflow-tooltip/>
         <el-table-column label="资源类别" min-width="100" prop="resourceTypeName" show-overflow-tooltip/>
         <el-table-column label="服务状态" min-width="100">
           <template #default="scope">
@@ -41,7 +41,7 @@ import { reactive, ref, onMounted } from 'vue'
 import ListHeader from '../../components/ListHeader.vue';
 import { useRouter, useRoute  } from 'vue-router'
 import Pagination from '../../components/Pagination.vue';
-import {ServiceManageDetail, WarrantManageList} from "../../service/warrantManage";
+import {WarrantManageList} from "../../service/warrantManage";
 
 onMounted(() => {
   let tableH = document.getElementById('table-list').getElementsByClassName('el-table__body-wrapper')[0].clientHeight
@@ -83,38 +83,29 @@ function getData(page, size) {
           data.applicationStatusName = '过期'
           break
       }
-      ServiceManageDetail(data.id).then(res => {
-        data.serviceName = res.data.serviceName
-        data.serviceType = res.data.serviceType
-        data.resourceType = res.data.resourceType
-        data.resourceName = res.data.resourceName
-        data.resourceId = res.data.resourceId
-        // data.servicePublishUserName = res.data.servicePublishUserName
-        // data.servicePublishTime = res.data.servicePublishTime
-        switch (data.serviceType) {
-          case 0:
-            data.serviceTypeName = '栅格切片'
-            break
-          case 1:
-            data.serviceTypeName = '三维服务'
-            break
-          case 2:
-            data.serviceTypeName = '要素服务'
-            break
-          case 3:
-            data.serviceTypeName = '动态服务'
-            break
-        }
-        switch (data.resourceType) {
-          case '0':
-            data.resourceTypeName = '资源编目'
-            break
-          case '1':
-            data.resourceTypeName = '专题目录'
-            break
-
-        }
-      })
+      switch (data.tresourceType) {
+        case '0':
+          data.resourceTypeName = '资源编目'
+          break
+        case '1':
+          data.resourceTypeName = '专题目录'
+          break
+
+      }
+      switch (data.serviceType) {
+        case 0:
+          data.serviceTypeName = '栅格切片'
+          break
+        case 1:
+          data.serviceTypeName = '三维服务'
+          break
+        case 2:
+          data.serviceTypeName = '要素服务'
+          break
+        case 3:
+          data.serviceTypeName = '动态服务'
+          break
+      }
     }
   })
 }
@@ -130,7 +121,8 @@ function toDetail(row) {
     name: 'WarrantManageDataDetail',
     params: {
       type: 'Detail',
-      id: row.id
+      id: row.dataServiceId,
+      id2: row.id
     }
   })
 }
@@ -140,7 +132,8 @@ function toCheck(row) {
     name: 'WarrantManageDataDetail',
     params: {
       type: 'Check',
-      id: row.id
+      id: row.dataServiceId,
+      id2: row.id
     }
   })
 }