diff --git a/package-lock.json b/package-lock.json index 925db85..d96158c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "echarts": "~5.1.2", "echarts-wordcloud": "~2.0.0", "ele-admin-pro": "~1.5.0", + "lodash": "^4.17.21", "nprogress": "~0.2.0", "tinymce": "~5.8.2", "vue": "~3.1.5", @@ -4837,11 +4838,6 @@ "vue": ">=3.1.0" } }, - "node_modules/ant-design-vue/node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -11738,9 +11734,9 @@ } }, "node_modules/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash-es": { "version": "4.17.21", @@ -15526,12 +15522,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/renderkid/node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "node_modules/renderkid/node_modules/nth-check": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", @@ -17869,12 +17859,6 @@ "node": ">=8.0.0" } }, - "node_modules/vue-eslint-parser/node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "node_modules/vue-eslint-parser/node_modules/semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -23031,13 +23015,6 @@ "shallow-equal": "^1.0.0", "vue-types": "^3.0.0", "warning": "^4.0.0" - }, - "dependencies": { - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - } } }, "any-promise": { @@ -28497,9 +28474,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { "version": "4.17.21", @@ -31492,12 +31469,6 @@ "domhandler": "^4.2.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "nth-check": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", @@ -33463,12 +33434,6 @@ "estraverse": "^4.1.1" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", diff --git a/package.json b/package.json index e108300..0a99c94 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "echarts": "~5.1.2", "echarts-wordcloud": "~2.0.0", "ele-admin-pro": "~1.5.0", + "lodash": "^4.17.21", "nprogress": "~0.2.0", "tinymce": "~5.8.2", "vue": "~3.1.5", diff --git a/src/api/ecology/road_sound.js b/src/api/ecology/road_sound.js index 0fc8325..0646bb8 100644 --- a/src/api/ecology/road_sound.js +++ b/src/api/ecology/road_sound.js @@ -1,7 +1,55 @@ -// import axios from 'axios'; -const pageBillUrl = '/ecology/sound/road/bill/page'; +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 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, + pageRoadSoundUrl, + saveRoadSound, + removeRoadSound, + updateRoadSound, + removeBatchRoadSound } diff --git a/src/config/axios-config.js b/src/config/axios-config.js index 7f36115..ef2178a 100644 --- a/src/config/axios-config.js +++ b/src/config/axios-config.js @@ -46,9 +46,6 @@ axios.interceptors.response.use((res) => { if (access_token) { setting.cacheToken(access_token); } - if(res.data.code != 0){ - return Promise.reject(res.data.msg); - } return res; }, (error) => { return Promise.reject(error); diff --git a/src/config/setting.js b/src/config/setting.js index 390795f..d1f899c 100644 --- a/src/config/setting.js +++ b/src/config/setting.js @@ -11,7 +11,7 @@ export default { // 不需要登录的路由 whiteList: ['/login', '/forget'], // 菜单数据接口 - menuUrl: '/main/menu?type=pro', + menuUrl: '/main/menu', // 自定义解析菜单接口数据 parseMenu: null, // 自定义解析菜单接口单个数据格式 @@ -49,9 +49,9 @@ export default { // 首页路径, 为空会自动获取 homePath: null, // 顶栏是否显示主题设置按钮 - showSetting: true, + showSetting: false, // 开启多页签是否缓存组件 - tabKeepAlive: true, + tabKeepAlive: false, // 是否折叠侧边栏 collapse: false, // 侧边栏风格: light(亮色), dark(暗色) @@ -61,7 +61,7 @@ export default { // 标签页风格: default(默认), dot(圆点), card(卡片) tabStyle: 'default', // 布局风格: side(默认), top(顶栏菜单), mix(混合菜单) - layoutStyle: 'side', + layoutStyle: 'mix', // 侧边栏菜单风格: default(默认), mix(双排菜单) sideMenuStyle: 'default', // 是否固定侧栏 diff --git a/src/layout/header-right.vue b/src/layout/header-right.vue index 5a3d6ae..51e05c1 100644 --- a/src/layout/header-right.vue +++ b/src/layout/header-right.vue @@ -32,12 +32,12 @@