Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into develop

src/assets/styles/process.scss

@@ -109,6 +109,7 @@
     color: #303133;
     font-weight: bold;
     width: 160px;
+    white-space: nowrap;
   }
 }
 .i-icon {

src/components/Editor/index.vue

@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_BASE_API + '/common/uploadMinio', // 上传的图片服务器地址
       headers: {
         Authorization: 'Bearer ' + getToken()
       },
@@ -109,6 +109,8 @@ export default {
           this.currentValue = val === null ? '' : val
           if (this.Quill) {
             this.Quill.pasteHTML(this.currentValue)
+            console.log(this.Quill);
+            setTimeout(() => this.Quill.setSelection(this.Quill.getLength(), 0), 0)
           }
         }
       },
@@ -185,7 +187,8 @@ export default {
         quill.insertEmbed(
           length,
           '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)

src/views/monitor/logininfor/index.vue

@@ -285,6 +285,8 @@ export default {
       const infoIds = row.infoId || this.ids
       this.$modal
         .confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？', {
+          type: 'warning',
+          title: '确认',
           closeOnClickModal: false
         })
         .then(function () {
@@ -300,6 +302,8 @@ export default {
     handleClean() {
       this.$modal
         .confirm('是否确认清空所有登录日志数据项？', {
+          type: 'warning',
+          title: '确认',
           closeOnClickModal: false
         })
         .then(function () {
@@ -316,6 +320,8 @@ export default {
       const username = this.selectName
       this.$modal
         .confirm('是否确认解锁用户"' + username + '"数据项?', {
+          type: 'warning',
+          title: '确认',
           closeOnClickModal: false
         })
         .then(function () {

src/views/system/notice/index.vue

@@ -67,7 +67,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:notice:edit']"
           type="success"
@@ -78,7 +78,7 @@
           @click="handleUpdate"
           >修改</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:notice:remove']"