Skip to content

S
ShanghaiGongwei
Commit 6f648605 by nlp97
Options

Merge branch 'feature/语言国际化' of… 

Merge branch 'feature/语言国际化' of https://gitlab.suvalue.com/ninglupeng/ShanghaiGongwei into feature/语言国际化

# Conflicts:
#	src/lang/zh.js
parents 594f2e3f 04632820
Showing with 76 additions and 111 deletions
src/components/page5.vue
<!-- <!--
* @Author: ninglupeng * @Author: ninglupeng
* @Date: 2020-11-24 16:18:58 * @Date: 2020-11-24 16:18:58
* @LastEditors: ninglupeng * @LastEditors: wsq
* @LastEditTime: 2022-11-03 13:17:45 * @LastEditTime: 2022-11-03 14:18:38
* @Description: * @Description:
--> -->
<template> <template>
<div class="page5"> <div class="page5">
<van-field colon clearable name="HasOnlineClass" label-width="130px" label="是否上网课"> <van-field colon clearable name="HasOnlineClass" label-width="130px" :label="$t('HasOnlineClass')">
<template #input> <template #input>
<van-radio-group @change="setLocalStorge('HasOnlineClass')" v-model="HasOnlineClass" <van-radio-group @change="setLocalStorge('HasOnlineClass')" v-model="HasOnlineClass"
direction="horizontal"> direction="horizontal">
<van-radio name="是">是</van-radio> <van-radio :name="$t('yes')">{{$t('yes')}}</van-radio>
<van-radio name="否">否</van-radio> <van-radio :name="$t('no')">{{$t('no')}}</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
<van-field colon clearable name="purpose" label="来沪目的" readonly :value="purpose" label-width="130px" <van-field colon clearable name="purpose" :label="$t('purpose')" readonly :value="purpose" label-width="130px"
@click="showPurpose = true"> @click="showPurpose = true">
</van-field> </van-field>
<van-popup v-model="showPurpose" position="bottom"> <van-popup v-model="showPurpose" position="bottom">
<van-picker title="来沪目的" show-toolbar :columns="purposeList" @confirm="onpurpose" /> <van-picker :title="$t('HasOnlineClass')" show-toolbar :columns="purposeList" @confirm="onpurpose" />
</van-popup> </van-popup>
<van-field colon clearable name="workOrNotCovid" label="日常工作是否需要接触新冠病" style="margin-left: 40px;"> <van-field colon clearable name="workOrNotCovid" :label="$t('workOrNotCovid')" style="margin-left: 40px;">
<template #input> <template #input>
<van-radio-group @change="setLocalStorge('workOrNotCovid')" v-model="workOrNotCovid" <van-radio-group @change="setLocalStorge('workOrNotCovid')" v-model="workOrNotCovid"
direction="horizontal"> direction="horizontal">
<van-radio :name="$t('yes')">{{$t('yes')}}</van-radio> <van-radio :name="$t('yes')">{{$t('yes')}}</van-radio>
<van-radio name="否">否</van-radio> <van-radio :name="$t('no')">{{$t('no')}}</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
...@@ -36,50 +36,50 @@ ...@@ -36,50 +36,50 @@
<van-field colon clearable name="thirtyDays" label="近两月是否离开过上海" label-width="130px" <van-field colon clearable name="thirtyDays" :label="$t('thirtyDays')" label-width="130px"
:rules="[{ required: true, message: '请选择近两月是否离开过上海' }]"> :rules="[{ required: true, message: `请选择${$t('thirtyDays')}`}]">
<template #input> <template #input>
<van-radio-group @change=" <van-radio-group @change="
setLocalStorge('thirtyDays') setLocalStorge('thirtyDays')
" v-model="thirtyDays" direction="horizontal"> " v-model="thirtyDays" direction="horizontal">
<van-radio name="是">是</van-radio> <van-radio :name="$t('yes')">{{$t('yes')}}</van-radio>
<van-radio name="否">否</van-radio> <van-radio :name="$t('no')">{{$t('no')}}</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
<van-field v-if="thirtyDays == '是'" colon clearable v-model="LeaveShangHai" name="LeaveShangHai" label="回上海天数" <van-field v-if="thirtyDays == $t('yes')" colon clearable v-model="LeaveShangHai" name="LeaveShangHai" :label="$t('LeaveShangHai')"
label-width="130px" placeholder="回上海天数" type="digit" @blur="setLocalStorge('LeaveShangHai')" :rules="[ label-width="130px" placeholder="回上海天数" type="digit" @blur="setLocalStorge('LeaveShangHai')" :rules="[
{ {
required: thirtyDays == '是' ? true : false, required: thirtyDays == $t('yes') ? true : false,
message: '请填写回上海天数', message: `请填写${$t('LeaveShangHai')}`,
}, },
{ validator, message: '天数不能大于三十天' }, { validator, message: `${$t('More30days')}` },//天数不能大于三十天
]"> ]">
<template #extra v-if="thirtyDays == '是'"> 天</template> <template #extra v-if="thirtyDays == $t('yes')">{{$t('Day')}}</template>
</van-field> </van-field>
<van-field colon clearable readonly clickable name="normalDate" :value="normalDate" label-width="130px" <van-field colon clearable readonly clickable name="normalDate" :value="normalDate" label-width="130px"
label="未发生异常时间" placeholder="点击选择未发生异常时间" @click="showNormalDate = true" :label="$t('normalDate')" :placeholder="`点击选择${$t('normalDate')}`" @click="showNormalDate = true"
:rules="[{ required: true, message: '请选择未发生异常时间' }]" /> :rules="[{ required: true, message: `请选择${$t('normalDate')}` }]" />
<van-popup v-model="showNormalDate" position="bottom"> <van-popup v-model="showNormalDate" position="bottom">
<van-datetime-picker type="date" v-model="normalDate1" :min-date="minNormalDate" :max-date="maxDate" <van-datetime-picker type="date" v-model="normalDate1" :min-date="minNormalDate" :max-date="maxDate"
@confirm="onNormalDate" @cancel="showNormalDate = false" :formatter="formatter" /> @confirm="onNormalDate" @cancel="showNormalDate = false" :formatter="formatter" />
</van-popup> </van-popup>
<van-field colon clearable readonly clickable name="unusualDate" :value="unusualDate" label="核酸检测异常时间" <van-field colon clearable readonly clickable name="unusualDate" :value="unusualDate" :label="$t('unusualDate')"
label-width="130px" placeholder="点击选择核酸检测异常时间" @click="showUnusualDate = true" label-width="130px" :placeholder="`点击选择${$t('unusualDate')}`" @click="showUnusualDate = true"
:rules="[{ required: true, message: '请选择核酸检测异常时间' }]" /> :rules="[{ required: true, message: `请选择${$t('unusualDate')}` }]" />
<van-popup v-model="showUnusualDate" position="bottom"> <van-popup v-model="showUnusualDate" position="bottom">
<van-datetime-picker type="date" v-model="unusualDate1" :min-date="minUnusualDate" :max-date="maxDate" <van-datetime-picker type="date" v-model="unusualDate1" :min-date="minUnusualDate" :max-date="maxDate"
@confirm="onUnusualDate" @cancel="showUnusualDate = false" :formatter="formatter" /> @confirm="onUnusualDate" @cancel="showUnusualDate = false" :formatter="formatter" />
</van-popup> </van-popup>
<van-field colon clearable readonly clickable label-width="130px" name="inHospitalDate" :value="inHospitalDate" <van-field colon clearable readonly clickable label-width="130px" name="inHospitalDate" :value="inHospitalDate"
label="120转运时间或者入院时间" placeholder="点击选择120转运时间或者入院时间" @click="showInHospitalDate = true" :label="$t('inHospitalDate')" :placeholder="`点击选择${$t('inHospitalDate')}`" @click="showInHospitalDate = true"
:rules="[{ required: true, message: '请选择120转运时间或者入院时间' }]" /> :rules="[{ required: true, message: `请选择${$t('inHospitalDate')}` }]" />
<van-popup v-model="showInHospitalDate" position="bottom"> <van-popup v-model="showInHospitalDate" position="bottom">
<van-datetime-picker type="date" v-model="inHospitalDate1" :min-date="minInHospitalDate" :max-date="maxDate" <van-datetime-picker type="date" v-model="inHospitalDate1" :min-date="minInHospitalDate" :max-date="maxDate"
...@@ -87,19 +87,19 @@ ...@@ -87,19 +87,19 @@
</van-popup> </van-popup>
<van-field colon clearable autosize label-width="130px" type="textarea" v-model="beforeIsolationPoint" <van-field colon clearable autosize label-width="130px" type="textarea" v-model="beforeIsolationPoint"
name="beforeIsolationPoint" label="之前隔离点(无隔离点填救护车出发地址)" placeholder="请填写之前隔离点" name="beforeIsolationPoint" :label="$t('beforeIsolationPoint')" :placeholder="`请填写${$t('beforeIsolationPoint')}`"
@blur="setLocalStorge('beforeIsolationPoint')" :rules="[{ required: true, message: '请填写之前隔离点' }]"> @blur="setLocalStorge('beforeIsolationPoint')" :rules="[{ required: true, message: `请填写${$t('beforeIsolationPoint')}` }]">
</van-field> </van-field>
<van-field v-if="hasCOVIDVaccine == '是' || hasCOVIDVaccine == '否'" colon clearable name="hasCOVIDVaccine" <van-field v-if="hasCOVIDVaccine == $t('yes') || hasCOVIDVaccine == $t('no')" colon clearable name="hasCOVIDVaccine"
label-width="130px" label="是否接种过疫苗"> label-width="130px" :label="$t('hasCOVIDVaccine')" >
<template #input> <template #input>
<van-radio-group @change=" <van-radio-group @change="
() => { () => {
setLocalStorge('hasCOVIDVaccine'); setLocalStorge('hasCOVIDVaccine');
if (hasCOVIDVaccine == '否') { if (hasCOVIDVaccine == $t('no')) {
covidVaccine = ''; covidVaccine = '';
vaccineType = []; vaccineType = [];
othervaccines = ''; othervaccines = '';
...@@ -109,23 +109,23 @@ ...@@ -109,23 +109,23 @@
} }
} }
" v-model="hasCOVIDVaccine" direction="horizontal"> " v-model="hasCOVIDVaccine" direction="horizontal">
<van-radio name="是">是</van-radio> <van-radio :name="$t('yes')">{{$t('yes')}}</van-radio>
<van-radio name="否">否</van-radio> <van-radio :name="$t('no')">{{$t('no')}}</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
<van-field v-if="hasCOVIDVaccine == '是'" colon clearable v-model="covidVaccine" name="covidVaccine" label="接种针数" <van-field v-if="hasCOVIDVaccine == $t('yes')" colon clearable v-model="covidVaccine" name="covidVaccine" :label="$t('covidVaccine')"
placeholder="接种针数" label-width="130px" type="number" @blur="setLocalStorge('covidVaccine')" :placeholder="$t('covidVaccine')" label-width="130px" type="number" @blur="setLocalStorge('covidVaccine')"
:rules="[{ required: true, message: '请填写接种针数' }]"> :rules="[{ required: true, message: `请填写${$t('covidVaccine')}` }]">
<template #extra v-if="hasCOVIDVaccine == '是'">针</template> <template #extra v-if="hasCOVIDVaccine == $t('yes')">{{$t('needle')}}</template>
</van-field> </van-field>
<van-field v-if="hasCOVIDVaccine == '是'" colon clearable label-width="130px" name="vaccineType" label="疫苗公司" <van-field v-if="hasCOVIDVaccine == $t('yes')" colon clearable label-width="130px" name="vaccineType" :label="$t('vaccineType')"
:rules="[ :rules="[
{ {
required: hasCOVIDVaccine == '是' ? true : false, required: hasCOVIDVaccine == $t('yes') ? true : false,
message: '请选择疫苗公司', message: `请选择${$t('vaccineType')}`,
}, },
]"> ]">
<template #input> <template #input>
...@@ -144,19 +144,19 @@ ...@@ -144,19 +144,19 @@
</van-field> </van-field>
<van-field colon v-if="vaccineType.includes('其他')" clearable autosize type="textarea" label-width="130px" <van-field colon v-if="vaccineType.includes('其他')" clearable autosize type="textarea" label-width="130px"
v-model="othervaccines" name="othervaccines" label="其他疫苗" placeholder="其他疫苗" :rules="[ v-model="othervaccines" name="othervaccines" :label="$t('othervaccines')" :placeholder="$t('othervaccines')" :rules="[
{ {
required: vaccineType.includes('其他') ? true : false, required: vaccineType.includes('其他') ? true : false,
message: '请填写其他疫苗', message: `请填写${$t('othervaccines')}`,
}, },
]" @blur="setLocalStorge('othervaccines')"></van-field> ]" @blur="setLocalStorge('othervaccines')"></van-field>
<van-field v-if="hasCOVIDVaccine == '是'" colon clearable readonly clickable name="vaccineDate" <van-field v-if="hasCOVIDVaccine == $t('yes')" colon clearable readonly clickable name="vaccineDate"
:value="vaccineDate" label="最后一次接种日期" label-width="130px" placeholder="点击选择最后一次接种日期" :value="vaccineDate" :label="$t('vaccineDate')" label-width="130px" :placeholder="`点击选择${$t('vaccineDate')}`"
@click="showVaccineDate = true" :rules="[ @click="showVaccineDate = true" :rules="[
{ {
required: covidVaccine > 0 ? true : false, required: covidVaccine > 0 ? true : false,
message: '请选择最后一次接种日期', message: `请选择${$t('vaccineDate')}`,
}, },
]" /> ]" />
......
src/lang/zh.js
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ninglupeng * @Author: ninglupeng
* @Date: 2022-10-31 14:22:35 * @Date: 2022-10-31 14:22:35
* @LastEditors: ninglupeng * @LastEditors: ninglupeng
* @LastEditTime: 2022-11-03 13:49:28 * @LastEditTime: 2022-11-03 14:40:09
* @Description: * @Description:
*/ */
module.exports = { module.exports = {
...@@ -62,66 +62,28 @@ module.exports = { ...@@ -62,66 +62,28 @@ module.exports = {
//第五页 //第五页
"HasOnlineClass": "是否上网课", // 是否上网课 "HasOnlineClass": "是否上网课", // 是否上网课
"purpose": "来沪目的", //来沪目的
"study": '学习',//学习
"workOrNotCovid": "日常工作是否需要接触新冠病", //日常工作是否需要接触新冠病
"thirtyDays": "近两月是否离开过上海", //近两月是否离开过上海
"LeaveShangHai": "回上海天数", //回上海天数
'More30days': '天数不能大于三十天',//天数不能大于三十天
'Day': '天',//天
"normalDate": "未发生异常时间", //未发生异常时间
"unusualDate": "核酸检测异常时间", //核酸检测异常时间
"inHospitalDate": "120转运时间或者入院时间", //120转运时间或者入院时间
"beforeIsolationPoint": "之前隔离点(无隔离点填救护车出发地址)", //之前隔离点(无隔离点填救护车出发地址)
"hasCOVIDVaccine": "是否接种过疫苗", //是否接种过疫苗
"covidVaccine": "接种针数", //接种针数
"needle": "针", //针
"vaccineType": "疫苗公司", //疫苗公司
"othervaccines": "其他疫苗", //其他疫苗
"vaccineDate": "最后一次接种日期", //最后一次接种日期
//第六页 //第六页
//第七页
"concludingRemarks": '您已完成本次填写内容 ,感谢您的帮助和支持。',
"goBack": '返回',
"yes": '是',
"no": "否",
"have": "有",
"noHave": "无",
"hasHistoryAllergies": "过敏史", //过敏史 "hasHistoryAllergies": "过敏史", //过敏史
"foodAllergy": "食物过敏原", //食物过敏 "foodAllergy": "食物过敏原", //食物过敏
"drugAllergy": "药物过敏原", //药物过敏 "drugAllergy": "药物过敏原", //药物过敏
...@@ -144,18 +106,20 @@ module.exports = { ...@@ -144,18 +106,20 @@ module.exports = {
"noSmokingYears": "戒烟年数", //戒烟年数 "noSmokingYears": "戒烟年数", //戒烟年数
"whetherPassivitySmoking": "是否被动吸烟", //是否被动吸烟 "whetherPassivitySmoking": "是否被动吸烟", //是否被动吸烟
"passivitySmokingYears": "被动吸烟年数", //是否被动吸烟年数 "passivitySmokingYears": "被动吸烟年数", //是否被动吸烟年数
"year": '年' "year": '年',
//第七页
"concludingRemarks": '您已完成本次填写内容 ,感谢您的帮助和支持。',
"goBack": '返回',
"yes": '是',
"no": "否",
"have": "有",
"noHave": "无",
} }
\ No newline at end of file
src/store/modules/user.js
/* /*
* @Author: ninglupeng * @Author: ninglupeng
* @Date: 2022-03-17 15:06:50 * @Date: 2022-03-17 15:06:50
* @LastEditors: ninglupeng * @LastEditors: wsq
* @LastEditTime: 2022-11-01 10:27:25 * @LastEditTime: 2022-11-03 14:05:23
* @Description: * @Description:
*/ */
import http from '@/http/index' import http from '@/http/index'
...@@ -13,7 +13,7 @@ const state = { ...@@ -13,7 +13,7 @@ const state = {
token: '', token: '',
name: '', name: '',
userInfo: {}, userInfo: {},
page:6, page:5,
} }
const mutations = { const mutations = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment