elink-star
/
epdc-admin-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://121.42.41.42:7070/r/epdc-admin-yushan 

# Conflicts:
#	src/views/modules/epidemic/echarts.vue
#	src/views/modules/epidemic/epidemicreportuserinfo.vue
#	src/views/modules/vim/vaccinationinfo-add-or-update.vue
origin/feature/monitoring
zhangyuan 4 years ago
parent
a768455220 19f5a5c60c
commit
eeb1483064
14 changed files with 184 additions and 184 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/i18n/zh-CN.js
  2. 40
      src/views/modules/epidemic/echarts.vue
  3. 2
      src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
  4. 72
      src/views/modules/epidemic/epidemicreportuserinfo.vue
  5. 4
      src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
  6. 14
      src/views/modules/epidemic/epidemicuserinfo.vue
  7. 24
      src/views/modules/epidemic/regist.vue
  8. 2
      src/views/modules/property/group-detail.vue
  9. 8
      src/views/modules/sys/dept-add-or-update.vue
  10. 6
      src/views/modules/sys/dept.vue
  11. 128
      src/views/modules/sys/reportmacode.vue
  12. 28
      src/views/modules/vim/vaccinationinfo-add-or-update.vue
  13. 2
      src/views/modules/worklog/worklog.vue
  14. 18
      src/views/pages/login.vue

18
src/i18n/zh-CN.js
View File

@ -84,15 +84,15 @@ t.home = {}
t.home.desc = {} t.home.desc = {}
t.home.desc.title = '项目介绍' t.home.desc.title = '项目介绍'
t.home.desc.list = [ t.home.desc.list = [
'Renren-cloud人人微服务平台，是基于Spring Cloud打造的微服务平台，为企业提供一站式微服务解决方案', 'Renren-cloud人人微服务平台，是基于Spring Cloud打造的微服务平台，为企业提供一站式微服务解决方案',
'基于最新的Spring Cloud Finchley.SR2、Spring Cloud Gateway、Spring Boot 2.0、Mybatis、Element 2.0+开发', '基于最新的Spring Cloud Finchley.SR2、Spring Cloud Gateway、Spring Boot 2.0、Mybatis、Element 2.0+开发',
'代码风格优雅简洁、通俗易懂，且符合《阿里巴巴Java开发手册》规范要求，可作为企业代码规范', '代码风格优雅简洁、通俗易懂，且符合《阿里巴巴Java开发手册》规范要求，可作为企业代码规范',
'优秀的菜单功能权限，前端可灵活控制页面及按钮的展示，后端可对未授权的请求进行拦截', '优秀的菜单功能权限，前端可灵活控制页面及按钮的展示，后端可对未授权的请求进行拦截',
'优秀的数据权限管理，只需增加相应注解，无需其他任何代码，即可实现数据过滤，达到数据权限目的', '优秀的数据权限管理，只需增加相应注解，无需其他任何代码，即可实现数据过滤，达到数据权限目的',
'灵活的角色权限管理，新增角色时，角色权限只能是创建者权限的子集，可有效防止权限越权', '灵活的角色权限管理，新增角色时，角色权限只能是创建者权限的子集，可有效防止权限越权',
'灵活的日志管理，可查看登录日志、操作日志、异常日志，方便审计及BUG定位', '灵活的日志管理，可查看登录日志、操作日志、异常日志，方便审计及BUG定位',
'灵活的国际化配置，目前已支持简体中文、繁体中文、English，如需增加新语言，只需增加新语言[i18n]文件即可', '灵活的国际化配置，目前已支持简体中文、繁体中文、English，如需增加新语言，只需增加新语言[i18n]文件即可',
'灵活的前端动态路由，新增页面无需修改路由文件，也可在页面动态新增tab标签' '灵活的前端动态路由，新增页面无需修改路由文件，也可在页面动态新增tab标签'
] ]
/* 模块 */ /* 模块 */

40
src/views/modules/epidemic/echarts.vue
View File

