Merge branch 'developer/yanjiaxu' into develop

src/components/Editor/index.vue

@@ -109,8 +109,9 @@ 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)
+            this.$nextTick(() => {
+              this.Quill.setSelection(this.currentValue.length, 0)
+            })
           }
         }
       },
@@ -119,6 +120,9 @@ export default {
   },
   mounted() {
     this.init()
+    this.$nextTick(() => {
+      this.Quill.setSelection(this.currentValue.length, 0)
+    })
   },
   beforeDestroy() {
     this.Quill = null
@@ -188,7 +192,7 @@ export default {
           length,
           'image',
           // process.env.VUE_APP_BASE_API + res.fileName
-          process.env.VUE_APP_IMAGE_API+ res.url
+          process.env.VUE_APP_IMAGE_API + res.url
         )
         // 调整光标到最后
         quill.setSelection(length + 1)

src/components/FileUpload/index.vue

@@ -99,7 +99,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + '/common/uploadMinio', // 上传文件服务器地址
       headers: {
         Authorization: 'Bearer ' + getToken()
       },

src/views/processing/unprocessed-review/index.vue

@@ -298,7 +298,7 @@
                     >
                     <span v-if="item.testStatus !== 'NEW'"
                       >{{ item.testStatus !== 'FINISH' ? '(共耗时' : '(已耗时'
-                      }}{{ getHourDiff(item.taskBeginTime) }})</span
+                      }}{{ getHourDiff(item.testBeginTime) }})</span
                     >
                   </div>
                 </div>
@@ -335,7 +335,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.carTest"
+                    :percentage="item.test"
                   ></el-progress>
                 </div>
               </div>

src/views/system/notice/index.vue

@@ -67,18 +67,7 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:notice:edit']"
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          >修改</el-button
-        >
-      </el-col> -->
+      <!-- common/upload -->
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:notice:remove']"

src/views/task/on/index.vue

@@ -291,7 +291,7 @@
                     >
                     <span v-if="item.testStatus !== 'NEW'"
                       >{{ item.testStatus !== 'FINISH' ? '(共耗时' : '(已耗时'
-                      }}{{ getHourDiff(item.taskBeginTime) }})</span
+                      }}{{ getHourDiff(item.testBeginTime) }})</span
                     >
                   </div>
                 </div>
@@ -328,7 +328,7 @@
                   <el-progress
                     class="cell-progress"
                     :stroke-width="12"
-                    :percentage="item.carTest"
+                    :percentage="item.test"
                   ></el-progress>
                 </div>
               </div>