From 6d1c8813f14f75a09571731639859766516ffddc Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 01 三月 2024 09:10:49 +0800
Subject: [PATCH] mrshi
---
admin/src/components/system/user/OperaUserWindow.vue | 12 ++++++------
admin/src/views/business/visitorSources.vue | 12 +++++++-----
h5/main.js | 2 +-
h5/redirect.html | 3 ++-
admin/src/views/system/user.vue | 10 +++++-----
admin/vue.config.js | 2 +-
6 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/admin/src/components/system/user/OperaUserWindow.vue b/admin/src/components/system/user/OperaUserWindow.vue
index 1cddb6f..149f02d 100644
--- a/admin/src/components/system/user/OperaUserWindow.vue
+++ b/admin/src/components/system/user/OperaUserWindow.vue
@@ -19,12 +19,12 @@
<el-radio label="0">濂�</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="澶村儚" prop="avatar" required>
- <el-radio-group v-model="form.avatar" class="form-item-avatar">
- <el-radio label="/avatar/man.png" border><img src="/avatar/man.png" alt=""></el-radio>
- <el-radio label="/avatar/woman.png" border><img src="/avatar/woman.png" alt=""></el-radio>
- </el-radio-group>
- </el-form-item>
+<!-- <el-form-item label="澶村儚" prop="avatar" required>-->
+<!-- <el-radio-group v-model="form.avatar" class="form-item-avatar">-->
+<!-- <el-radio label="/avatar/man.png" border><img src="/avatar/man.png" alt=""></el-radio>-->
+<!-- <el-radio label="/avatar/woman.png" border><img src="/avatar/woman.png" alt=""></el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item v-if="form.id == null" label="鍒濆瀵嗙爜" prop="password" required>
<el-input v-model="form.password" type="password" placeholder="璇疯緭鍏ュ垵濮嬪瘑鐮�" maxlength="30" show-password/>
</el-form-item>
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 6c8e4e1..7cbddb7 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -34,8 +34,8 @@
<el-form-item label="璁垮绛旈璇存槑:" prop="description">
<el-input style="width: 50%;" type="textarea" v-model="form.description" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="鍏ュ巶椤荤煡:" prop="description">
- <el-tiptap style="width: 50%;" v-model="form.description" :extensions="extensions" />
+ <el-form-item label="鍏ュ巶椤荤煡:" prop="visitNotice">
+ <el-tiptap style="width: 50%;" v-model="form.visitNotice" :extensions="extensions" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">淇濆瓨閰嶇疆椤�</el-button>
@@ -83,7 +83,8 @@
healthCard: 0,
isAnswer: 0,
theme: '',
- description: ''
+ description: '',
+ visitNotice: ''
},
extensions: [
new Doc(),
@@ -134,6 +135,7 @@
this.form.isAnswer = res.isAnswer
this.form.reservationWay = res.reservationWay
this.form.theme = res.theme
+ this.form.visitNotice = res.visitNotice
})
},
submit () {
@@ -143,7 +145,8 @@
checkVisit: this.form.checkVisit,
reservationWay: this.form.reservationWay,
description: this.form.description,
- theme: this.form.theme
+ theme: this.form.theme,
+ visitNotice: this.form.visitNotice
}).then(res => {
this.$message.success('淇濆瓨鎴愬姛')
this.getData()
@@ -156,7 +159,6 @@
<style lang="scss" scoped>
.box {
width: 100%;
- height: 100%;
padding: 30px;
box-sizing: border-box;
background: #ffffff;
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 5e4d7f5..1209412 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -37,11 +37,11 @@
@sort-change="handleSortChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">
- <template slot-scope="{row}">
- <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">
- </template>
- </el-table-column>
+<!-- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index c4972dd..e1300df 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -17,7 +17,7 @@
// http://192.168.0.129:10028 浠诲悍
// https://dmtest.ahapp.net/admin_api 娴嬭瘯鏈�
// http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇
- target: 'http://192.168.0.129:10028',
+ target: 'http://10.10.99.63/admin_interface',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
diff --git a/h5/main.js b/h5/main.js
index eff79d3..7c2b469 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -9,7 +9,7 @@
Vue.prototype.$baseUrl = 'http://192.168.0.129:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
-// Vue.prototype.$baseUrl = 'http://10.10.99.63/web_interface/';
+// Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/';
Vue.prototype.$store = store;
App.mpType = 'app'
diff --git a/h5/redirect.html b/h5/redirect.html
index b09bd0b..07eb389 100644
--- a/h5/redirect.html
+++ b/h5/redirect.html
@@ -5,7 +5,8 @@
<title>閲嶅畾鍚�</title>
<script>
var p = location.href.split("?")
- window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
+ // window.location.href = 'https://dmtest.ahapp.net/hsvisit_h5/#/pages/notice/notice?' + p[1]
+ window.location.href = 'http://218.23.218.228:8018/h5/#/pages/notice/notice?' + p[1]
</script>
</head>
<body>
--
Gitblit v1.9.3