@ -23,28 +23,28 @@
<script> <script>
export default { export default {
name: "hellowEcharts", name: 'hellowEcharts',
data() { data () {
return { return {
title: "平阴县", title: '平阴县',
outStreet:'', outStreet: '',
outStreetArr:[], outStreetArr: [],
barName:'', barName: '',
peopleNumber : [1,2,3], peopleNumber: [1, 2, 3],
orgOptions:{} orgOptions: {}
} }
}, },
created: function () { created: function () {
this.getDailyTypeArrInfo() this.getDailyTypeArrInfo()
this.getPeopleNumber(""); this.getPeopleNumber('')
}, },
mounted() { mounted () {
// this.drawLine(); // this.drawLine();
this.orgOptions = { this.orgOptions = {
tooltip: {}, tooltip: {},
xAxis: { xAxis: {
type: 'category', type: 'category',
data: ["外地人数", "返乡人数", "现住外地人数"] data: ['外地人数', '返乡人数', '现住外地人数']
}, },
yAxis: { yAxis: {
type: 'value' type: 'value'
@ -52,28 +52,28 @@ export default {
series: [{ series: [{
data: [0, 0, 0], data: [0, 0, 0],
type: 'bar', type: 'bar',
name:"人员情况", name: '人员情况',
label: { label: {
show: true, show: true,
position: 'top', position: 'top',
color: 'rgba(20, 101, 230, 1)' color: 'rgba(20, 101, 230, 1)'
}, }
}] }]
} }
}, },
methods: { methods: {
// 获取乡镇下拉信息(传参：4代表查“街道”) // 获取乡镇下拉信息(传参：4代表查“街道”)
getDailyTypeArrInfo () { getDailyTypeArrInfo () {
this.$http.get(`/sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => { this.$http.get(`sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
this.outStreetArr = res this.outStreetArr = res
}).catch(() => {}) }).catch(() => {})
}, },
// 乡镇取值变化事件 // 乡镇取值变化事件
selectModel (event) { selectModel (event) {
if (event == ''){ if (event === '') {
this.title = '平阴县' this.title = '平阴县'
this.barName = '平阴县' this.barName = '平阴县'
this.getPeopleNumber(event); this.getPeopleNumber(event)
} }
this.outStreetArr.find((item) => { this.outStreetArr.find((item) => {
if (item.dictValue === event) { if (item.dictValue === event) {
@ -84,11 +84,11 @@ export default {
} }
}) })
}, },
getPeopleNumber(item){ getPeopleNumber (item) {
if (item == ""){ if (item === '') {
item = 0 item = 0
} }
this.$http.get(`/sys/select/getPeopleNumber/`+item).then(({ data: res }) => { this.$http.get(`select/getPeopleNumber/` + item).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

2
src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
View File

@ -494,7 +494,7 @@ export default {
], ],
gender: [ gender: [
{ dictValue: '男', dictName: '男' }, { dictValue: '男', dictName: '男' },
{ dictValue: '女', dictName: '女' }, { dictValue: '女', dictName: '女' }
], ],
vueLoading: true vueLoading: true
} }

72
src/views/modules/epidemic/epidemicreportuserinfo.vue
View File

@ -280,19 +280,19 @@
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './epidemicreportuserinfo-add-or-update' import AddOrUpdate from './epidemicreportuserinfo-add-or-update'
import InfoDetail from './epidemicreportuserinfoDetail' import InfoDetail from './epidemicreportuserinfoDetail'
import qs from "qs"; import qs from 'qs'
import Cookies from "js-cookie"; import Cookies from 'js-cookie'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/sys/epidemicuserinfo/page', getDataListURL: 'sys/epidemicuserinfo/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/sys/epidemicuserinfo', deleteURL: 'sys/epidemicuserinfo',
deleteIsBatch: true, deleteIsBatch: true,
exportURL: '/sys/epidemicuserinfo/export', exportURL: 'sys/epidemicuserinfo/export',
exportErrorInfoURL: '/sys/epidemicusererror/export' exportErrorInfoURL: 'sys/epidemicusererror/export'
}, },
dataForm: { dataForm: {
id: '', id: '',
@ -335,20 +335,20 @@ export default {
{ dictValue: 2, dictName: '在外地' } { dictValue: 2, dictName: '在外地' }
], ],
inoculateStateArr: [ inoculateStateArr: [
{dictValue: '0', dictName: '未接种'}, { dictValue: '0', dictName: '未接种' },
{dictValue: '10', dictName: '接种中'}, { dictValue: '10', dictName: '接种中' },
{dictValue: '11', dictName: '接种完成'}, { dictValue: '11', dictName: '接种完成' },
{dictValue: '1', dictName: '第一针'}, { dictValue: '1', dictName: '第一针' },
{dictValue: '2', dictName: '第二针'} { dictValue: '2', dictName: '第二针' }
], ],
ageStateArr: [ ageStateArr: [
{dictValue: '0', dictName: '0-18岁'}, { dictValue: '0', dictName: '0-18岁' },
{dictValue: '1', dictName: '19-19岁'}, { dictValue: '1', dictName: '19-19岁' },
{dictValue: '2', dictName: '20-29岁'}, { dictValue: '2', dictName: '20-29岁' },
{dictValue: '3', dictName: '30-39岁'}, { dictValue: '3', dictName: '30-39岁' },
{dictValue: '4', dictName: '40-49岁'}, { dictValue: '4', dictName: '40-49岁' },
{dictValue: '5', dictName: '50-59岁'}, { dictValue: '5', dictName: '50-59岁' },
{dictValue: '6', dictName: '60岁以上'} { dictValue: '6', dictName: '60岁以上' }
], ],
companyStateArr: [], companyStateArr: [],
exportTemplate: false, exportTemplate: false,
@ -402,21 +402,21 @@ export default {
}, },
// 获取乡镇下拉信息(传参：4代表查“街道”) // 获取乡镇下拉信息(传参：4代表查“街道”)
getDailyTypeArrInfo () { getDailyTypeArrInfo () {
this.$http.get(`/sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => { this.$http.get(`sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
this.outStreetArr = res this.outStreetArr = res
}).catch(() => { }) }).catch(() => { })
}, },
getcompantyOptions () { getcompantyOptions () {
this.$http this.$http
.get(`/sys/vaccinecompany/getCompantyList`) .get(`sys/vaccinecompany/getCompantyList`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.companyStateArr = res.data this.companyStateArr = res.data
}) })
.catch(() => { .catch(() => {
}) })
}, },
// 乡镇取值变化事件 // 乡镇取值变化事件
selectModel (event) { selectModel (event) {
@ -428,7 +428,7 @@ export default {
}, },
getOptions () { getOptions () {
this.$http this.$http
.get(`/sys/select/getSysArea`) .get(`sys/select/getSysArea`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -475,13 +475,13 @@ export default {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '下载成功' message: '下载成功'
}); })
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消下载' message: '已取消下载'
}); })
}); })
} else { } else {
this.$message.error(response.msg) this.$message.error(response.msg)
} }
@ -507,14 +507,14 @@ export default {
} }
}, },
showRegistFormat (row, column) { showRegistFormat (row, column) {
if (row.isInoculate == 0) { if (row.isInoculate === 0) {
return '否' return '否'
} else { } else {
return '是' return '是'
} }
}, },
returnriskGradeFormat (row, column) { returnriskGradeFormat (row, column) {
//1:低风险，2：中风险，3：高风险 // 1:低风险，2：中风险，3：高风险
if (row.riskGrade === 1 || row.riskGrade === '1') { if (row.riskGrade === 1 || row.riskGrade === '1') {
return '低风险' return '低风险'
} else if (row.returnState === 2 || row.returnState === '2') { } else if (row.returnState === 2 || row.returnState === '2') {
@ -525,9 +525,9 @@ export default {
return '' return ''
} }
}, },
//打开导出弹框 // 打开导出弹框
exports () { exports () {
this.dialogVisibleExcel = true; this.dialogVisibleExcel = true
} }
} }
} }

