Merge branch 'main' of http://192.168.2.241:3000/sujunling/xld-gis-admin

README.md

@@ -179,4 +179,6 @@ yarn build
 备份：
 路由：/resource/library
 权限：resource:library
-组件：/resource/library/index
+组件：/resource/library/index
+
+git remote set-url origin <http://192.168.2.241:3000/sujunling/xld-gis-admin.git>

src/api/dataAdmin/assembly.ts

@@ -42,6 +42,31 @@ export function list(text) {
     })
 }
 
+/**
+ * @description:获取审核通过的组件
+ */
+export function listApproved(text) {
+    const formData = new FormData();
+    var str = '';
+    if (text && text.key) {
+        str = `{ 'type': 'SR', 'servicetype': 'WidgetService',text:'${text.key}' }`
+    } else {
+        // str = `{ 'type': 'SR', 'servicetype': 'WidgetService','status':'1'}`
+        str = `{ 'type': 'SR', 'servicetype': 'WidgetService'}`
+    }
+    formData.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
+    formData.append("methodName", "getResourceList");
+    formData.append("args[]", session.getItem('tokenV2'));
+    formData.append("args[]", str);
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.CallProvider, params: formData, ...interfaceType })
+            .then((r) => {
+                var e = r.result ? JSON.parse(r.result) : [];
+                resolve(e);
+            })
+    })
+}
+
 
 /**
  * @description:获取资源类型字典

src/api/resource/files.ts

@@ -28,6 +28,7 @@ export function list() {
         defHttp.post({ url: Api.Login, params: formData, ...interfaceType })
             .then((r) => {
                 let result = r.result === '' ? {} : JSON.parse(r.result)
+                console.log("文件资源上传列表:", result)
                 resolve(result);
             })
     })
@@ -59,7 +60,7 @@ export function listPage(param) {
  * @param:userid     用户id
  * @param:parentId   文件夹id      
  */
