xinyilu/NurseStationUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	src/components/Editor/index.vue
This commit is contained in:
曹辉 2022-12-06 09:51:57 +08:00
commit 7ea79d5ed4
6 changed files with 89 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/Editor/index.vue
View File

@ -56,13 +56,13 @@ export default {
type: {
type: String,
default: "url",
}
},
},
data() {
return {
uploadUrl: process.env.VUE_APP_BASE_API + "/common/richTextPictureUrl", // 上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken()
Authorization: "Bearer " + getToken(),
},
Quill: null,
currentValue: "",
@ -82,7 +82,7 @@ export default {
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
[{ align: [] }], // 对齐方式
["clean"], // 清除文本格式
["link", "image"] // 链接、图片、视频
["link", "image", "video"], // 链接、图片、视频
],
},
placeholder: "请输入内容",
@ -126,7 +126,7 @@ export default {
const editor = this.$refs.editor;
this.Quill = new Quill(editor, this.options);
// 如果设置了上传地址则自定义图片上传事件
if (this.type == 'url') {
if (this.type == "url") {
let toolbar = this.Quill.getModule("toolbar");
toolbar.addHandler("image", (value) => {
this.uploadType = "image";
@ -176,7 +176,14 @@ export default {
// 获取光标所在位置
let length = quill.getSelection().index;
// 插入图片 res.url为服务器返回的图片地址
quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
quill.insertEmbed(
length,
"image",
process.env.VUE_APP_BASE_API + res.fileName
);
this.$emit("imgs", res.fileName);
// 调整光标到最后
quill.setSelection(length + 1);
} else {
@ -191,7 +198,8 @@ export default {
</script>
<style>
.editor, .ql-toolbar {
.editor,
.ql-toolbar {
white-space: pre-wrap !important;
line-height: normal !important;
}

10
src/views/system/OperateGoodsInfo/index.vue
View File

@ -366,6 +366,7 @@
style="margin-top: 20px"
>
<editor
@imgs="imgs"
:min-height="100"
style="width: 90%; margin: 0 auto"
v-model="form.goodsRemark"
@ -506,8 +507,8 @@ export default {
name: "OperateGoodsInfo",
data() {
return {
imgsurl: { pictureUrlList: [] },
imgone: "",
imageUrl: "", //商品图片
value: "",
datas: null,
@ -627,6 +628,9 @@ export default {
this.infos();
},
methods: {
imgs(item) {
this.imgsurl.pictureUrlList.push(item);
},
upwhetherShelf(row) {
console.log(row);
if (row.whetherShelf == false) {
@ -718,6 +722,10 @@ export default {
console.log(res);
});
}
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl = { pictureUrlList: [] };
this.open = false;
this.reset();
this.StationName = "请选择所属护理站";

8
src/views/system/goodsInfo/goodsInfojs.js
View File

@ -18,6 +18,7 @@ export default {
name: "OperateGoodsInfo",
data() {
return {
imgsurl: { pictureUrlList: [] },
imgone: "",
imageUrl: "", //商品图片
value: "",
@ -138,6 +139,9 @@ export default {
this.infos();
},
methods: {
imgs(item) {
this.imgsurl.pictureUrlList.push(item);
},
upwhetherShelf(row) {
console.log(row);
if (row.whetherShelf == false) {
@ -229,6 +233,10 @@ export default {
console.log(res);
});
}
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => { });
}
this.imgsurl = { pictureUrlList: [] };
this.open = false;
this.reset();
this.StationName = "请选择所属护理站";

1
src/views/system/goodsInfo/index.vue
View File

@ -349,6 +349,7 @@
style="margin-top: 20px"
>
<editor
@imgs="imgs"
:min-height="100"
style="width: 90%; margin: 0 auto"
v-model="form.goodsRemark"

12
src/views/system/station/index.vue
View File

@ -303,6 +303,7 @@
</el-form-item>
<el-form-item label="护理站简介" prop="agencyIntroduce">
<editor
@imgs="imgs"
:min-height="62"
style="width: 90%; margin: 0 auto"
v-model="form.agencyIntroduce"
@ -468,6 +469,7 @@ export default {
}
};
return {
imgsurl: { pictureUrlList: [] },
imageUrl: "",
imageUrl2: "",
imgtwo: "",
@ -604,6 +606,9 @@ export default {
this.infos();
},
methods: {
imgs(item) {
this.imgsurl.pictureUrlList.push(item);
},
imgUrl(imgUrl) {
this.form.stationPictureUrl = imgUrl;
},
@ -693,6 +698,11 @@ export default {
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {});
}
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl = { pictureUrlList: [] };
this.open = false;
this.reset();
},
@ -898,8 +908,6 @@ export default {
info() {
//加个所属区域
getListByUser(this.getListByUserquery).then((res) => {
// 页面
// /所属区域
this.nurseStationlist = res.rows;
this.total2 = res.total;
this.loading = false;

21
src/views/system/stationItem/index.vue
View File

@ -285,20 +285,13 @@
prop="nurseStationItem.nurseItemContent"
>
<editor
@imgs="imgs"
:min-height="82"
style="width: 90%"
maxlength="300"
v-model="form.nurseStationItem.nurseItemContent"
></editor>
<!-- <el-input
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
placeholder="请输入内容"
style="width: 208px"
v-model="form.nurseStationItem.nurseItemContent"
> -->
<!-- </el-input> -->
</el-form-item>
<el-form-item label="项目时长和价格" required>
<el-table
@ -692,6 +685,7 @@ export default {
name: "NurseItem",
data() {
return {
imgsurl: { pictureUrlList: [] },
imageUrl: "",
imgone: "",
handstationlist: [],
@ -809,6 +803,10 @@ export default {
// this.getList();
},
methods: {
imgs(item) {
console.log(item)
this.imgsurl.pictureUrlList.push(item);
},
imgUrl(imgUrl) {
this.form.nurseStationItem.itemPictureUrl = imgUrl;
},
@ -950,7 +948,10 @@ export default {
if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {});
}
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl = { pictureUrlList: [] };
this.open = false;
this.reset();
},