diff --git a/src/assets/images/user.png b/src/assets/images/user.png new file mode 100644 index 0000000..7e0a552 --- /dev/null +++ b/src/assets/images/user.png diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 7a0ed97..31ce320 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -3,8 +3,6 @@ import { getToken, setToken, removeToken } from '@/utils/auth' import { resetRouter } from '@/router' import md5 from "js-md5"; // 密码加密 const define = require('@/utils/define') -import qs from 'qs' - const user = { state: { @@ -82,7 +80,10 @@ const user = { return new Promise((resolve, reject) => { getInfo().then((res) => { let { menuList, userInfo, permissionList } = res.data - const avatar = (userInfo.headIcon == "" || userInfo.headIcon == null) || require("@/assets/images/user.jpg"); + const avatar = (userInfo.headIcon == '/api/File/Image/userAvatar/') ? require("@/assets/images/user.png") : userInfo.headIcon; + // const avatar = (userInfo.headIcon == "" || userInfo.headIcon == null) || require("@/assets/images/user.jpg"); + console.log(avatar); + if (!menuList.length) { reject('您的权限不足,请联系管理员') commit('SET_LOGIN_LOADING', false) diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue index 4963475..8796b6c 100644 --- a/src/views/DisposalSuggestions/Form.vue +++ b/src/views/DisposalSuggestions/Form.vue @@ -109,7 +109,7 @@
{{ dataForm.areaName || "--" }}
- +
研判信息{{ i + 1 }}
处置类型:
@@ -120,7 +120,7 @@
{{ v.judgmentOpinion }}
- +
处置信息{{ index + 1 }}
处置结果:
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue index 8049d84..344f0af 100644 --- a/src/views/baseCaseHandling/Form.vue +++ b/src/views/baseCaseHandling/Form.vue @@ -620,6 +620,9 @@ export default { // this.companyChange(res.data.registeredEntity, 'change'); this.dataForm = res.data; this.loading = false; + this.$nextTick(() => { + this.getSystemSelect(res.data.registeredEntity) + }) }).catch(() => { this.loading = false; }); diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue index f9c055a..d96f52c 100644 --- a/src/views/baseSystemInfo/DetailForm.vue +++ b/src/views/baseSystemInfo/DetailForm.vue @@ -35,7 +35,7 @@

{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}

- +
备案号:

{{ dataForm.systemRecordNumber || "--" }}

@@ -299,8 +299,11 @@ import { getSystemDetail, getUpdataRecord } from "@/api/baseData/info"; import { getCompanyInfoById } from "@/api/baseData/company"; import HandForm from '@/views/baseCaseHandling/Form.vue' // 案件处理 import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理 +import infoMixin from "@/mixins/info"; + export default { components: {HandForm, ReportForm}, + mixins: [infoMixin], props: ['areaOptions'], data() { return { @@ -346,6 +349,7 @@ export default { stateOptions: [], HandFormVisible: false, ReportFormVisible: false, + specialRecordTypeOption: [], }; }, computed: { @@ -357,9 +361,10 @@ export default { } }, watch: {}, - created() { + async created() { this.initStateTypeOption(); this.initSystemTypeList(); + await this.initSpecialRecordTypeOption(); }, mounted() {}, methods: { @@ -411,6 +416,7 @@ export default { await this.initSystemClassList(data.systemType); this.dataForm = data; this.dataForm.companyName = companyName; + this.dataForm.specialRecordType && (this.dataForm.specialRecordType = this.specialRecordTypeOption.find(v => v.id == this.dataForm.specialRecordType).fullName); this.loading = false; }, async initSystemTypeList() { diff --git a/src/views/homePage/components/Header.vue b/src/views/homePage/components/Header.vue index c349195..51546ed 100644 --- a/src/views/homePage/components/Header.vue +++ b/src/views/homePage/components/Header.vue @@ -21,7 +21,7 @@
- + @@ -39,6 +39,10 @@ export default { }, mounted() {}, methods: { + visbleUserInfoRefresh() { + this.avatar = process.env.VUE_APP_BASE_API + this.$store.state.user.avatar; + this.visbleUserInfo = false; + }, async logout() { await this.$store.dispatch("LogOut"); this.$router.push({ path: "/login" }); diff --git a/src/views/homePage/components/UserInfoPage.vue b/src/views/homePage/components/UserInfoPage.vue index d3e9b26..a27b954 100644 --- a/src/views/homePage/components/UserInfoPage.vue +++ b/src/views/homePage/components/UserInfoPage.vue @@ -38,7 +38,7 @@ 保存 - 关闭 + 关闭 @@ -95,6 +95,8 @@ export default { handleSuccess(res, file) { if (res.code == 200) { this.updateAvatar(res.data); + this.$emit('changeAvatar', res.data); + // this.logout(); } else { this.$message({ message: "上传失败", @@ -103,6 +105,10 @@ export default { }); } }, + async logout() { + await this.$store.dispatch("LogOut"); + this.$router.push({ path: "/login" }); + }, updateAvatar(data) { UpdateAvatar(data.name).then((res) => { this.user.avatar = data.url; @@ -136,6 +142,10 @@ export default { }) }, + close() { + this.visible = false; + this.$emit("refresh"); + } }, };