设备列表新增引导页内容添加

src/components/Editor/index.vue

@@ -5,6 +5,7 @@
       :before-upload="handleBeforeUpload"
       :on-success="handleUploadSuccess"
       :on-error="handleUploadError"
+      :data="data"
       name="file"
       :show-file-list="false"
       :headers="headers"
@@ -60,10 +61,11 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_BASE_API + "/system/file/picture/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken()
       },
+      data:{},
       Quill: null,
       currentValue: "",
       options: {
@@ -156,27 +158,18 @@ export default {
         this.$emit("on-editor-change", eventName, ...args);
       });
     },
-    // 上传前校检格式和大小
     handleBeforeUpload(file) {
-      // 校检文件大小
-      if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
-        if (!isLt) {
-          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false;
-        }
-      }
-      return true;
+      this.data.multipartFile = file
     },
     handleUploadSuccess(res, file) {
       // 获取富文本组件实例
       let quill = this.Quill;
       // 如果上传成功
-      if (res.code == 200) {
+      if (res.code == 0) {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(length, "image", res.data);
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {

src/views/device/list/detail.vue

@@ -37,7 +37,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="设备图片：" prop="img">
-        <imageUpload :url="form.img" @success="handleUploadImg" @delete="handleUploadImg"
+        <Upload :url="form.img" @success="handleUploadImg" @delete="handleUploadImg"
           :disabled="disabled" />
       </el-form-item>
       <!-- 子表单 -->
@@ -71,18 +71,21 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="设备图标：">
-                <imageUpload :url="item.icon1" @success="handleUploadIcon($event, index, 'icon1')"
+                <Upload :url="item.icon1" @success="handleUploadIcon($event, index, 'icon1')"
                   @delete="handleUploadIcon($event, index, 'icon1')" :disabled="disabled" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label-width="auto" style="float:right">
-                <imageUpload :url="item.icon2" @success="handleUploadIcon($event, index, 'icon2')"
+                <Upload :url="item.icon2" @success="handleUploadIcon($event, index, 'icon2')"
                   @delete="handleUploadIcon($event, index, 'icon2')" :disabled="disabled" />
               </el-form-item>
             </el-col>
           </el-row>
-
+          <el-form-item v-if="item.type === 1" label="引导页内容：">
+            <Editor v-model="item.guidePageContent" :min-height="250"/>
+          </el-form-item>
+          <!-- 删除按钮 -->
           <el-link class="el-icon-close" v-if="form.typeList.length > 1" :underline="false"
             @click="getDelete(item.type, index)" />
         </div>
@@ -99,13 +102,15 @@
 import { deviceAdd, deviceDetail, deviceEdit } from "@/api/device/list";
 import { categoryList } from "@/api/device/category";
 import { functionList } from "@/api/device/function";
-import imageUpload from "@/components/Upload/index";
+import Upload from "@/components/Upload/index";
+import Editor from "@/components/Editor/index"
 import { typeMixin, deviceTypeMixin, upgradeTypeMixin } from '../mixin/index';
 
 export default {
   mixins: [typeMixin, deviceTypeMixin, upgradeTypeMixin],
   components: {
-    imageUpload,
+    Upload,
+    Editor
   },
   data() {
     return {
@@ -343,4 +348,8 @@ export default {
     color: #c0c4cc;
   }
 }
+
+::v-deep .editor{
+  background: #000;
+}
 </style>

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `https://o3tapi.radio1964.com/admin`, // 测试
-        // target: `http://192.168.0.217:2678`, // 付新保本地
+        // target: `http://192.168.0.217:2678/admin`, // 付新保本地
         // target: `http://192.168.0.185:2027`, // 谭树清本地
         changeOrigin: true,
         pathRewrite: {