4
src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
View File

@ -493,7 +493,7 @@ export default {
], ],
gender: [ gender: [
{ dictValue: '男', dictName: '男' }, { dictValue: '男', dictName: '男' },
{ dictValue: '女', dictName: '女' }, { dictValue: '女', dictName: '女' }
], ],
vueLoading: true vueLoading: true
} }
@ -520,7 +520,7 @@ export default {
this.dataForm.destinationAddressCodes = [] this.dataForm.destinationAddressCodes = []
// this.getOptions() // this.getOptions()
this.getLiveOptions() this.getLiveOptions()
this.vueLoading=false this.vueLoading = false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {

14
src/views/modules/epidemic/epidemicuserinfo.vue
View File

@ -202,7 +202,7 @@
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './regist' import AddOrUpdate from './regist'
import InfoDetail from './epidemicreportuserinfoDetail' import InfoDetail from './epidemicreportuserinfoDetail'
import Cookies from "js-cookie"; import Cookies from 'js-cookie'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
@ -356,13 +356,13 @@ export default {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '下载成功' message: '下载成功'
}); })
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消下载' message: '已取消下载'
}); })
}); })
} else { } else {
this.$message.error(response.msg) this.$message.error(response.msg)
} }
@ -388,7 +388,7 @@ export default {
} }
}, },
returnriskGradeFormat (row, column) { returnriskGradeFormat (row, column) {
//1:低风险，2：中风险，3：高风险 // 1:低风险，2：中风险，3：高风险
if (row.riskGrade === 1 || row.riskGrade === '1') { if (row.riskGrade === 1 || row.riskGrade === '1') {
return '低风险' return '低风险'
} else if (row.returnState === 2 || row.returnState === '2') { } else if (row.returnState === 2 || row.returnState === '2') {
@ -399,9 +399,9 @@ export default {
return '' return ''
} }
}, },
//打开导出弹框 // 打开导出弹框
exports () { exports () {
this.dialogVisibleExcel = true; this.dialogVisibleExcel = true
} }
} }
} }

