pengjun 3 months ago
parent
commit
029c945aef
  1. 2
      src/views/customerReport/personnelPositive.vue
  2. 7
      src/views/login/Login.vue

2
src/views/customerReport/personnelPositive.vue

@ -79,7 +79,7 @@
<el-table-column :label="summary.customerOrgName">
<el-table-column :label="`开始时间 ${summary.startDate || ''} 结束时间${summary.endDate || ''
} 体检人员共计 ${summary.maleCount + summary.femaleCount
} 男性 ${summary.maleCount} 女性 ${summary.femaleCount}`" align="left">
} 男性 ${summary.maleCount} 女性 ${summary.femaleCount}`" align="left">
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="customerOrgParentName" label="单位" align="center" />
<el-table-column prop="customerOrgName" label="部门" align="center" />

7
src/views/login/Login.vue

@ -131,7 +131,7 @@ export default {
},
computed: {
...mapState(['sysConfig']),
...mapState(['sysConfig','dict']),
},
methods: {
@ -139,9 +139,12 @@ export default {
async getSysConfig() {
try {
let res = await axios.get(`/sysConfig.json?r=${Math.random()}`, { timeout: 50000 }) // , { timeout: 50000 }
console.log('axios.get /sysConfig.json', res)
//console.log('axios.get /sysConfig.json', res)
if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误,请重新刷新本页面!` })
//
this.setData({ key: "sysConfig", value: res.data });
if(res.data?.dict?.completeFlag) this.dict.completeFlag = res.data.dict.completeFlag
// this.sysConfig = res.data
window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data))
} catch (error) {

Loading…
Cancel
Save