diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..9f2d597 Binary files /dev/null and b/dist.zip differ diff --git a/dist20231227-01.zip b/dist20231227-01.zip new file mode 100644 index 0000000..b01991c Binary files /dev/null and b/dist20231227-01.zip differ diff --git a/dist20231227-02.zip b/dist20231227-02.zip new file mode 100644 index 0000000..0df048b Binary files /dev/null and b/dist20231227-02.zip differ diff --git a/src/lang/zh.js b/src/lang/zh.js index 3177c52..5c37cf4 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,7 +1,7 @@ export default { tip: "提示", tipInput: "请输入", - title: "山东省动物疫病预防与控制中心", + title: "嘉禾县铸锻造工业互联网平台", logoutTip: "退出系统, 是否继续?", submitText: "确定", cancelText: "取消", diff --git a/src/option/user/info.js b/src/option/user/info.js index 71f1772..916d22c 100644 --- a/src/option/user/info.js +++ b/src/option/user/info.js @@ -12,7 +12,7 @@ export default { // 打包修改 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' }, canvasOption: { @@ -46,12 +46,12 @@ export default { span: 12, row: true, }, - { - label: '电子签名', - prop: 'electronicSignature', - span: 12, - row: true, - }, + // { + // label: '电子签名', + // prop: 'electronicSignature', + // span: 12, + // row: true, + // }, ] }, { @@ -78,4 +78,6 @@ export default { }] } ], + submitText:'提 交', + emptyText: '清 空' } diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 8184bcd..a541510 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -64,15 +64,15 @@ -
+ + {{ $t('login.phoneLogin') }} {{ $t("login.thirdLogin") }} -
+ --> diff --git a/src/views/monitoring/components/MonitorHeader.vue b/src/views/monitoring/components/MonitorHeader.vue index c68220e..64c5070 100644 --- a/src/views/monitoring/components/MonitorHeader.vue +++ b/src/views/monitoring/components/MonitorHeader.vue @@ -4,8 +4,8 @@
logo -

山东省动物疫病预防与控制中心

-

山东省人畜共患病流调监测中心

+

嘉禾县铸锻造工业互联网平台

+

嘉禾县铸锻造工业互联网平台

返回首页
diff --git a/src/views/system/userinfo.vue b/src/views/system/userinfo.vue index 712fe1c..c548afc 100644 --- a/src/views/system/userinfo.vue +++ b/src/views/system/userinfo.vue @@ -68,9 +68,12 @@ export default { this.form.electronicSignature = img }, handleSubmit(form, done) { + // let forms = { + // ...form, + // electronicSignature:this.$refs.imgRef.src + // } let forms = { - ...form, - electronicSignature:this.$refs.imgRef.src + ...form } if(this.electronicSignatureFlag) { this.$delete(forms, 'electronicSignature') diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 815ec42..f00f574 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -80,11 +80,11 @@ 账号:{{ userInfo.account }}
-
+