bug修改,屏蔽第三方登录,修正头像上传路径

main
zhangqun 2 years ago
parent dbdc148161
commit 06a6710c1b
  1. BIN
      dist.zip
  2. BIN
      dist20231227-01.zip
  3. BIN
      dist20231227-02.zip
  4. 2
      src/lang/zh.js
  5. 16
      src/option/user/info.js
  6. 6
      src/page/login/index.vue
  7. 4
      src/views/monitoring/components/MonitorHeader.vue
  8. 7
      src/views/system/userinfo.vue
  9. 4
      src/views/wel/index.vue

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1,7 +1,7 @@
export default { export default {
tip: "提示", tip: "提示",
tipInput: "请输入", tipInput: "请输入",
title: "山东省动物疫病预防与控制中心", title: "嘉禾县铸锻造工业互联网平台",
logoutTip: "退出系统, 是否继续?", logoutTip: "退出系统, 是否继续?",
submitText: "确定", submitText: "确定",
cancelText: "取消", cancelText: "取消",

@ -12,7 +12,7 @@ export default {
// 打包修改 // 打包修改
propsHttp: { propsHttp: {
// 内网 // 内网
home: 'http://192.168.1.5:80/api/static/', home: process.env.NODE_ENV == 'development' ? 'http://192.168.1.104:8082/' : 'http://124.221.142.15:8082/',
url: 'data' url: 'data'
}, },
canvasOption: { canvasOption: {
@ -46,12 +46,12 @@ export default {
span: 12, span: 12,
row: true, row: true,
}, },
{ // {
label: '电子签名', // label: '电子签名',
prop: 'electronicSignature', // prop: 'electronicSignature',
span: 12, // span: 12,
row: true, // row: true,
}, // },
] ]
}, },
{ {
@ -78,4 +78,6 @@ export default {
}] }]
} }
], ],
submitText:'提 交',
emptyText: '清 空'
} }

@ -64,15 +64,15 @@
<userLogin v-if="activeName === 'user'"></userLogin> <userLogin v-if="activeName === 'user'"></userLogin>
<codeLogin v-else-if="activeName === 'code'"></codeLogin> <codeLogin v-else-if="activeName === 'code'"></codeLogin>
<thirdLogin v-else-if="activeName === 'third'"></thirdLogin> <thirdLogin v-else-if="activeName === 'third'"></thirdLogin>
<div class="login-menu"> <!-- <div class="login-menu">
<a href="#" @click.stop="activeName = 'user'">{{ <a href="#" @click.stop="activeName = 'user'">{{
$t("login.userLogin") $t("login.userLogin")
}}</a> }}</a>
<!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>--> <a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>
<a href="#" @click.stop="activeName = 'third'">{{ <a href="#" @click.stop="activeName = 'third'">{{
$t("login.thirdLogin") $t("login.thirdLogin")
}}</a> }}</a>
</div> </div> -->
<!-- <div style="float:right"> <!-- <div style="float:right">
<el-checkbox v-model="checked">记住用户名</el-checkbox> <el-checkbox v-model="checked">记住用户名</el-checkbox>
</div> --> </div> -->

@ -4,8 +4,8 @@
<div class="header__left"> <div class="header__left">
<img :src="logo" alt="logo" width="30px" height="30px" /> <img :src="logo" alt="logo" width="30px" height="30px" />
<p class="headerTitle">山东省动物疫病预防与控制中心</p> <p class="headerTitle">嘉禾县铸锻造工业互联网平台</p>
<p class="headerSubTitle">山东省人畜共患病流调监测中心</p> <p class="headerSubTitle">嘉禾县铸锻造工业互联网平台</p>
</div> </div>
<div class="header__right"> <div class="header__right">
<div class="header__right__back" @click="backHome">返回首页</div> <div class="header__right__back" @click="backHome">返回首页</div>

@ -68,9 +68,12 @@ export default {
this.form.electronicSignature = img this.form.electronicSignature = img
}, },
handleSubmit(form, done) { handleSubmit(form, done) {
// let forms = {
// ...form,
// electronicSignature:this.$refs.imgRef.src
// }
let forms = { let forms = {
...form, ...form
electronicSignature:this.$refs.imgRef.src
} }
if(this.electronicSignatureFlag) { if(this.electronicSignatureFlag) {
this.$delete(forms, 'electronicSignature') this.$delete(forms, 'electronicSignature')

@ -80,11 +80,11 @@
<i class="el-icon-folder-remove"></i> <i class="el-icon-folder-remove"></i>
<span>账号{{ userInfo.account }}</span> <span>账号{{ userInfo.account }}</span>
</div> </div>
<div class="personal_item"> <!-- <div class="personal_item">
<i class="el-icon-edit"></i> <i class="el-icon-edit"></i>
<span>电子签名</span> <span>电子签名</span>
<img :src="electronic_signature + userInfo.electronicSignature" width="100px" height="50px" /> <img :src="electronic_signature + userInfo.electronicSignature" width="100px" height="50px" />
</div> </div> -->
</div> </div>
<!-- 修改 --> <!-- 修改 -->
<div class="person_edit"> <div class="person_edit">

Loading…
Cancel
Save