diff --git a/package.json b/package.json
index be7fa81..1248dda 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"test:e2e": "vue-cli-service test:e2e"
},
"dependencies": {
- "avue-plugin-ueditor": "^0.1.4",
+ "avue-plugin-ueditor": "^0.1.7",
"axios": "^0.18.0",
"babel-polyfill": "^6.26.0",
"classlist-polyfill": "^1.2.0",
diff --git a/src/config/website.js b/src/config/website.js
index c08dd35..c1e1125 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -48,4 +48,5 @@ export default {
ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
// 单点登录回调地址(Saber服务的地址)
redirectUri: 'http://localhost:1888',
+ filePrex: 'http://192.168.1.106:9000',//'http://www.qdscgs.com:9091' 图片前缀
}
diff --git a/src/option/user/info.js b/src/option/user/info.js
index d2fcbe0..e198ead 100644
--- a/src/option/user/info.js
+++ b/src/option/user/info.js
@@ -1,3 +1,4 @@
+import website from "../../config/website"
export default {
tabs: true,
tabsActive: 1,
@@ -10,6 +11,7 @@ export default {
type: 'upload',
listType: 'picture-img',
propsHttp: {
+ home: website.filePrex,
res: 'data',
url: 'link',
},
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 6e22233..a31bdcf 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -75,7 +75,7 @@
+ :src="userInfo.avatar ? website.filePrex + userInfo.avatar : require('@/assets/image/hospital_logo.png')">
{{userInfo.user_name}}
diff --git a/src/views/articlelist/index.vue b/src/views/articlelist/index.vue
index 5b2bc3b..850c8c8 100644
--- a/src/views/articlelist/index.vue
+++ b/src/views/articlelist/index.vue
@@ -3,7 +3,8 @@
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+ :upload-after="uploadAfter">
{{
row.publishSta == 1 ? '取消发布' : row.publishSta == 2 ? '重新发布'
@@ -96,8 +97,12 @@ export default {
component: 'AvueUeditor',
overHidden: true,
options: {
+ customConfig: {
+ menus: ['head', 'bold', 'fontSize', 'fontName', 'italic', 'underline', 'strikeThrough', 'foreColor', 'backColor', 'link', 'list', 'justify', 'quote', 'emoticon', 'table', 'code', 'undo', 'redo']
+ },
action: '/api/blade-resource/oss/endpoint/put-file',
props: {
+ home: this.website.filePrex,
res: "data",
url: "link",
}
@@ -105,7 +110,7 @@ export default {
minRows: 12,
span: 24,
formatter: (val) => {
- return decodeURIComponent(val.content);
+ return decodeURIComponent(val.content).replace(/src=\"/gi, 'src="' + this.website.filePrex);
}
},
{
@@ -144,6 +149,11 @@ export default {
mounted() {
},
methods: {
+ //富文本编辑器上传
+ uploadAfter(res, done) {
+ console.log(res)
+ done();
+ },
//发布
rowPublish(row) {
this.$confirm("确定" + (row.publishSta == 1 ? "取消发布该条数据吗" : "发布该条数据吗") + "?", {
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 014b301..900357a 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -16,7 +16,7 @@
-
+
@@ -80,6 +80,9 @@ export default {
label: "机构logo",
prop: "imgUrl2",
slot: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
},
{
label: "机构logo",
@@ -89,6 +92,7 @@ export default {
span: 24,
fileType: 'img',//img/video/audio
propsHttp: {
+ home: this.website.filePrex,
res: 'data',
url: "link",
},
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index f8d1d53..1ae18a9 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -43,11 +43,11 @@
{{ row.status == 1 ? '启用' : '禁用' }}
-
+
{{ row.status == 1 ? '启用' : '封禁' }}
diff --git a/src/views/system/userinfo.vue b/src/views/system/userinfo.vue
index 6c985b5..75a6437 100644
--- a/src/views/system/userinfo.vue
+++ b/src/views/system/userinfo.vue
@@ -1,94 +1,92 @@
diff --git a/vue.config.js b/vue.config.js
index 2e0fde1..1cfd5a3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,8 +26,9 @@ module.exports = {
proxy: {
"/api": {
//本地服务接口地址
- target: "http://192.168.1.3:8080",
- // target: "http://192.168.1.106",
+ // target: "http://www.qdscgs.com:80",//生成
+ // target: "http://192.168.1.3:8080",
+ target: "http://192.168.1.106",
//远程演示服务地址,可用于直接启动项目
// target: 'https://saber.bladex.vip/api',
ws: true,