Commit b710c80b authored by jiaxu.yan's avatar jiaxu.yan

fix: 70825 70826 70827

parent 197e165f
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
color: #303133; color: #303133;
font-weight: bold; font-weight: bold;
width: 160px; width: 160px;
white-space: nowrap;
} }
} }
.i-icon { .i-icon {
......
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
}, },
data() { data() {
return { return {
uploadUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址 uploadUrl: process.env.VUE_APP_BASE_API + '/common/uploadMinio', // 上传的图片服务器地址
headers: { headers: {
Authorization: 'Bearer ' + getToken() Authorization: 'Bearer ' + getToken()
}, },
...@@ -109,6 +109,8 @@ export default { ...@@ -109,6 +109,8 @@ export default {
this.currentValue = val === null ? '' : val this.currentValue = val === null ? '' : val
if (this.Quill) { if (this.Quill) {
this.Quill.pasteHTML(this.currentValue) this.Quill.pasteHTML(this.currentValue)
console.log(this.Quill);
setTimeout(() => this.Quill.setSelection(this.Quill.getLength(), 0), 0)
} }
} }
}, },
...@@ -185,7 +187,8 @@ export default { ...@@ -185,7 +187,8 @@ export default {
quill.insertEmbed( quill.insertEmbed(
length, length,
'image', 'image',
process.env.VUE_APP_BASE_API + res.fileName // process.env.VUE_APP_BASE_API + res.fileName
process.env.VUE_APP_IMAGE_API+ res.url
) )
// 调整光标到最后 // 调整光标到最后
quill.setSelection(length + 1) quill.setSelection(length + 1)
......
...@@ -285,6 +285,8 @@ export default { ...@@ -285,6 +285,8 @@ export default {
const infoIds = row.infoId || this.ids const infoIds = row.infoId || this.ids
this.$modal this.$modal
.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?', { .confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?', {
type: 'warning',
title: '确认',
closeOnClickModal: false closeOnClickModal: false
}) })
.then(function () { .then(function () {
...@@ -300,6 +302,8 @@ export default { ...@@ -300,6 +302,8 @@ export default {
handleClean() { handleClean() {
this.$modal this.$modal
.confirm('是否确认清空所有登录日志数据项?', { .confirm('是否确认清空所有登录日志数据项?', {
type: 'warning',
title: '确认',
closeOnClickModal: false closeOnClickModal: false
}) })
.then(function () { .then(function () {
...@@ -316,6 +320,8 @@ export default { ...@@ -316,6 +320,8 @@ export default {
const username = this.selectName const username = this.selectName
this.$modal this.$modal
.confirm('是否确认解锁用户"' + username + '"数据项?', { .confirm('是否确认解锁用户"' + username + '"数据项?', {
type: 'warning',
title: '确认',
closeOnClickModal: false closeOnClickModal: false
}) })
.then(function () { .then(function () {
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:notice:edit']" v-hasPermi="['system:notice:edit']"
type="success" type="success"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
@click="handleUpdate" @click="handleUpdate"
>修改</el-button >修改</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:notice:remove']" v-hasPermi="['system:notice:remove']"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment