From 6476e95c4254cf58871665b5cc3499340147a34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Fri, 26 Apr 2024 16:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=9F=A5=E8=AF=A2-=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=88=EF=BC=8C=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/demo/model/queryModal.ts | 2 +- src/api/demo/query.ts | 8 +- src/api/demo/version.ts | 29 + src/views/demo/query/complete/detailModal.vue | 1050 ----------------- src/views/demo/query/complete/index.vue | 30 +- .../demo/query/{return => }/detailModal.vue | 85 +- .../demo/query/{complete => }/mapDetail.vue | 4 +- src/views/demo/query/return/index.vue | 24 +- src/views/demo/query/return/mapDetail.vue | 205 ---- src/views/demo/system/version/index.vue | 272 +++++ .../demo/system/version/version copy.vue | 278 +++++ 11 files changed, 654 insertions(+), 1333 deletions(-) create mode 100644 src/api/demo/version.ts delete mode 100644 src/views/demo/query/complete/detailModal.vue rename src/views/demo/query/{return => }/detailModal.vue (94%) rename src/views/demo/query/{complete => }/mapDetail.vue (98%) delete mode 100644 src/views/demo/query/return/mapDetail.vue create mode 100644 src/views/demo/system/version/index.vue create mode 100644 src/views/demo/system/version/version copy.vue diff --git a/src/api/demo/model/queryModal.ts b/src/api/demo/model/queryModal.ts index 4e72ee9..f9885af 100644 --- a/src/api/demo/model/queryModal.ts +++ b/src/api/demo/model/queryModal.ts @@ -5,7 +5,7 @@ export interface responses { code: number; columnHeaders: []; count: number; - result: boolean; + result: []; msg: string; } export type responsesmodel = BasicFetchResult; diff --git a/src/api/demo/query.ts b/src/api/demo/query.ts index 02671d6..616c8d9 100644 --- a/src/api/demo/query.ts +++ b/src/api/demo/query.ts @@ -6,12 +6,12 @@ enum Api { Get_LoadCaseInfoList = '/api/DroneCaseinfo/LoadCaseInfoList', // complete- Get_LoadList = '/api/Categorys/LoadList', - // complete- - Get_load = '/api/categorys/load', + // 获取数据字典明显根据分类编号 + Get_load = '/api/SysDataItemDetail/Load', // complete- Get_OrgList = '/api/Orgs/OrgList', // complete-导出 - Get_ExportCaseInfoList = '/api/DroneCaseinfo/ExportCaseInfoList', + Get_ExportCaseInfoList = '/api/DroneCaseinfo/ExportCaseInfoList', // 案件详情 Get_getCaseInfo = '/api/DroneCaseinfo/GetCaseInfo', @@ -51,7 +51,7 @@ export function fun_LoadList(params) { }); } -// complete-分页获取列表数据 +// 获取数据字典明显根据分类编号 export function fun_load(params) { return defHttp.get({ url: Api.Get_load, diff --git a/src/api/demo/version.ts b/src/api/demo/version.ts new file mode 100644 index 0000000..688b66a --- /dev/null +++ b/src/api/demo/version.ts @@ -0,0 +1,29 @@ +import { responsesmodel } from './model/queryModal'; +import { defHttp } from '@/utils/http/axios'; + +enum Api { + Get_GetUpdateFiles = '/api/SysAppFiles/GetUpdateFiles', + Post_Upload = '/api/Files/Upload', + Post_AddAppFiles = '/api/SysAppFiles/AddAppFiles', +} + +export function fun_GetUpdateFiles(params) { + return defHttp.get({ + url: Api.Get_GetUpdateFiles, + params, + }); +} + +export function fun_Upload(params) { + return defHttp.post({ + url: Api.Post_Upload, + params, + }); +} + +export function fun_AddAppFiles(params) { + return defHttp.post({ + url: Api.Post_AddAppFiles, + params, + }); +} diff --git a/src/views/demo/query/complete/detailModal.vue b/src/views/demo/query/complete/detailModal.vue deleted file mode 100644 index ba994c1..0000000 --- a/src/views/demo/query/complete/detailModal.vue +++ /dev/null @@ -1,1050 +0,0 @@ - - - - diff --git a/src/views/demo/query/complete/index.vue b/src/views/demo/query/complete/index.vue index 5679c91..3165ea3 100644 --- a/src/views/demo/query/complete/index.vue +++ b/src/views/demo/query/complete/index.vue @@ -19,13 +19,13 @@ /> -
+
@@ -144,7 +144,7 @@ import { useModal } from '@/components/Modal'; import dayjs, { Dayjs } from 'dayjs'; // 子组件 - import DetailModal from './detailModal.vue'; + import DetailModal from '@/views/demo/query/detailModal.vue'; // api import { fun_LoadDataBaseInfo, @@ -197,7 +197,7 @@ { id: 2, name: '伪变化' }, ]; // 案件类型 - const caseTypeOptions = ref<[]>([]); + const caseTypeOptions: any = ref([]); // 查询地区 const OrgList = ref([]); @@ -301,8 +301,8 @@ async function exportExcelList() { await fun_ExportCaseInfoList(listQuery.value).then((res) => { console.log('导出', res); - if (res.code === 200) { - window.location.href = BASE_API + '/' + res.result; + if (res) { + window.location.href = BASE_API + '/' + res; } }); } @@ -317,17 +317,15 @@ // 初始化 async function fetch() { getCaseList(); - let data0 = await fun_LoadList({ typeid: 'SYS_NOBUILD_TYPE' }); - console.log(data0); + // let data0 = await fun_LoadList({ typeid: 'SYS_NOBUILD_TYPE' }); + // console.log(data0); // 案件类型 - let data1 = await fun_load({ page: 1, limit: 99, typeid: 'DRONE_CASE_TYPE' }); - // caseTypeOptions.value = - console.log(data1); + caseTypeOptions.value = await fun_load({ code: 'DRONE_CASE_TYPE' }); // 查询地区 - let data2 = await fun_OrgList({ name: '费县' }); - // OrgList.value = - console.log(data2); + // let data2 = await fun_OrgList({ name: '费县' }); + // // OrgList.value = + // console.log(data2); } onMounted(() => { diff --git a/src/views/demo/query/return/detailModal.vue b/src/views/demo/query/detailModal.vue similarity index 94% rename from src/views/demo/query/return/detailModal.vue rename to src/views/demo/query/detailModal.vue index 72050c3..3784f64 100644 --- a/src/views/demo/query/return/detailModal.vue +++ b/src/views/demo/query/detailModal.vue @@ -2,8 +2,8 @@
@@ -25,7 +26,7 @@ /> - + 【案件下发信息】 @@ -668,11 +669,11 @@ -
+
【地图位置】 -
- +
+
@@ -687,15 +688,18 @@ import { ref, defineEmits, watch } from 'vue'; // vben import { BasicModal, useModalInner } from '@/components/Modal'; - import { ImagePreview } from '@/components/Preview'; + // import { ImagePreview } from '@/components/Preview'; import MapDetail from './mapDetail.vue'; + // 文件拼地址 + import { useGlobSetting } from '@/hooks/setting'; // api import { fun_getCaseInfo, fun_GetCaseFlowLog, fun_GetDroneCaseDeal } from '@/api/demo/query'; + // 图片拼地址 + const { uploadUrl } = useGlobSetting(); // emit const emit = defineEmits(['close-modal', 'currentImage']); - // 导出 - let BASE_IMAGE_URL = process.env.VUE_APP_BASE_IMG_URL; + // 定义props const props = defineProps({ isShowMap: { @@ -717,9 +721,9 @@ // 参数 let imagePreviewShow = false; let currentImage = null; - let caseHandleInfo = { + let caseHandleInfo = ref({ info: {}, - }; + }); let imageList = []; let imageList_a = []; let videoList = []; @@ -782,8 +786,8 @@ caseDetail.value = res.info; imageList = res.pic_list; for (let i = 0; i < imageList.length; i++) { - imageList_a[i] = BASE_IMAGE_URL + '/' + imageList[i]; - imageList[i] = BASE_IMAGE_URL + '/S_' + imageList[i]; + imageList_a[i] = uploadUrl + '/' + imageList[i]; + imageList[i] = uploadUrl + '/S_' + imageList[i]; } } console.log(imageList_a); @@ -794,16 +798,13 @@ function loadCaseHandleInfo(caseDetailId) { fun_GetDroneCaseDeal({ caseid: caseDetailId }).then((res) => { if (res) { - caseHandleInfo = res; - // res.is_illegal = 1; - // res.info.measure_name = '拟完善手续'; - - if (caseHandleInfo.is_illegal == 0) { - caseHandleInfo.is_illegal = '合法'; - } else if (caseHandleInfo.is_illegal == 1) { - caseHandleInfo.is_illegal = '违法'; - } else if (caseHandleInfo.is_illegal == 2) { - caseHandleInfo.is_illegal = '伪变化'; + caseHandleInfo.value = res; + if (caseHandleInfo.value.is_illegal == 0) { + caseHandleInfo.value.is_illegal = '合法'; + } else if (caseHandleInfo.value.is_illegal == 1) { + caseHandleInfo.value.is_illegal = '违法'; + } else if (caseHandleInfo.value.is_illegal == 2) { + caseHandleInfo.value.is_illegal = '伪变化'; } if (res.video_list.length > 0) { @@ -824,7 +825,7 @@ sources: [ { type: '', - src: BASE_IMAGE_URL + '/' + item, //url地址 + src: uploadUrl + '/' + item, //url地址 }, ], poster: '', //你的封面地址 @@ -849,8 +850,8 @@ }); for (let i = 0; i < threadImageList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + threadImageList[i], - s_filePath: BASE_IMAGE_URL + '/S_' + threadImageList[i], + filePath: uploadUrl + '/' + threadImageList[i], + s_filePath: uploadUrl + '/S_' + threadImageList[i], }; threadImageList[i] = obj; } @@ -863,8 +864,8 @@ }); } for (let i = 0; i < threadAfterImageList.length; i++) { - threadAfterImageList_a[i] = BASE_IMAGE_URL + '/' + threadAfterImageList[i]; - threadAfterImageList[i] = BASE_IMAGE_URL + '/S_' + threadAfterImageList[i]; + threadAfterImageList_a[i] = uploadUrl + '/' + threadAfterImageList[i]; + threadAfterImageList[i] = uploadUrl + '/S_' + threadAfterImageList[i]; } // 处理后视频 videoOptions = []; @@ -882,7 +883,7 @@ sources: [ { type: '', - src: BASE_IMAGE_URL + '/' + item, //url地址 + src: uploadUrl + '/' + item, //url地址 }, ], poster: '', //你的封面地址 @@ -907,8 +908,8 @@ }); for (let i = 0; i < evidenceFileList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + evidenceFileList[i], - s_filePath: BASE_IMAGE_URL + '/' + evidenceFileList[i], + filePath: uploadUrl + '/' + evidenceFileList[i], + s_filePath: uploadUrl + '/' + evidenceFileList[i], }; evidenceFileList[i] = obj; } @@ -920,8 +921,8 @@ }); for (let i = 0; i < boundaryImageList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + boundaryImageList[i], - s_filePath: BASE_IMAGE_URL + '/' + boundaryImageList[i], + filePath: uploadUrl + '/' + boundaryImageList[i], + s_filePath: uploadUrl + '/' + boundaryImageList[i], }; console.log('boundary', obj); boundaryImageList[i] = obj; @@ -936,8 +937,8 @@ }); for (let i = 0; i < punishImageList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + punishImageList[i], - s_filePath: BASE_IMAGE_URL + '/S_' + punishImageList[i], + filePath: uploadUrl + '/' + punishImageList[i], + s_filePath: uploadUrl + '/S_' + punishImageList[i], }; punishImageList[i] = obj; } @@ -950,8 +951,8 @@ }); for (let i = 0; i < paymentImageList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + paymentImageList[i], - s_filePath: BASE_IMAGE_URL + '/S_' + paymentImageList[i], + filePath: uploadUrl + '/' + paymentImageList[i], + s_filePath: uploadUrl + '/S_' + paymentImageList[i], }; paymentImageList[i] = obj; } @@ -964,8 +965,8 @@ }); for (let i = 0; i < agreeImageList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + agreeImageList[i], - s_filePath: BASE_IMAGE_URL + '/S_' + agreeImageList[i], + filePath: uploadUrl + '/' + agreeImageList[i], + s_filePath: uploadUrl + '/S_' + agreeImageList[i], }; agreeImageList[i] = obj; } @@ -978,12 +979,12 @@ }); for (let i = 0; i < checkoutImageList.length; i++) { let obj = { - filePath: BASE_IMAGE_URL + '/' + checkoutImageList[i], - s_filePath: BASE_IMAGE_URL + '/S_' + checkoutImageList[i], + filePath: uploadUrl + '/' + checkoutImageList[i], + s_filePath: uploadUrl + '/S_' + checkoutImageList[i], }; checkoutImageList[i] = obj; - // checkoutImageList_a[i] =BASE_IMAGE_URL+"/"+checkoutImageList[i]; - // checkoutImageList[i] =BASE_IMAGE_URL+"/S_"+checkoutImageList[i]; + // checkoutImageList_a[i] =uploadUrl+"/"+checkoutImageList[i]; + // checkoutImageList[i] =uploadUrl+"/S_"+checkoutImageList[i]; } } } diff --git a/src/views/demo/query/complete/mapDetail.vue b/src/views/demo/query/mapDetail.vue similarity index 98% rename from src/views/demo/query/complete/mapDetail.vue rename to src/views/demo/query/mapDetail.vue index b769908..f61c169 100644 --- a/src/views/demo/query/complete/mapDetail.vue +++ b/src/views/demo/query/mapDetail.vue @@ -1,6 +1,6 @@ diff --git a/src/views/demo/query/return/index.vue b/src/views/demo/query/return/index.vue index 046ecc5..c1dcccd 100644 --- a/src/views/demo/query/return/index.vue +++ b/src/views/demo/query/return/index.vue @@ -19,13 +19,13 @@ />
-
+
@@ -136,7 +136,7 @@ import { useModal } from '@/components/Modal'; import dayjs, { Dayjs } from 'dayjs'; // 子组件 - import DetailModal from './detailModal.vue'; + import DetailModal from '@/views/demo/query/detailModal.vue'; // api import { fun_LoadDataBaseInfo, @@ -189,7 +189,7 @@ { id: 2, name: '伪变化' }, ]; // 案件类型 - const caseTypeOptions = ref<[]>([]); + const caseTypeOptions: any = ref([]); // 查询地区 const OrgList = ref([]); @@ -309,17 +309,15 @@ // 初始化 async function fetch() { getCaseList(); - let data0 = await fun_LoadList({ typeid: 'SYS_NOBUILD_TYPE' }); - console.log(data0); + // let data0 = await fun_LoadList({ typeid: 'SYS_NOBUILD_TYPE' }); + // 案件类型 - let data1 = await fun_load({ page: 1, limit: 99, typeid: 'DRONE_CASE_TYPE' }); - // caseTypeOptions.value = - console.log(data1); + caseTypeOptions.value = await fun_load({ code: 'DRONE_CASE_TYPE' }); // 查询地区 - let data2 = await fun_OrgList({ name: '费县' }); - // OrgList.value = - console.log(data2); + // let data2 = await fun_OrgList({ name: '费县' }); + // // OrgList.value = + // console.log(data2); } onMounted(() => { diff --git a/src/views/demo/query/return/mapDetail.vue b/src/views/demo/query/return/mapDetail.vue deleted file mode 100644 index b769908..0000000 --- a/src/views/demo/query/return/mapDetail.vue +++ /dev/null @@ -1,205 +0,0 @@ - - - diff --git a/src/views/demo/system/version/index.vue b/src/views/demo/system/version/index.vue new file mode 100644 index 0000000..4f5967d --- /dev/null +++ b/src/views/demo/system/version/index.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/demo/system/version/version copy.vue b/src/views/demo/system/version/version copy.vue new file mode 100644 index 0000000..a71dc52 --- /dev/null +++ b/src/views/demo/system/version/version copy.vue @@ -0,0 +1,278 @@ + + + + +