0109xx

src/views/dataAdmin/dataAdmin/resVersion/ResHistoryVersionModal.vue

@@ -48,8 +48,8 @@ export default defineComponent({
         const searchValue = ref('')
         const typeObj = {
             MR: "地图资源",
-            DR: "场景资源",
-            ER: "文件资源",
+            ER: "场景资源",
+            DR: "文件资源",
             SR: "组件服务",
             interface: "接口服务"
         }

src/views/dataAdmin/dataAdmin/resVersion/index.vue

@@ -99,11 +99,11 @@ export default defineComponent({
             },
             {
                 label: '场景资源',
-                value: 'DR'
+                value: 'ER'
             },
             {
                 label: '文件资源',
-                value: 'ER'
+                value: 'DR'
             },
             {
                 label: '组件服务',
@@ -116,8 +116,8 @@ export default defineComponent({
         ]);
         const typeObj = {
             MR: "地图资源",
-            DR: "场景资源",
-            ER: "文件资源",
+            ER: "场景资源",
+            DR: "文件资源",
             SR: "组件服务",
             interface: "接口服务"
         }
@@ -189,6 +189,7 @@ export default defineComponent({
         const searchTable = () => {
             setSelectedRowKeys([])
             reload()
+            setPagination({current:1})
             isgl.value = Boolean(data.searchType)
         }
         //重置
@@ -277,7 +278,7 @@ export default defineComponent({
         }
         const [
             registerTable,
-            { reload, getRowSelection, getSelectRowKeys, setSelectedRowKeys },
+            { reload, getRowSelection, getSelectRowKeys, setSelectedRowKeys, setPagination },
         ] = useTable({
             title: '资源列表', //'菜单列表'
             api: getResData, //加载数据

src/views/dataAdmin/dataAdmin/version/VersionManageModal.vue

@@ -67,12 +67,12 @@ export default defineComponent({
             if (modalStatus.value === 'add') {
                 validate().then(async (res) => {
                     if (res) {
-                        const { addType, version_NAME, version_NAME_1, version_DISP } = JSON.parse(JSON.stringify(res));
+                        const { addType, version_NAME, version_NAME_1, version_DISP } = getFieldsValue();
                         const realName = addType === '1' ? version_NAME_1 : version_NAME;
                         await saveVersion({ version: { version_NAME: realName, version_DISP } }).then((saveRes) => {
                             console.log(saveRes)
                         })
-                        console.log('res', res);
+                        // console.log('res', res);
                         // 关闭弹窗
                         closeModal();
                         // 触发父组件事件
@@ -82,11 +82,11 @@ export default defineComponent({
             } else if (modalStatus.value === 'edit') {
                 validate().then(async (res) => {
                     if (res) {
-                        const { fid, version_NAME, version_DISP } = JSON.parse(JSON.stringify(res));
+                        const { fid, version_NAME, version_DISP } = getFieldsValue();
                         await saveVersion({ version: { fid, version_NAME, version_DISP } }).then((saveRes) => {
                             console.log(saveRes)
                         })
-                        console.log('res', res);
+                        // console.log('res', getFieldsValue());
                         // 关闭弹窗
                         closeModal();
                         // 触发父组件事件

src/views/dataAdmin/dataAdmin/version/VersionResModal.vue

@@ -71,12 +71,12 @@ export default defineComponent({
             },
             {
                 label: '场景资源',
-                value: 'DR',
+                value: 'ER',
                 number: 0
             },
             {
                 label: '文件资源',
-                value: 'ER',
+                value: 'DR',
                 number: 0
             },
             {
@@ -97,15 +97,31 @@ export default defineComponent({
             const { FID, VERSION_NAME, VERSION_NO, VERSION_DISP } = data.form;
             currentFid.value = FID;
             title.value = `【${VERSION_NAME} V${VERSION_NO}】资源绑定查看`;
+            reload()
+            getNumber()
         });
-        const [registerHistoryModal,{openModal}] = useModal();
+        const [registerHistoryModal, { openModal }] = useModal();
         const typeObj = {
             MR: "地图资源",
-            DR: "场景资源",
-            ER: "文件资源",
+            ER: "场景资源",
+            DR: "文件资源",
             SR: "组件服务",
             interface: "接口服务"
         }
+        const getNumber = () => {
+            let params = {
+                keyStr: '',
+                fid: currentFid.value,
+            }
+            getResByVersion(params).then(res => {
+                if (res.resp_code === 0 && res.datas) {
+                    let resData = res.datas;
+                    resBtns.value.forEach(btn=>{
+                        btn.number = resData[btn.value].total
+                    })
+                }
+            })
+        }
         const getVersionResData = () => {
             return new Promise(resolve => {
                 let params = {
@@ -222,10 +238,10 @@ export default defineComponent({
         }
         // 历史版本
         const handleSearchHistory = (record) => {
-            openModal(true,{
+            openModal(true, {
                 serviceId: record.SERVICEID,
                 serviceName: record.SERVICENAME,
-                type:record.type
+                type: record.type
             })
         }
         return {

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

@@ -175,6 +175,10 @@ export default defineComponent({
                 delVersion(param).then(res => {
                     if (res.resp_code === 0) {
                         // message.success('操作成功');
+                        if(res.datas.error.length){
+                            message.error(res.datas.error[0].msg);
+                            return;
+                        }
                         reload();
                         setSelectedRowKeys([])
                     }
@@ -191,7 +195,12 @@ export default defineComponent({
                 }
                 delVersion(param).then(res => {
                     if (res.resp_code === 0) {
-                        message.success('操作成功');
+                        // message.success('操作成功');
+                        if(res.datas.error.length){
+                            res.datas.error.forEach(err=>{
+                                message.error(err.msg);
+                            })
+                        }
                         reload();
                         setSelectedRowKeys([])
                     }