24
src/views/modules/epidemic/regist.vue
View File

@ -172,16 +172,16 @@ export default {
companyOptions: [], companyOptions: [],
siteOptions: [], siteOptions: [],
vaccinationStateOptions: [ vaccinationStateOptions: [
{value: 0, label: '未接种'}, { value: 0, label: '未接种' },
{value: 1, label: '接种中'}, { value: 1, label: '接种中' },
{value: 2, label: '接种完成'}, { value: 2, label: '接种完成' }
], ],
isAble: false, isAble: false,
showFlagIn: true, showFlagIn: true,
showFlagOut: true, showFlagOut: true,
gender: [ gender: [
{ dictValue: '男', dictName: '男' }, { dictValue: '男', dictName: '男' },
{ dictValue: '女', dictName: '女' }, { dictValue: '女', dictName: '女' }
], ],
vueLoading: true, vueLoading: true,
id: '' id: ''
@ -278,9 +278,9 @@ export default {
}).catch(() => { }) }).catch(() => { })
if (this.dataForm.companyId !== this.historyCompanyId) { if (this.dataForm.companyId !== this.historyCompanyId) {
this.dataForm.vaccinationState = 1 this.dataForm.vaccinationState = 1
return this.$message.warning("与上次接种疫苗厂家不同") return this.$message.warning('与上次接种疫苗厂家不同')
} else { } else {
if (this.dataForm.dose === this.maxDose){ if (this.dataForm.dose === this.maxDose) {
this.dataForm.vaccinationState = 2 this.dataForm.vaccinationState = 2
} else { } else {
this.dataForm.vaccinationState = 1 this.dataForm.vaccinationState = 1
@ -289,12 +289,12 @@ export default {
}, },
doseChange (event) { doseChange (event) {
// if (this.dataForm.distinctNum < 2){ // if (this.dataForm.distinctNum < 2){
if (event === this.maxDose && (this.dataForm.companyId === this.historyCompanyId || this.historyCompanyId === 0)){ if (event === this.maxDose && (this.dataForm.companyId === this.historyCompanyId || this.historyCompanyId === 0)) {
// if (event === this.maxDose && this.dataForm.vaccinationNum + 1 === event && this.dataForm.companyId === this.historyCompanyId){ // if (event === this.maxDose && this.dataForm.vaccinationNum + 1 === event && this.dataForm.companyId === this.historyCompanyId){
this.dataForm.vaccinationState = 2 this.dataForm.vaccinationState = 2
} else { } else {
this.dataForm.vaccinationState = 1 this.dataForm.vaccinationState = 1
} }
// } else { // } else {
// this.dataForm.vaccinationState = 1 // this.dataForm.vaccinationState = 1
// } // }

2
src/views/modules/property/group-detail.vue
View File

@ -178,7 +178,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
if (res.data.resultCode == 1) { if (res.data.resultCode === 1) {
this.$confirm(res.data.resultMessage, '提示', { this.$confirm(res.data.resultMessage, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

8
src/views/modules/sys/dept-add-or-update.vue
View File

@ -103,7 +103,7 @@ export default {
label: 'name', label: 'name',
children: 'children' children: 'children'
}, },
areaCodeOptions:[], areaCodeOptions: [],
secondOrgDictList: [] secondOrgDictList: []
} }
}, },
@ -166,7 +166,7 @@ export default {
}, },
// 获取区域编码 // 获取区域编码
getAreaCodeOption () { getAreaCodeOption () {
return this.$http.get('/sys/dept/getEpmetAreaCode',{ params: { rootAreaCode: '370124', rootAreaLevel: 'district' }}).then(({ data: res }) => { return this.$http.get('/sys/dept/getEpmetAreaCode', { params: { rootAreaCode: '370124', rootAreaLevel: 'district' } }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -216,8 +216,8 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
this.dataForm.areaCode = this.dataForm.allAreaCode[this.dataForm.allAreaCode.length - 1]; this.dataForm.areaCode = this.dataForm.allAreaCode[this.dataForm.allAreaCode.length - 1]
this.dataForm.allAreaCode = this.dataForm.allAreaCode.toString(); this.dataForm.allAreaCode = this.dataForm.allAreaCode.toString()
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dept', this.dataForm).then(({ data: res }) => { this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dept', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)

6
src/views/modules/sys/dept.vue
View File

@ -51,20 +51,20 @@ export default {
label: 'name', label: 'name',
children: 'children' children: 'children'
}, },
areaCodeOptions:[] areaCodeOptions: []
} }
}, },
components: { components: {
TableTreeColumn, TableTreeColumn,
AddOrUpdate AddOrUpdate
}, },
mounted() { mounted () {
this.getAreaCodeOption() this.getAreaCodeOption()
}, },
methods: { methods: {
// 获取区域编码 // 获取区域编码
getAreaCodeOption () { getAreaCodeOption () {
return this.$http.get('/sys/dept/getEpmetAreaCode',{ params: { rootAreaCode: '370124', rootAreaLevel: 'district' }}).then(({ data: res }) => { return this.$http.get('/sys/dept/getEpmetAreaCode', { params: { rootAreaCode: '370124', rootAreaLevel: 'district' } }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

128
src/views/modules/sys/reportmacode.vue
View File

@ -120,7 +120,7 @@ export default {
communityList: [], communityList: [],
gridList: [], gridList: [],
maCodeCategorys: [ maCodeCategorys: [
{ id: '0', name: '群众注册码' }, { id: '0', name: '群众注册码' }
] ]
} }
}, },
@ -130,14 +130,14 @@ export default {
created () { created () {
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicSentryPost/importExcel?token=${Cookies.get('token')}` this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicSentryPost/importExcel?token=${Cookies.get('token')}`
this.$http this.$http
.get(`/sys/user/deptOptions/getBusinessDeptByUser`) .get(`/sys/user/deptOptions/getBusinessDeptByUser`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.options = res.data.options this.options = res.data.options
}) })
.catch(() => { }) .catch(() => { })
}, },
watch: { watch: {
'deptIdList': function (val) { 'deptIdList': function (val) {
@ -166,33 +166,33 @@ export default {
methods: { methods: {
createDeptMaCodeHandle (id) { createDeptMaCodeHandle (id) {
this.$confirm( this.$confirm(
this.$t('prompt.info', { handle: '生成网格报事码' }), this.$t('prompt.info', { handle: '生成网格报事码' }),
this.$t('生成'), this.$t('生成'),
{ {
confirmButtonText: this.$t('confirm'), confirmButtonText: this.$t('confirm'),
cancelButtonText: this.$t('cancel'), cancelButtonText: this.$t('cancel'),
type: 'warning' type: 'warning'
} }
) )
.then(() => { .then(() => {
this.$http this.$http
.post(`/sys/reportmacode/create/${id}`) .post(`/sys/reportmacode/create/${id}`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
type: 'success', type: 'success',
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.getDataList() this.getDataList()
} }
}) })
}) })
.catch(() => { }) .catch(() => { })
}) })
.catch(() => { }) .catch(() => { })
}, },
initDeptMaCodeHandle () { initDeptMaCodeHandle () {
this.$confirm('加载全部网格，加载完成后可在操作栏生成网格报事码', this.$t('初始化'), { this.$confirm('加载全部网格，加载完成后可在操作栏生成网格报事码', this.$t('初始化'), {
@ -200,36 +200,36 @@ export default {
cancelButtonText: this.$t('cancel'), cancelButtonText: this.$t('cancel'),
type: 'warning' type: 'warning'
}) })
.then(() => { .then(() => {
let loading = this.$loading({ let loading = this.$loading({
lock: true, lock: true,
text: '正在进行初始化...', text: '正在进行初始化...',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
})
this.$http
.post(`/sys/reportmacode/initDeptForMaCode`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
loading.close()
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.getDataList()
}
})
})
.catch(() => {
loading.close()
})
})
.catch(() => {
loading.close()
}) })
this.$http
.post(`/sys/reportmacode/initDeptForMaCode`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
loading.close()
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.getDataList()
}
})
})
.catch(() => {
loading.close()
})
})
.catch(() => {
// loading.close()
})
}, },
clearDataForm () { clearDataForm () {
this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null

28
src/views/modules/vim/vaccinationinfo-add-or-update.vue
View File

@ -114,7 +114,7 @@ export default {
}, },
// 获取信息 // 获取信息
getInfo () { getInfo () {
this.$http.get(`/sys/vaccinationinfo/${this.dataForm.id}`).then(({ data: res }) => { this.$http.get(`sys/vaccinationinfo/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -129,21 +129,21 @@ export default {
}, },
getSiteOptions () { getSiteOptions () {
this.$http this.$http
.get(`/sys/vaccinationsite/getSiteList`) .get(`sys/vaccinationsite/getSiteList`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.siteOptions = res.data this.siteOptions = res.data
this.vueLoading = false this.vueLoading = false
this.isAble = false this.isAble = false
}) })
.catch(() => { .catch(() => {
}) })
}, },
getCompantyOptions () { getCompantyOptions () {
this.$http this.$http
.get(`/sys/vaccinecompany/getCompantyList`) .get(`sys/vaccinecompany/getCompantyList`)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -161,7 +161,7 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/vaccinationinfo/', this.dataForm).then(({ data: res }) => { this.$http[!this.dataForm.id ? 'post' : 'put']('sys/vaccinationinfo/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

2
src/views/modules/worklog/worklog.vue
View File

@ -7,7 +7,7 @@
<script> <script>
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
export default { export default {
data() { data () {
return { return {
url: '' url: ''
} }

18
src/views/pages/login.vue
View File

@ -152,15 +152,15 @@ export default {
this.checkLocakStorage() this.checkLocakStorage()
}).catch(() => { }) }).catch(() => { })
this.$http.get(`/api/plugins/workLog/getCustomId`) this.$http.get(`/api/plugins/workLog/getCustomId`)
.then(res => { .then(res => {
if (res.data.code !== 0) { if (res.data.code !== 0) {
return this.$message.error(res.data.msg) return this.$message.error(res.data.msg)
} }
Cookies.set('customerId',res.data.data) Cookies.set('customerId', res.data.data)
}) })
.catch((err) => { .catch((err) => {
console.log(err) console.log(err)
}) })
}) })
}, 1000, { 'leading': true, 'trailing': false }), }, 1000, { 'leading': true, 'trailing': false }),
checkLocakStorage () { checkLocakStorage () {

Write Preview
Loading…
Cancel
Save