From 0cdd7cded14f90e09de0ba47469818a3ab13f604 Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Thu, 30 Mar 2023 22:44:57 +0800 Subject: [PATCH] =?UTF-8?q?zqq:=E9=81=A5=E6=84=9F=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E7=88=AC=E5=8F=96=E5=92=8C=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 143 +++-- src/layout/navBars/breadcrumb/user.vue | 304 +++++----- src/router/backEnd.js | 14 +- src/router/route.js | 20 +- .../dataService/multimediaData/index.vue | 288 +++++----- src/views/dataService/otherData/index.vue | 4 +- .../dataService/remoteSensingData/index.vue | 414 +++++++++++--- .../dataRetrieval/index.vue | 260 +++++---- .../dataUpload/index.vue | 308 +++++----- .../administrator/index.vue | 89 +-- .../responseManagement/dataUpload/index.vue | 93 +-- .../responseManagement/userResponse/index.vue | 204 ++++--- src/views/system/dic/dialog.vue | 297 ++++++---- src/views/system/menu/dialog.vue | 529 +++++++++++------- src/views/system/role/index.vue | 230 ++++---- src/views/system/user/dialog.vue | 397 ++++++++----- src/views/system/user/index.vue | 252 +++++---- 17 files changed, 2335 insertions(+), 1511 deletions(-) diff --git a/package.json b/package.json index 435428a..cdb175d 100644 --- a/package.json +++ b/package.json @@ -1,74 +1,73 @@ { - "name": "vordm", - "version": "2.4.32", - "description": "vue3 vite next admin template js setup", - "author": "lyt_20201208", - "license": "MIT", - "scripts": { - "dev": "vite --force", - "build": "vite build", - "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" - }, - "dependencies": { - "@element-plus/icons-vue": "^2.1.0", - "axios": "^1.3.4", - "echarts": "^5.4.2", - "leaflet": "^1.9.3", - "element-plus": "^2.3.1", - "js-cookie": "^3.0.1", - "js-md5": "^0.7.3", - "mitt": "^3.0.0", - "nprogress": "^0.2.0", - "pinia": "^2.0.33", - "qrcodejs2-fixes": "^0.0.2", - "qs": "^6.11.1", - "screenfull": "^6.0.2", - "sortablejs": "^1.15.0", - "vue": "^3.2.47", - "vue-clipboard3": "^2.0.0", - "vue-demi": "^0.13.11", - "qs": "^6.11.1", - "vue-i18n": "^9.2.2", - "vue-router": "^4.1.6" - }, - "devDependencies": { - "@vitejs/plugin-vue": "^4.1.0", - "@vue/compiler-sfc": "^3.2.47", - "eslint": "^8.36.0", - "eslint-plugin-vue": "^9.10.0", - "prettier": "^2.8.7", - "sass": "^1.60.0", - "vite": "^4.2.1", - "vite-plugin-cdn-import": "^0.3.5", - "vite-plugin-compression": "^0.5.1", - "vite-plugin-vue-setup-extend-plus": "^0.1.0", - "vue-eslint-parser": "^9.1.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not dead" - ], - "bugs": { - "url": "https://gitee.com/lyt-top/vue-next-admin/issues" - }, - "engines": { - "node": ">=16.0.0", - "npm": ">= 7.0.0" - }, - "keywords": [ - "vue", - "vue3", - "vuejs/vue-next", - "vuejs/vue-next-template", - "vuejs/vue-next-template-js", - "element-ui", - "element-plus", - "vue-next-admin", - "next-admin" - ], - "repository": { - "type": "git", - "url": "https://gitee.com/lyt-top/vue-next-admin.git" - } + "name": "vordm", + "version": "2.4.32", + "description": "vue3 vite next admin template js setup", + "author": "lyt_20201208", + "license": "MIT", + "scripts": { + "dev": "vite --force", + "build": "vite build", + "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" + }, + "dependencies": { + "@element-plus/icons-vue": "^2.1.0", + "axios": "^1.3.4", + "echarts": "^5.4.2", + "element-plus": "^2.3.1", + "js-cookie": "^3.0.1", + "js-md5": "^0.7.3", + "leaflet": "^1.9.3", + "mitt": "^3.0.0", + "nprogress": "^0.2.0", + "pinia": "^2.0.33", + "qrcodejs2-fixes": "^0.0.2", + "qs": "^6.11.1", + "screenfull": "^6.0.2", + "sortablejs": "^1.15.0", + "vue": "^3.2.47", + "vue-clipboard3": "^2.0.0", + "vue-demi": "^0.13.11", + "vue-i18n": "^9.2.2", + "vue-router": "^4.1.6" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^4.1.0", + "@vue/compiler-sfc": "^3.2.47", + "eslint": "^8.36.0", + "eslint-plugin-vue": "^9.10.0", + "prettier": "^2.8.7", + "sass": "^1.60.0", + "vite": "^4.2.1", + "vite-plugin-cdn-import": "^0.3.5", + "vite-plugin-compression": "^0.5.1", + "vite-plugin-vue-setup-extend-plus": "^0.1.0", + "vue-eslint-parser": "^9.1.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not dead" + ], + "bugs": { + "url": "https://gitee.com/lyt-top/vue-next-admin/issues" + }, + "engines": { + "node": ">=16.0.0", + "npm": ">= 7.0.0" + }, + "keywords": [ + "vue", + "vue3", + "vuejs/vue-next", + "vuejs/vue-next-template", + "vuejs/vue-next-template-js", + "element-ui", + "element-plus", + "vue-next-admin", + "next-admin" + ], + "repository": { + "type": "git", + "url": "https://gitee.com/lyt-top/vue-next-admin.git" + } } diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index f84f661..df1dd73 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -1,66 +1,84 @@ diff --git a/src/router/backEnd.js b/src/router/backEnd.js index 79d77ab..a4b2ab7 100644 --- a/src/router/backEnd.js +++ b/src/router/backEnd.js @@ -110,7 +110,7 @@ export function getBackEndControlRoutes() { const stores = useUserInfo(pinia); // 获取用户信息 const { userInfos } = storeToRefs(stores); - // 获取用户角色 + // 获取用户角色 //TODO 需要修改真正的数据 并调用menuToRoutes,将返回的菜单封装成需要的路由列表 const auth = userInfos.value.roles[0]; // 管理员 admin @@ -127,23 +127,23 @@ export function getBackEndControlRoutes() { export function menuToRoutes(menus) { let routes = []; menus.forEach((menu) => { - let route={}; + let route = {}; //判断是否有子节点 if (menu.children && menu.children.length > 0) { - route.children = menuToRoutes(menu.children) + route.children = menuToRoutes(menu.children); } route.ttid = menu.id; route.path = menu.path; route.name = menu.code; - route.component = menu.path + "/index"; + route.component = menu.path + '/index'; route.meta = { title: menu.name, icon: menu.source, isHide: menu.isHidden === 1 || menu.isHidden === '1', - routes: ['admin','common'], + routes: ['admin', 'chief'], isKeepAlive: false, - isAffix: menu.path.indexOf('/home')>-1, - } + isAffix: menu.path.indexOf('/home') > -1, + }; routes.push(route); }); return routes; diff --git a/src/router/route.js b/src/router/route.js index 39e7615..9ebee7d 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -7,7 +7,7 @@ * isKeepAlive: 是否缓存组件状态 * isAffix: 是否固定在 tagsView 栏上 * isIframe: 是否内嵌窗口,开启条件,`1、isIframe:true 2、isLink:链接地址不为空` - * roles: 当前路由权限标识,取角色管理。控制路由显示、隐藏。超级管理员:admin 普通角色:common + * roles: 当前路由权限标识,取角色管理。控制路由显示、隐藏。超级管理员:admin 主要管理员:chief * icon: 菜单、tagsView 图标,阿里:加 `iconfont xxx`,fontawesome:加 `fa xxx` * } */ @@ -40,7 +40,7 @@ export const dynamicRoutes = [ isAffix: true, isIframe: false, roles: ['admin', 'chief'], - icon: 'iconfont icon-shouye', + // icon: 'iconfont icon-shouye', }, }, { @@ -56,7 +56,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin'], - icon: 'iconfont icon-xitongshezhi', + // icon: 'iconfont icon-xitongshezhi', }, children: [ { @@ -71,7 +71,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin'], - icon: 'iconfont icon-caidan', + // icon: 'iconfont icon-caidan', }, }, { @@ -86,7 +86,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin'], - icon: 'ele-ColdDrink', + // icon: 'ele-ColdDrink', }, }, { @@ -101,7 +101,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin', 'chief'], - icon: 'iconfont icon-icon-', + // icon: 'iconfont icon-icon-', }, }, ], @@ -119,7 +119,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin', 'chief'], - icon: 'iconfont icon-xitongshezhi', + // icon: 'iconfont icon-xitongshezhi', }, children: [ { @@ -134,7 +134,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin', 'chief'], - icon: 'iconfont icon-caidan', + // icon: 'iconfont icon-caidan', }, }, { @@ -149,7 +149,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin', 'chief'], - icon: 'ele-ColdDrink', + // icon: 'ele-ColdDrink', }, }, { @@ -164,7 +164,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin', 'chief'], - icon: 'ele-ColdDrink', + // icon: 'ele-ColdDrink', }, }, ], diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index 8cdcb1f..d775e20 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -1,66 +1,93 @@ diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue index b606d3c..0443ea4 100644 --- a/src/views/dataService/otherData/index.vue +++ b/src/views/dataService/otherData/index.vue @@ -203,8 +203,8 @@ const getTableData = () => { const data = []; for (let i = 0; i < 20; i++) { data.push({ - roleName: i === 0 ? '超级管理员' : '普通用户', - roleSign: i === 0 ? 'admin' : 'common', + roleName: i === 0 ? '超级管理员' : '主要管理员', + roleSign: i === 0 ? 'admin' : 'chief', describe: `测试角色${i + 1}`, sort: i, status: true, diff --git a/src/views/dataService/remoteSensingData/index.vue b/src/views/dataService/remoteSensingData/index.vue index 97160dd..664548f 100644 --- a/src/views/dataService/remoteSensingData/index.vue +++ b/src/views/dataService/remoteSensingData/index.vue @@ -1,11 +1,11 @@ @@ -79,17 +262,7 @@ import { ref, reactive } from 'vue'; import Map from "/@/components/Map.vue"; - -const state = reactive({ - activeName: 'first', - startTime: '', - endTime: '', - addCoord: false, - satelliteSelected: [], - coordinateList: [], - -}) - +// 卫星类型 const sensor = ref([ { value: 'landsat', @@ -207,6 +380,101 @@ const sensor = ref([ } ]) +// VoRDM ID +const idOptions = [ + { + value: '2023001001', + label: '2023001001', + }, + { + value: '2023001002', + label: '2023001002', + }, + { + value: '2023001003', + label: '2023001003', + }, + { + value: '2023001004', + label: '2023001004', + }, + { + value: '2023001005', + label: '2023001005', + }, +] + +//选择灾害类型下拉框 +const options_disastertype = [ + { + value: 'Earthquake', + label: 'Earthquake', + }, + { + value: 'Hurricane', + label: 'Hurricane', + }, + { + value: 'Flood', + label: 'Flood', + }, + { + value: 'Volcano', + label: 'Volcano', + }, + { + value: 'Drought', + label: 'Drought', + }, + { + value: 'Landslide', + label: 'Landslide', + }, +]; + +//选择爬虫类型下拉框 +const options_crawlertype = [ + { + value: 'Bing', + label: 'Bing', + }, + { + value: 'Twitter', + label: 'Twitter', + }, + { + value: 'Baidu', + label: 'Baidu', + }, + { + value: 'Weibo', + label: 'Weibo', + }, +]; + +const state = reactive({ + activeName: 'first', + startTime: '', + endTime: '', + addCoord: false, + satelliteSelected: [], + coordinateList: [], + selectID: '', + tableData: { + data: [], + total: 0, + loading: false, + param: { + search: '', + pageNum: 1, + pageSize: 10, + }, + }, + value_disastertype: '', + value_disastertime: '', + value_crawlertype: '', +}) + const shortcuts = [ { text: '1 month ago', @@ -238,12 +506,12 @@ const shortcuts = [ const addCoordinate = () => { state.addCoord = !state.addCoord; state.coordinateList = [ - // '43.538', '111.530', '36.195', '120.761' { Lat: '43.538' , Lng: '111.530' - }, { + }, + { Lat: '36.195' , Lng: '120.761' @@ -256,7 +524,12 @@ const clearCoordinate = () => { state.startTime = ''; state.endTime = ''; } +// 编辑坐标点 +const editCoordinate = () => { +} + +// 开始爬虫 const startCrawl = () => { console.log("start time:", state.startTime) console.log("end time:", state.endTime) @@ -264,38 +537,41 @@ const startCrawl = () => { console.log("satelliteSelected:", state.satelliteSelected) } +// 清空搜索条件 +const ClearCondition = () => { + state.startTime = '' + state.endTime = '' + state.addCoord = false + state.satelliteSelected = [] + state.coordinateList = [] + state.selectID = '' +} +