diff --git a/.env b/.env index 4d8cc50..a7b3826 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -VUE_APP_VERSION=1.5.0 +VUE_APP_VERSION=1.0.0 VUE_APP_NAME=生态环境监测系统 -VUE_APP_API_BASE_URL=http://localhost:8080/api +VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api diff --git a/src/api/ecology/road-place.js b/src/api/ecology/road-place.js new file mode 100644 index 0000000..e69de29 diff --git a/src/api/ecology/road-sound.js b/src/api/ecology/road-sound.js new file mode 100644 index 0000000..66e2e57 --- /dev/null +++ b/src/api/ecology/road-sound.js @@ -0,0 +1,67 @@ +import axios from 'axios'; +// ----------------------列表----------------------- +const pageBillUrl = '/sound/road/noise/bill/page'; +// 添加 +const saveRoadNoiseBill = function (data) { + return axios.post("/sound/road/noise/bill",data) +} + +// 删除 +const removeRoadNoiseBill = function (id) { + return axios.delete(`/sound/road/noise/bill/${id}`,) +} +// 批量删除 +const removeBatchRoadNoiseBill = function (ids) { + return axios.delete("/sound/road/noise/bill/batch",{data:ids}) +} + +// 修改 +const updateRoadNoiseBill = function (data) { + return axios.put("/sound/road/noise/bill",data) +} +// 审核 +const verifyRoadNoiseBill = function (data) { + return axios.put("/sound/road/noise/bill/verify",data); +} +const getRoadNoiseBill = function (id) { + return axios.get(`/sound/road/noise/bill/${id}`) +} +// -------------------------数据--------------------- +const pageRoadNoiseUrl = '/sound/road/noise/page'; +// 添加 +const saveRoadNoise = function (data) { + return axios.post("/sound/road/noise",data) +} + +// 删除 +const removeRoadNoise = function (id) { + return axios.delete(`/sound/road/noise/${id}`,) +} +// 批量删除 +const removeBatchRoadNoise = function (ids) { + return axios.delete("/sound/road/noise/batch",{data:ids}) +} + +// 修改 +const updateRoadNoise = function (data) { + return axios.put("/sound/road/noise",data) +} + +// -------------------------统计--------------------- +const pageRoadNoiseStatisticUrl = '/sound/road/collect/page'; +export { + pageBillUrl, + saveRoadNoiseBill, + removeRoadNoiseBill, + updateRoadNoiseBill, + removeBatchRoadNoiseBill, + verifyRoadNoiseBill, + getRoadNoiseBill, + pageRoadNoiseUrl, + saveRoadNoise, + removeRoadNoise, + updateRoadNoise, + removeBatchRoadNoise, + pageRoadNoiseStatisticUrl + +} diff --git a/src/api/ecology/road_sound.js b/src/api/ecology/road_sound.js deleted file mode 100644 index fb55334..0000000 --- a/src/api/ecology/road_sound.js +++ /dev/null @@ -1,63 +0,0 @@ -import axios from 'axios'; -// ----------------------列表----------------------- -const pageBillUrl = '/collect/sound/road/bill/page'; -// 添加 -const saveRoadSoundBill = function (data) { - return axios.post("/collect/sound/road/bill",data) -} - -// 删除 -const removeRoadSoundBill = function (id) { - return axios.delete(`/collect/sound/road/bill/${id}`,) -} -// 批量删除 -const removeBatchRoadSoundBill = function (ids) { - return axios.delete("/collect/sound/road/bill/batch",{data:ids}) -} - -// 修改 -const updateRoadSoundBill = function (data) { - return axios.put("/collect/sound/road/bill",data) -} -// 审核 -const verifyRoadSoundBill = function (data) { - return axios.put("/collect/sound/road/bill/verify",data); -} -const getRoadSoundBill = function (id) { - return axios.get(`/collect/sound/road/bill/${id}`) -} -// -------------------------数据--------------------- -const pageRoadSoundUrl = '/collect/sound/road/page'; -// 添加 -const saveRoadSound = function (data) { - return axios.post("/collect/sound/road",data) -} - -// 删除 -const removeRoadSound = function (id) { - return axios.delete(`/collect/sound/road/${id}`,) -} -// 批量删除 -const removeBatchRoadSound = function (ids) { - return axios.delete("/collect/sound/road/batch",{data:ids}) -} - -// 修改 -const updateRoadSound = function (data) { - return axios.put("/collect/sound/road",data) -} -export { - pageBillUrl, - saveRoadSoundBill, - removeRoadSoundBill, - updateRoadSoundBill, - removeBatchRoadSoundBill, - verifyRoadSoundBill, - getRoadSoundBill, - pageRoadSoundUrl, - saveRoadSound, - removeRoadSound, - updateRoadSound, - removeBatchRoadSound - -} diff --git a/src/config/setting.js b/src/config/setting.js index d1f899c..7f19f2e 100644 --- a/src/config/setting.js +++ b/src/config/setting.js @@ -45,7 +45,7 @@ export default { // 主题配置存储的名称 themeStoreName: 'theme', // 首页标题, 为空会自动获取 - homeTitle: '主页', + homeTitle: '', // 首页路径, 为空会自动获取 homePath: null, // 顶栏是否显示主题设置按钮 @@ -61,7 +61,7 @@ export default { // 标签页风格: default(默认), dot(圆点), card(卡片) tabStyle: 'default', // 布局风格: side(默认), top(顶栏菜单), mix(混合菜单) - layoutStyle: 'mix', + layoutStyle: 'side', // 侧边栏菜单风格: default(默认), mix(双排菜单) sideMenuStyle: 'default', // 是否固定侧栏 diff --git a/src/directive/hasPermi.js b/src/directive/hasPermi.js new file mode 100644 index 0000000..a28ad8a --- /dev/null +++ b/src/directive/hasPermi.js @@ -0,0 +1,29 @@ + /** + * 操作权限处理 + * Copyright (c) 2019 ruoyi + */ + +import store from '@/store' + +export default { + // eslint-disable-next-line no-unused-vars + mounted(el, binding, vnode) { + const { value } = binding + + const all_permission = "*:*:*"; + const permissions = store.getters && store.getters.permissions + if (value && value instanceof Array && value.length > 0) { + const permissionFlag = value + + const hasPermissions = permissions.some(permission => { + return all_permission === permission || permissionFlag.includes(permission) + }) + + if (!hasPermissions) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置操作权限标签值`) + } + } +} diff --git a/src/directive/hasRole.js b/src/directive/hasRole.js new file mode 100644 index 0000000..641042d --- /dev/null +++ b/src/directive/hasRole.js @@ -0,0 +1,28 @@ + /** + * 角色权限处理 + * Copyright (c) 2019 ruoyi + */ + +import store from '@/store' + +export default { + // eslint-disable-next-line no-unused-vars + mounted(el, binding, vnode) { + const { value } = binding + const super_admin = "admin"; + const roles = store.getters && store.getters.roles + + if (value && value instanceof Array && value.length > 0) { + const roleFlag = value + const hasRole = roles.some(role => { + return super_admin === role || roleFlag.includes(role) + }) + + if (!hasRole) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置角色权限标签值"`) + } + } +} diff --git a/src/directive/index.js b/src/directive/index.js new file mode 100644 index 0000000..087383a --- /dev/null +++ b/src/directive/index.js @@ -0,0 +1,11 @@ +import hasRole from './hasRole' +import hasPermi from './hasPermi' + +const install = function(app) { + app.directive('hasRole', hasRole) + app.directive('hasPermi', hasPermi) +} + + + +export default install diff --git a/src/main.js b/src/main.js index 4b1febf..baaf4a0 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,7 @@ import './styles/index.less'; import EleAdminPro from 'ele-admin-pro'; import ModalUtil from 'ele-admin-pro/packages/modal-util'; import i18n from './lang'; +import diyDirective from './directive'; const app = createApp(App); app.config.productionTip = false; @@ -21,4 +22,5 @@ app.use(permission); app.use(EleAdminPro); app.use(ModalUtil); app.use(i18n); +app.use(diyDirective) app.mount('#app'); diff --git a/src/store/getters.js b/src/store/getters.js index 9edcbf6..e85feab 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,4 +1,6 @@ export default { user: state => state.user, - theme: state => state.theme + theme: state => state.theme, + permissions: state => state.user.user.authorities, + roles: state => state.user.user.roles } diff --git a/src/views/collect/sound/function/index.vue b/src/views/collect/sound/function/index.vue deleted file mode 100644 index 895153b..0000000 --- a/src/views/collect/sound/function/index.vue +++ /dev/null @@ -1,164 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/collect/sound/zone/index.vue b/src/views/collect/sound/zone/index.vue deleted file mode 100644 index 37d3e2a..0000000 --- a/src/views/collect/sound/zone/index.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/src/views/example/choose/index.vue b/src/views/example/choose/index.vue deleted file mode 100644 index f691937..0000000 --- a/src/views/example/choose/index.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - - diff --git a/src/views/example/document/file-sort.vue b/src/views/example/document/file-sort.vue deleted file mode 100644 index cf35db2..0000000 --- a/src/views/example/document/file-sort.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - - diff --git a/src/views/example/document/index.vue b/src/views/example/document/index.vue deleted file mode 100644 index bcadc3e..0000000 --- a/src/views/example/document/index.vue +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/src/views/extension/dragsort.vue b/src/views/extension/dragsort.vue deleted file mode 100644 index 1516985..0000000 --- a/src/views/extension/dragsort.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - - diff --git a/src/views/extension/editor.vue b/src/views/extension/editor.vue deleted file mode 100644 index 1e408f4..0000000 --- a/src/views/extension/editor.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/src/views/extension/excel.vue b/src/views/extension/excel.vue deleted file mode 100644 index e11b346..0000000 --- a/src/views/extension/excel.vue +++ /dev/null @@ -1,418 +0,0 @@ - - - - - diff --git a/src/views/extension/file.vue b/src/views/extension/file.vue deleted file mode 100644 index 70c87e8..0000000 --- a/src/views/extension/file.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - - - diff --git a/src/views/extension/map.vue b/src/views/extension/map.vue deleted file mode 100644 index 2a6aedb..0000000 --- a/src/views/extension/map.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - - - diff --git a/src/views/extension/more/index.vue b/src/views/extension/more/index.vue deleted file mode 100644 index 2c18b2e..0000000 --- a/src/views/extension/more/index.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - - diff --git a/src/views/extension/more/more-city-select.vue b/src/views/extension/more/more-city-select.vue deleted file mode 100644 index 27b226f..0000000 --- a/src/views/extension/more/more-city-select.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/src/views/extension/more/more-color-picker.vue b/src/views/extension/more/more-color-picker.vue deleted file mode 100644 index 1a21039..0000000 --- a/src/views/extension/more/more-color-picker.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - - - diff --git a/src/views/extension/more/more-count-up.vue b/src/views/extension/more/more-count-up.vue deleted file mode 100644 index 29d759e..0000000 --- a/src/views/extension/more/more-count-up.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - diff --git a/src/views/extension/more/more-cropper.vue b/src/views/extension/more/more-cropper.vue deleted file mode 100644 index 963e474..0000000 --- a/src/views/extension/more/more-cropper.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - - - diff --git a/src/views/extension/more/more-modal.vue b/src/views/extension/more/more-modal.vue deleted file mode 100644 index 68a837b..0000000 --- a/src/views/extension/more/more-modal.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - - diff --git a/src/views/extension/more/more-tag.vue b/src/views/extension/more/more-tag.vue deleted file mode 100644 index cee684b..0000000 --- a/src/views/extension/more/more-tag.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - - - diff --git a/src/views/extension/player.vue b/src/views/extension/player.vue deleted file mode 100644 index 62216b5..0000000 --- a/src/views/extension/player.vue +++ /dev/null @@ -1,334 +0,0 @@ - - - - - diff --git a/src/views/extension/printer.vue b/src/views/extension/printer.vue deleted file mode 100644 index 62a144c..0000000 --- a/src/views/extension/printer.vue +++ /dev/null @@ -1,366 +0,0 @@ - - - - - diff --git a/src/views/form/advanced.vue b/src/views/form/advanced.vue deleted file mode 100644 index 749a2cb..0000000 --- a/src/views/form/advanced.vue +++ /dev/null @@ -1,401 +0,0 @@ - - - - - diff --git a/src/views/form/basic.vue b/src/views/form/basic.vue deleted file mode 100644 index 3ef4377..0000000 --- a/src/views/form/basic.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - diff --git a/src/views/form/step.vue b/src/views/form/step.vue deleted file mode 100644 index a2ef824..0000000 --- a/src/views/form/step.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - diff --git a/src/views/statistic/sound/road/index.vue b/src/views/home/index.vue similarity index 66% rename from src/views/statistic/sound/road/index.vue rename to src/views/home/index.vue index 95a13bd..d268f81 100644 --- a/src/views/statistic/sound/road/index.vue +++ b/src/views/home/index.vue @@ -1,12 +1,13 @@ diff --git a/src/views/list/advanced.vue b/src/views/list/advanced.vue deleted file mode 100644 index 5c55f53..0000000 --- a/src/views/list/advanced.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - - - diff --git a/src/views/list/basic.vue b/src/views/list/basic.vue deleted file mode 100644 index ff6972b..0000000 --- a/src/views/list/basic.vue +++ /dev/null @@ -1,335 +0,0 @@ - - - - - diff --git a/src/views/list/card/application.vue b/src/views/list/card/application.vue deleted file mode 100644 index 20deabc..0000000 --- a/src/views/list/card/application.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - - - diff --git a/src/views/list/card/article.vue b/src/views/list/card/article.vue deleted file mode 100644 index 7c825b3..0000000 --- a/src/views/list/card/article.vue +++ /dev/null @@ -1,234 +0,0 @@ - - - - - diff --git a/src/views/list/card/index.vue b/src/views/list/card/index.vue deleted file mode 100644 index 02eacb9..0000000 --- a/src/views/list/card/index.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/src/views/list/card/project.vue b/src/views/list/card/project.vue deleted file mode 100644 index 965b939..0000000 --- a/src/views/list/card/project.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - diff --git a/src/views/collect/sound/road/index.vue b/src/views/sound/function/index.vue similarity index 88% rename from src/views/collect/sound/road/index.vue rename to src/views/sound/function/index.vue index f07d1e1..b19928e 100644 --- a/src/views/collect/sound/road/index.vue +++ b/src/views/sound/function/index.vue @@ -34,7 +34,7 @@ -