From e949929dda547c3ca3a68396afbaeff61ace1ee3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/.env | 4 +-
h5/pages/visitorApplication/visitorApplication.vue | 2
admin/src/views/business/visitorSources.vue | 62 ++++++++++++++++++++++++++++++
h5/main.js | 1
admin/src/views/business/empower.vue | 2
admin/vue.config.js | 8 ++-
h5/manifest.json | 2
admin/src/views/business/internalMember.vue | 5 +-
8 files changed, 75 insertions(+), 11 deletions(-)
diff --git a/admin/.env b/admin/.env
index 99911f2..61f9376 100644
--- a/admin/.env
+++ b/admin/.env
@@ -4,7 +4,7 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/hsvisit_admin'
+VUE_APP_CONTEXT_PATH = '/admin'
# 鎺ュ彛鍓嶇紑
-VUE_APP_API_PREFIX = '/admin_api'
+VUE_APP_API_PREFIX = '/admin_interface'
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index dea958a..61e70a2 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -70,7 +70,7 @@
<span>姝細{{row.endTime}}</span>
</template>
</el-table-column>
- <el-table-column prop="sendDate" label="瀵煎叆鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="sendDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<!-- <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
<el-table-column label="涓嬪彂鐘舵��" min-width="100px">
<template slot-scope="{row}">
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index fb45d0e..0e69fe1 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -94,7 +94,7 @@
<el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image
- style="width: 100px; height: 100px"
+ style="width: 60px; height: 60px"
:src="row.faceImg"
:preview-src-list="[row.faceImg]">
</el-image>
@@ -103,7 +103,7 @@
<el-table-column fixed="right" label="鍗＄墖淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image
- style="width: 100px; height: 100px"
+ style="width: 60px; height: 60px"
:src="row.faceImg"
:preview-src-list="[row.faceImg]">
</el-image>
@@ -176,6 +176,7 @@
getfindCompanyTreePage () {
fetchList(1)
.then(res => {
+ res[0].fsStatus = 1
this.companyTree = res
// this.searchForm.erpOrgId = res[0].erpId
this.search()
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index ed83061..6c8e4e1 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -34,6 +34,9 @@
<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>
<el-form-item>
<el-button type="primary" @click="submit">淇濆瓨閰嶇疆椤�</el-button>
</el-form-item>
@@ -43,6 +46,31 @@
<script>
import { getVisitConfigDTO, updateVisitConfig } from '@/api/system/common'
+import {
+ // necessary extensions
+ Doc,
+ Text,
+ Paragraph,
+ Heading,
+ Bold,
+ Underline,
+ Italic,
+ Strike,
+ ListItem,
+ BulletList,
+ OrderedList,
+ Image,
+ Blockquote,
+ TextAlign,
+ Indent,
+ Table,
+ TableHeader,
+ TableCell,
+ TableRow,
+ TextColor,
+ HorizontalRule
+} from 'element-tiptap'
+import { upload } from '@/api/system/common'
export default {
name: 'visitorSources',
@@ -56,7 +84,39 @@
isAnswer: 0,
theme: '',
description: ''
- }
+ },
+ extensions: [
+ new Doc(),
+ new Text(),
+ new Paragraph(),
+ new Heading({ level: 5 }),
+ new Bold({ bubble: true }),
+ new Underline({ bubble: true, menubar: false }),
+ new Italic(),
+ new Strike(),
+ new ListItem(),
+ new BulletList(),
+ new OrderedList(),
+ new Image({
+ uploadRequest (file) {
+ const fd = new FormData()
+ fd.append('folder', 'visit')
+ fd.append('file', file)
+ return upload(fd).then(res => {
+ return res.url
+ })
+ }
+ }),
+ new Blockquote(),
+ new TextAlign(),
+ new Indent(),
+ new Table(),
+ new TableHeader(),
+ new TableCell(),
+ new TableRow(),
+ new HorizontalRule(),
+ new TextColor()
+ ]
}
},
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 15662cc..c4972dd 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -1,8 +1,8 @@
// 璇︾粏閰嶇疆璇峰弬鑰僪ttps://cli.vuejs.org/zh/config/#vue-config-js
-const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
+// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
module.exports = {
publicPath: process.env.VUE_APP_CONTEXT_PATH,
- outputDir: outputDir === '/' ? 'dist' : outputDir,
+ outputDir: 'admin',
assetsDir: 'static',
lintOnSave: false,
devServer: {
@@ -14,8 +14,10 @@
// http://192.168.0.110:10013 纾婄
// http://192.168.0.132:10013 甯呭摜
// http://192.168.0.126:10033 钀嶅
+ // http://192.168.0.129:10028 浠诲悍
// https://dmtest.ahapp.net/admin_api 娴嬭瘯鏈�
- target: 'http://192.168.0.126:10033',
+ // http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇
+ target: 'http://192.168.0.129:10028',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
diff --git a/h5/main.js b/h5/main.js
index ae25ceb..eff79d3 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -9,6 +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.$store = store;
App.mpType = 'app'
diff --git a/h5/manifest.json b/h5/manifest.json
index a3a7365..c2c0170 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -81,7 +81,7 @@
"h5" : {
"router" : {
"mode" : "hash",
- "base" : "/hsvisit_h5/"
+ "base" : "/h5/"
}
}
}
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index ebc9fc7..3b72e05 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -220,7 +220,7 @@
<text>*</text>
</view>
<view class="adduser_list_item_ipt">
- <input type="text" v-model="withUserList.idcardNo" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" />
+ <input type="text" v-model="withUserList.idcardNo" maxlength="18" placeholder-style="color: #999999;font-size: 28rpx;" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" />
</view>
</view>
<view class="adduser_list_item">
--
Gitblit v1.9.3