- export function getFileUrl(param) {
+export function getFileUrl(param) {
     return new Promise<void>((resolve, reject) => {
         try {
             defHttp.post({

src/views/assembly/index.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="ztree-container">
         <p v-for="(i, k, index) in assemblyType" :key="index" @click="scrollToSection(k, index)"
-          :class="[`${action == index ? 'action' : ''}`]">{{ k }}({{ i && i.length }})</p>
+          :class="[`${action == index ? 'action' : ''}`]">{{ k }}({{ i && i.length || 0 }})</p>
       </div>
     </div>
     <div class="datacenter-right">
@@ -19,7 +19,7 @@
 import { defineComponent, ref, watch } from 'vue';
 import AssemblyData from './item/AssemblyData.vue';
 import { onMounted } from 'vue';
-import { list, deleteService } from '/@/api/dataAdmin/assembly';
+import { list, deleteService, listApproved } from '/@/api/dataAdmin/assembly';
 
 
 const prefixCls = 'account-center-bottom'
@@ -52,7 +52,7 @@ export default defineComponent({
     })
 
     function getDataList(key) {
-      list(key).then(res => {
+      listApproved(key).then(res => {
         if (res && res.length) {
           var list = [];
           res.map(i => {

src/views/assembly/item/AssemblyData.vue

@@ -18,7 +18,7 @@
 
         <div v-for="(j, key, index) in list" :sjl="key" v-show="(actionName == key || !actionName)" :key="index"
           style="clear: both;">
-          <p class="itemName" :id="key">{{ key }}</p>
+          <p class="itemName" :id="key" v-if="j && j.length">{{ key }}</p>
           <div v-for="(i, n) in j" :key="n" class="item">
             <div><img :src="i.url" srcset=""></div>
             <b>{{ i.servicename }}</b>

src/views/dataAdmin/assembly/SourceDetail.vue

@@ -29,6 +29,15 @@
               <a-textarea v-model:value="formState.description" :rows="2" />
             </a-form-item>
           </a-col>
+          <a-col :span="9" class="form-col">
+            <a-form-item ref="servicetype" label="适合申请流程" name="servicetype" class="label-form-item">
+              <a-select v-model:value="formState.servicetype">
+                <template v-for="(tag, index) in assemblyType" :key="index">
+                  <a-select-option :value="tag.value">{{ tag.value }}</a-select-option>
+                </template>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :span="9" class="form-col">
             <a-form-item ref="servicetype" label="资源类型" name="servicetype" class="label-form-item">
               <a-select v-model:value="formState.servicetype">
@@ -43,7 +52,7 @@
               <a-input v-model:value="formState.publiccurl" />
             </a-form-item>
           </a-col> -->
-          <a-col :span="9" class="form-col">
+          <a-col :span="6" class="form-col">
             <a-form-item ref="thumbnail" label="缩略图" name="thumbnail" class="label-form-item">
               <a-upload :custom-request="customUpload" v-model:file-list="fileList">
                 <a-button style="background-color: #0671dd; color: #fff; border-radius: 4px">

src/views/dataAdmin/assembly/index.vue

@@ -36,7 +36,7 @@
             // ifShow: record.servicealiasname,
             // ifShow: ((action) => action.servicealiasname),
             ifShow: record.servicealiasname,
-            onClick: see.bind(null, record),
+            onClick: sendApprove.bind(null, record),
           },
         ]" :drop-down-actions="[
   {
@@ -65,10 +65,17 @@
         </Tag>
       </template>
       <template #status="{ record }">
-        <Tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : ''};`">
+        <Tag :style="`color:${record.status === 3 || record.status === 3 ? 'red' : '#05B069'};`">
           {{
-            record.status === 0 ? '待审核' : (record.status === 1 ? '审核通过' : (record.status === 2 ? '审核不通过' : (record.status
-              === 3 ? '被驳回' : '未提交')))
+            record.status === 0
+            ? '待审核'
+            : record.status === 1
+              ? '审核通过'
+              : record.status === 2
+                ? '审核不通过'
+                : record.status === 3
+                  ? '被驳回'
+                  : '未提交'
           }}
         </Tag>
       </template>
@@ -90,9 +97,11 @@ import { RoleEnum } from '/@/enums/roleEnum';
 import { Authority } from '/@/components/Authority';
 import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { Switch, Popconfirm } from 'ant-design-vue';
+import { Switch, Popconfirm, message } from 'ant-design-vue';
 import { list, deleteService } from '/@/api/dataAdmin/assembly';
 import Moment from 'moment'
+//提交授权申请
+import { queryFlowInfoPage, submitExamine } from '/@/api/resource/examine';
 
 export default defineComponent({
   name: 'RoleManagement',
@@ -212,7 +221,52 @@ export default defineComponent({
 
     })
 
+    function sendApprove(e) {
+      console.log(e)
+      queryFlowInfoPage({
+        page: 1,
+        rows: 1000000
+      }).then(flowRes => {
+        console.log("flowRes:", flowRes)
+        if (flowRes && flowRes.length) {
+          var flow = flowRes.filter(i => i.FLOWNAME === '组件资源上传');
+          if (flow.length) {
+            // const rowKeys = getSelectRowKeys();
+            // let ids = rowKeys.toString();
+            // // console.log(flowRes);
+            // let flag = 0
+            // flowRes.forEach(item => {
+            //   if (item.FLOWNAME === judgeType(ids)) {
+            //     flag = 1
+            //     let params = {
+            //       bussInfo: {
+            //         bussname: judgeType(ids),//业务名称
+            //         flowid: flow[0].id,//流程id
+            //         serverids: ids//资源id
+            //       }
+            //     }
+            //     submitExamine(params).then(res => {
+            //       if (res.resp_code === 0 && res.resp_msg === '新增成功') {
+            //         message.success('申请成功')
+            //         reload();
+            //       } else {
+            //         message.error('申请失败')
+            //       }
+            //     })
+            //   }
+            // })
+            // clearSelectedRowKeys();
+            // !flag && message.info('没有对应流程，请联系管理员');
+          }
+        }
+
+
+
+      })
+    }
+
     return {
+      sendApprove,
       moment,
       createMessage,
       registerTable,

src/views/dataAdmin/assembly/map.data.ts

@@ -117,11 +117,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'source',
     width: 160,
   },
-  {
-    title: '预览图',
-    dataIndex: 'publiccurl',
-    width: 160,
-  },
+  // {
+  //   title: '预览图',
+  //   dataIndex: 'publiccurl',
+  //   width: 160,
+  // },
   {
     title: '资源标签',
     dataIndex: 'typename',

test.js

@@ -0,0 +1,61 @@
+[
+    {
+        "type": "DR",
+        "servicebase": {
+            "mapingurl_show": "2643076bbfef2a5808efb4aae07a45a8",
+            "mapingurl": "2643076bbfef2a5808efb4aae07a45a8",
+            "fileId": "2643076bbfef2a5808efb4aae07a45a8",
+            "format": "jpeg",
+            "servicename": "1clouds",
+            "servicealiasname": "111111",
+            "fileListUrls": "2643076bbfef2a5808efb4aae07a45a8",
+            "thumbnail": "",
+            "workSpace": "",
+            "publisher": "系统管理员",
+            "username": "系统管理员",
+            "userid": "27AF004A-8BDN-885T-30FU-89DE3388762B",
+            "servicetype": "OGCWMTSMap",
+            "keywords": "TDGL", "serviceversion": "111", "description": "11",
+            "keepingunit": "8627E0A1DD4D7737E053550312ACFC1A",
+            "rboffice": "8627E0A1DD577737E053550312ACFC1A",
+            "crs": "2000坐标系4490",
+            "dataScope": "11",
+            "source": "11",
+            "epsgCode": "4490",
+            "shsqlc": "mr",
+            "runtimestatus": "0",
+            "ispublic": "0",
+            "searched": "0",
+            "isShow": "0",
+            "isnew": "0"
+        },
+        "metadata": {
+            "name": "1clouds",
+            "mapingurl_show": "2643076bbfef2a5808efb4aae07a45a8",
+            "mapingurl": "2643076bbfef2a5808efb4aae07a45a8",
+            "fileId": "2643076bbfef2a5808efb4aae07a45a8",
+            "format": "jpeg",
+            "servicename": "1clouds",
+            "servicealiasname": "111111",
+            "fileListUrls": "2643076bbfef2a5808efb4aae07a45a8",
+            "thumbnail": "", "workSpace": "",
+            "publisher": "系统管理员",
+            "username": "系统管理员",
+            "userid": "27AF004A-8BDN-885T-30FU-89DE3388762B",
+            "servicetype": "OGCWMTSMap",
+            "keywords": "TDGL",
+            "serviceversion": "111",
+            "description": "11",
+            "keepingunit": "8627E0A1DD4D7737E053550312ACFC1A",
+            "rboffice": "8627E0A1DD577737E053550312ACFC1A",
+            "crs": "2000坐标系4490",
+            "dataScope": "11", "source": "11",
+            "epsgCode": "4490",
+            "shsqlc": "mr",
+            "runtimestatus": "0",
+            "ispublic": "0",
+            "searched": "0",
+            "isShow": "0",
+            "isnew": "0"
+        }
+    }]