diff --git a/package-lock.json b/package-lock.json index 9d2bf0d..9eae4c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1902,17 +1902,6 @@ "webpack-merge": "^4.2.2" }, "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "copy-webpack-plugin": { "version": "5.1.2", "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz", @@ -2003,32 +1992,6 @@ "requires": { "minipass": "^3.1.1" } - }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } } } }, @@ -11545,6 +11508,50 @@ "vue-style-loader": "^4.1.0" } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "hash-sum": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz", + "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "vue-router": { "version": "3.6.5", "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz", diff --git a/src/store/modules/user.js b/src/store/modules/user.js index f6fb7a4..197dc87 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -52,8 +52,10 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user + const roles = res.roles const avatar = (user.avatar == "" || user.avatar == null) ? '' : process.env.VUE_APP_BASE_API + user.avatar; localStorage.setItem('user',Object.keys(user).length && JSON.stringify(user)) + localStorage.setItem('roles',roles.length && JSON.stringify(roles)) if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) diff --git a/src/utils/nationWide.js b/src/utils/nationWide.js index 512f922..0a1cb36 100644 --- a/src/utils/nationWide.js +++ b/src/utils/nationWide.js @@ -23,46 +23,57 @@ let cityList = [ { name: "阳泉市", data: require("../../public/static/jsonArea/阳泉市.json"), + code: 140300, }, { name: "大同市", data: require("../../public/static/jsonArea/大同市.json"), + code: 140200, }, { name: "朔州市", data: require("../../public/static/jsonArea/朔州市.json"), + code: 140600, }, { name: "忻州市", data: require("../../public/static/jsonArea/忻州市.json"), + code: 140900, }, { name: "太原市", data: require("../../public/static/jsonArea/太原市.json"), + code: 140100, }, { name: "吕梁市", data: require("../../public/static/jsonArea/吕梁市.json"), + code: 141100, }, { name: "晋中市", data: require("../../public/static/jsonArea/晋中市.json"), + code: 140700, }, { name: "长治市", data: require("../../public/static/jsonArea/长治市.json"), + code: 140400, }, { name: "临汾市", data: require("../../public/static/jsonArea/临汾市.json"), + code: 141000, }, { name: "晋城市", data: require("../../public/static/jsonArea/晋城市.json"), + code: 140500, }, { name: "运城市", data: require("../../public/static/jsonArea/运城市.json"), + code: 140800, }, // 内蒙古自治区 { @@ -88,6 +99,7 @@ let cityList = [ { name: "上海市", code: 310000, + data: require("../../public/static/json/shanghai.json"), }, { @@ -97,6 +109,8 @@ let cityList = [ }, { name: "浙江省", + + code: 330000, data: require("../../public/static/json/zhejiang.json"), }, diff --git a/src/views/cygh/components/fxcy.vue b/src/views/cygh/components/fxcy.vue index bf3e9ef..3d641b0 100644 --- a/src/views/cygh/components/fxcy.vue +++ b/src/views/cygh/components/fxcy.vue @@ -4,10 +4,10 @@
+ +