diff --git a/index.html b/index.html index 9a4d343..ce53f3a 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - + VoRDM Admin diff --git a/public/home.jpg b/public/home.jpg new file mode 100644 index 0000000..c458c73 Binary files /dev/null and b/public/home.jpg differ diff --git a/public/home.png b/public/home.png new file mode 100644 index 0000000..e889ca5 Binary files /dev/null and b/public/home.png differ diff --git a/public/home1.png b/public/home1.png new file mode 100644 index 0000000..c645e19 Binary files /dev/null and b/public/home1.png differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..0595522 Binary files /dev/null and b/public/logo.png differ diff --git a/public/logo2.png b/public/logo2.png new file mode 100644 index 0000000..515a39d Binary files /dev/null and b/public/logo2.png differ diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js index effd42e..4fde0b5 100644 --- a/src/api/crawl/index.js +++ b/src/api/crawl/index.js @@ -84,7 +84,7 @@ export const pushing = (data) => { //wordcloud服务 export const landsat = (disaster_id,number,id) => { return request({ - url: '/api/' + crawlModule + '/rs/landsat', + url: '/api/' + crawlModule + '/visual/wordcloud', method: 'get', params:{ disaster_id, diff --git a/src/components/table/DisasterTable.vue b/src/components/table/DisasterTable.vue index da2e2b6..982ccb3 100644 --- a/src/components/table/DisasterTable.vue +++ b/src/components/table/DisasterTable.vue @@ -20,6 +20,7 @@ +
-
vue-next-admin，Made by lyt with ❤️
-
深圳市 xxx 公司版权所有
+
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index d50fa35..feb0fe5 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -12,26 +12,26 @@ -
-
-
--> + + @@ -174,16 +171,16 @@ const onHandleCommandClick = (path) => { ElMessageBox({ closeOnClickModal: false, closeOnPressEscape: false, - title: '提示', - message: '此操作将退出登录, 是否继续?', + title: 'Prompt', + message: 'This action will log you out of the login and whether to continue?', showCancelButton: true, - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', buttonSize: 'default', beforeClose: (action, instance, done) => { if (action === 'confirm') { instance.confirmButtonLoading = true; - instance.confirmButtonText = '退出中'; + instance.confirmButtonText = 'Exiting'; setTimeout(() => { done(); setTimeout(() => { diff --git a/src/stores/themeConfig.js b/src/stores/themeConfig.js index 8fddb50..ed2f7a6 100644 --- a/src/stores/themeConfig.js +++ b/src/stores/themeConfig.js @@ -12,7 +12,7 @@ export const useThemeConfig = defineStore('themeConfig', { state: () => ({ website: { // 开启验证码模式 - captchaMode: false, + captchaMode: true, tokenTime: 3000, tenantId: '595035', }, @@ -109,7 +109,7 @@ export const useThemeConfig = defineStore('themeConfig', { // 是否开启水印 isWartermark: false, // 水印文案 - wartermarkText: 'vue-next-admin', + wartermarkText: 'vordm', /** * 其它设置 @@ -142,7 +142,7 @@ export const useThemeConfig = defineStore('themeConfig', { * 全局网站标题 / 副标题 */ // 网站主标题（菜单导航、浏览器当前网页标题） - globalTitle: 'vue-next-admin', + globalTitle: 'vordm', // 网站副标题（登录页顶部文字） globalViceTitle: 'vueNextAdmin', // 网站副标题（登录页顶部文字） diff --git a/src/utils/formatTime.js b/src/utils/formatTime.js index b305d91..01772c9 100644 --- a/src/utils/formatTime.js +++ b/src/utils/formatTime.js @@ -126,12 +126,12 @@ export function formatPast(param, format = 'YYYY-mm-dd') { */ export function formatAxis(param) { let hour = new Date(param).getHours(); - if (hour < 6) return '凌晨好'; - else if (hour < 9) return '早上好'; - else if (hour < 12) return '上午好'; - else if (hour < 14) return '中午好'; - else if (hour < 17) return '下午好'; - else if (hour < 19) return '傍晚好'; - else if (hour < 22) return '晚上好'; - else return '夜里好'; + if (hour < 6) return 'Good morning'; + else if (hour < 9) return 'Good morning'; + else if (hour < 12) return 'Good morning'; + else if (hour < 14) return 'Good noon'; + else if (hour < 17) return 'Good afternoon'; + else if (hour < 19) return 'Good evening'; + else if (hour < 22) return 'Good evening'; + else return 'Good night'; } diff --git a/src/utils/request.js b/src/utils/request.js index a30c035..30b981e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,8 +3,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import qs from 'qs'; import { Session } from '/@/utils/storage'; -// export const moduleName = 'zqq-biz-vordm'; -export const moduleName = 'yyhouc-biz-vordm'; +export const moduleName = 'biz-vordm'; export const crawlModule = 'vordm-crawl'; const service = axios.create({ //baseURL: import.meta.env.VITE_API_URL, diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index 8698ebe..63e54a5 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -3,31 +3,16 @@ -
- - - - - - - - - +
+ + + - - - +
@@ -64,8 +49,8 @@ Batch operation
- + - + :total=" state.tableData.total ">
@@ -150,6 +136,7 @@ import { getDictionary } from '/@/api/system/dictbiz'; import { defineAsyncComponent, reactive, onMounted, ref } from 'vue'; import { ElMessageBox, ElMessage } from 'element-plus'; import boot from "./component/boot.vue"; +import disasterTable from "/@/components/table/DisasterTable.vue"; // 引入组件 const auditRef = ref(); const bootRef = ref(); @@ -250,8 +237,8 @@ const formatSizeUnits = (size) => { return (size / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i]; } //灾害表格点击事件 -const tableClick = (row, column, event) => { - state.disasterId = row.id; +const tableClick = (i) => { + state.disasterId = i.disasterId; getTableData(); } // 初始化灾害表格数据 @@ -271,8 +258,8 @@ const getDisasterData = () => { } getList(param).then(res => { state.disasterData.data = res.records; - state.disasterData.data.forEach(item=>{ - let date = item.disasterTime.slice(0,10); + state.disasterData.data.forEach(item => { + let date = item.disasterTime.slice(0, 10); item.disasterTime = date; }) state.disasterData.total = res.total; @@ -377,11 +364,13 @@ onMounted(() => { .system-role-container { .system-role-padding { padding: 15px; + .el-table { flex: 1; } } } + .mt15 { display: flex; justify-content: end; diff --git a/src/views/dataService/otherData/component/upload.vue b/src/views/dataService/otherData/component/upload.vue index 29c6afa..09c8fd8 100644 --- a/src/views/dataService/otherData/component/upload.vue +++ b/src/views/dataService/otherData/component/upload.vue @@ -1,6 +1,7 @@ -