0228xx版本管理

src/api/sys/version.ts

@@ -6,6 +6,8 @@ enum Api {
     DelVersion = '/base-center/resourcesversion/deleteVersion',
     GetDVersionNextRes = '/base-center/resourcesversion/getDVersionNextRes',
 
+    GetDVLSersion = '/base-center/resourcesversion/getDVLSersion',
+
     GetResVersion = '/base-center/resourcesversion/getResVersion',
     SaveResVersion = '/base-center/resourcesversion/saveResVersion',
     RemoveResVersion = '/base-center/resourcesversion/removeResVersion',
@@ -32,6 +34,25 @@ export const getVersionList = (params: any) => {
         })
     })
 };
+/**
+ * @description: 获取某个版本的历史版本
+ * @param page string 页码
+ * @param rows string 每页大小
+ * @param versionNanme string 版本名称
+ * @param keyStr string 关键字
+ */
+export const getVersionHistoryList = (params: any) => {
+    let param = {
+        page:1,
+        rows:1000000,
+        ...params
+    }
+    return new Promise<void>((resolve) => {
+        defHttp.post({url: Api.GetDVLSersion, params: param }).then((res) => {
+            resolve(res)
+        })
+    })
+};
 
 /**
  * @description: 保存版本

src/api/system/system.ts

@@ -198,7 +198,7 @@ export const SaveOrUpdateUserInfo = (params) => {
   const formData = new FormData();
   Object.keys(params).forEach((key) => formData.append(key, params[key]))
   return new Promise<void>((resolve, reject) => {
-    defHttp.post({ url: Api.BaseUserUrl, params: formData }).then((res) => resolve(res.datas))
+    defHttp.post({ url: Api.BaseUserUrl, params: formData }).then((res) => resolve(res))
   })
 }
 /**

src/views/dataAdmin/dataAdmin/version/VersionHistoryListModal.vue

@@ -0,0 +1,130 @@
+<!-- 版本的历史版本弹窗 -->
+<template>
+    <BasicModal :maskClosable="false" :width="1430" @register="registerModal" v-bind="$attrs" :title="title" centered
+        wrapClassName="history-res-modal" :footer="null">
+        <BasicTable @register="registerTable">
+            <template #action="{ record }">
+                <TableAction :actions="[
+                    {
+                        label: '查看',
+                        tooltip: '查看',
+                        onClick: handleLook.bind(null, record),
+                    }
+                ]" />
+            </template>
+        </BasicTable>
+    </BasicModal>
+</template>
+<script>
+import { defineComponent, reactive, ref, onMounted, watch, computed } from 'vue';
+import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+// 导入表格组件，表格事件
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { message } from 'ant-design-vue';
+import { getVersionHistoryList } from '/@/api/sys/version';
+
+export default defineComponent({
+    components: { BasicModal, BasicTable, TableAction },
+    setup(_, { emit }) {
+        const title = ref('');
+        const currentVersion = ref('');
+        const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+            title.value = `【${data.data.VERSION_NAME}】历史版本`
+            currentVersion.value = data.data.VERSION_NAME
+            reload();
+        });
+
+        const getHisData = () => {
+            return new Promise((resolve, reject) => {
+                let params = {
+                    versionNanme: currentVersion.value
+                }
+                getVersionHistoryList(params).then(res => {
+                    if (res.resp_code === 0 && res.datas) {
+                        let resData = res.datas.pageData;
+                        resolve(resData)
+                    } else {
+                        resolve([])
+                        message.error(res.resp_msg)
+                    }
+                })
+            })
+        }
+        //表格列
+        const columns = [
+            {
+                title: '版本名称',
+                align: 'center',
+                dataIndex: 'VERSION_NAME',
+                key: 'VERSION_NAME'
+            },
+            {
+                title: '版本号',
+                align: 'center',
+                dataIndex: 'VERSION_NO',
+                key: 'VERSION_NO'
+            },
+            {
+                title: '备注',
+                align: 'center',
+                dataIndex: 'VERSION_DISP',
+                key: 'VERSION_DISP'
+            },
+            {
+                title: '创建时间',
+                align: 'center',
+                dataIndex: 'CREATE_DATE',
+                key: 'CREATE_DATE'
+            },
+            {
+                title: '创建人',
+                align: 'center',
+                dataIndex: 'CREATENAME',
+                key: 'CREATENAME'
+            },
+            {
+                title: '修改时间',
+                align: 'center',
+                dataIndex: 'MODIFY_DATE',
+                key: 'MODIFY_DATE'
+            }
+        ];
+        const [registerTable, { reload }] = useTable({
+            title: '历史版本列表',
+            api: getHisData, //加载数据
+            columns: columns,
+            useSearchForm: false,     //开启搜索区域
+            bordered: false,
+            showTableSetting: true,  // 显示表格设置
+            tableSetting: {
+                redo: true,
+                size: true,
+                setting: false,
+                fullScreen: false
+            },
+            actionColumn: {
+                width: 100,
+                title: '操作',
+                dataIndex: 'action',
+                slots: { customRender: 'action' }
+            },
+            showIndexColumn: true,
+            pagination: {
+                hideOnSinglePage: false
+            },
+            rowKey: (record) => record.FID
+        });
+        const handleLook = (record) => {
+            emit('lookRes', record);
+            closeModal()
+        }
+
+        return {
+            title,
+            registerModal,
+            registerTable,
+            handleLook
+        };
+    },
+});
+</script>

src/views/dataAdmin/dataAdmin/version/index.vue

@@ -39,6 +39,11 @@
                             tooltip: '删除',
                             onClick: handleDel.bind(null, record.FID),
                         },
+                        {
+                            label: '历史版本',
+                            tooltip: '历史版本',
+                            onClick: handleHistory.bind(null, record),
+                        },
                     ]" />
                 </template>
             </BasicTable>
@@ -46,6 +51,7 @@
 
         <VersionManageModal @register="registerModal" @success="onSubmit"></VersionManageModal>
         <VersionResModal @register="registerResModal"></VersionResModal>
+        <VersionHistoryListModal @register="registerHisModal" @lookRes="lookResList"></VersionHistoryListModal>
     </div>
 </template>
 
@@ -58,7 +64,8 @@ import { useModal } from '/@/components/Modal';
 import VersionManageModal from './VersionManageModal.vue';
 // import VersionModal from './VersionModal.vue';
 import VersionResModal from './VersionResModal.vue';
-import { getVersionList, delVersion } from '/@/api/sys/version';
+import VersionHistoryListModal from './VersionHistoryListModal.vue';
+import { getVersionList, delVersion, getVersionHistoryList } from '/@/api/sys/version';
 import { message } from 'ant-design-vue';
 import moment from 'moment'
 import { session } from '/@/utils/Memory';
@@ -66,10 +73,11 @@ import uiTool from '/@/utils/uiTool';
 
 export default defineComponent({
     name: 'version',
-    components: { VersionManageModal, VersionResModal, BasicTable, TableAction, Button },
+    components: { VersionManageModal, VersionResModal, VersionHistoryListModal, BasicTable, TableAction, Button },
     setup() {
         const [registerModal, { openModal }] = useModal();
         const [registerResModal, { openModal: openResModal }] = useModal();
+        const [registerHisModal, { openModal: openHisModal }] = useModal();
         const data = reactive({
             searchValue: "",//查询值
         });
@@ -175,7 +183,7 @@ export default defineComponent({
                 delVersion(param).then(res => {
                     if (res.resp_code === 0) {
                         // message.success('操作成功');
-                        if(res.datas.error.length){
+                        if (res.datas.error.length) {
                             message.error(res.datas.error[0].msg);
                             return;
                         }
@@ -196,8 +204,8 @@ export default defineComponent({
                 delVersion(param).then(res => {
                     if (res.resp_code === 0) {
                         // message.success('操作成功');
-                        if(res.datas.error.length){
-                            res.datas.error.forEach(err=>{
+                        if (res.datas.error.length) {
+                            res.datas.error.forEach(err => {
                                 message.error(err.msg);
                             })
                         }
@@ -207,6 +215,14 @@ export default defineComponent({
                 })
             }))
         };
+        // 查询历史版本
+        const handleHistory = (record) => {
+            const { VERSION_NAME } = record;
+            openHisModal(true, {
+                data: { VERSION_NAME }
+            });
+            
+        }
         //弹窗确认
         const onSubmit = () => {
             reload();
@@ -233,7 +249,7 @@ export default defineComponent({
             },
             rowKey: (record) => record.FID,
             actionColumn: {
-                width: 200,
+                width: 230,
                 title: '操作',
                 dataIndex: 'action',
                 slots: { customRender: 'action' },
@@ -242,6 +258,9 @@ export default defineComponent({
                 type: 'checkbox',
             },
         });
+        const lookResList = (record)=>{
+            handleLook(record)
+        }
         return {
             columns,
             hasSelected,
@@ -250,6 +269,7 @@ export default defineComponent({
             registerTable,
             registerModal,
             registerResModal,
+            registerHisModal,
             getVersionData,
             searchTable,
             resetTable,
@@ -258,7 +278,9 @@ export default defineComponent({
             handleEdit,
             handleDelAll,
             handleDel,
-            onSubmit
+            handleHistory,
+            onSubmit,
+            lookResList
         };
     },
 });

src/views/interface/item/child/ActionMock.vue

@@ -96,37 +96,7 @@ export default defineComponent({
         })
 
         //获取token相关数据
-        // const formRef = ref(null)
-        // const tokenFormData = reactive({
-        //     client_id: "",
-        //     client_secret: "",
-        //     username: "",
-        //     password: "",
-        //     access_token: ""
-        // })
         const accessToken = ref('')
-        // const rules = {
-        //     client_id: [{
-        //         required: true,
-        //         message: '请输入client_id',
-        //         trigger: 'blur'
-        //     }],
-        //     client_secret: [{
-        //         required: true,
-        //         message: '请输入client_secret',
-        //         trigger: 'blur'
-        //     }],
-        //     username: [{
-        //         required: true,
-        //         message: '请输入账号',
-        //         trigger: 'blur'
-        //     }],
-        //     password: [{
-        //         required: true,
-        //         message: '请输入密码',
-        //         trigger: 'blur'
-        //     }]
-        // };
         const visible = ref(false)
         //请求参数数组
         const reqParams = ref([])
@@ -218,21 +188,23 @@ export default defineComponent({
                     data = JSON.parse(item.paramsValue)
                 }
             })
-            console.log(header);
-            axios({
-                url:reqRealUrl.value,
-                header:header,
-                method:reqMethod.value,
-                params:params,
-                data:data
-            }).then(res=>{
+            let config = {
+                url: reqRealUrl.value,
+                headers: header,
+                method: reqMethod.value,
+                params: params || null,
+                data: data || null
+            }
+            console.log(config)
+            // 发送请求
+            axios(config).then(res=>{
                 console.log(res);
             })
         }
         //初始化请求所需数据
         onMounted(() => {
             reqRealUrl.value = action.value.askUrl;
-            reqMethod.value = action.requestMethod;
+            reqMethod.value = action.value.requestMethod;
             queryParams.value = action.value.queryParams;
             queryParams.value.forEach((item, index) => {
                 item.key = index
@@ -250,13 +222,6 @@ export default defineComponent({
             visible.value = true
             accessToken.value = session.getItem('tokenSpace')
         }
-        // 获取token提交
-        // const getTokenSubmit = () => {
-        //     formRef.value.validate().then(() => {
-        //         message.info('获取token');
-        //         visible.value = false;
-        //     })
-        // }
         //关闭获取token弹窗
         const closeGetToken = () => {
             visible.value = false;

src/views/interface/item/child/Details.vue

@@ -5,10 +5,10 @@
         <div class="detail-item">
             <div class="item-header">
                 <div class="title">基本信息</div>
-                <div class="btns">
+                <!-- <div class="btns">
                     <div class="btn" @click="openActionRemark">调试说明</div>
                     <div id="interfaceShow" class="btn" @click="openActionMock">在线调试</div>
-                </div>
+                </div> -->
             </div>
             <div class="item-body">
                 <div class="des" v-for="(item, index) of baseData" :key="index">
@@ -254,9 +254,9 @@ export default defineComponent({
 </script>
 
 <style lang="less" scoped>
-#interfaceShow {
-    display: none;
-}
+// #interfaceShow {
+//     display: none;
+// }
 
 .assembly-detail {
     .detail-item {