模式管理，FR200 新增步骤一视频，步骤二视频，步骤三视频

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java

@@ -111,6 +111,12 @@ public class WxMode extends BaseEntity
 
     private Integer isNew;
 
+    private String stepOneVideo;
+
+    private String stepTwoVideo;
+
+    private String stepThreeVideo;
+
 
     public void setId(Long id)
     {
@@ -336,6 +342,30 @@ public class WxMode extends BaseEntity
         this.effectContent = effectContent;
     }
 
+    public String getStepOneVideo() {
+        return stepOneVideo;
+    }
+
+    public void setStepOneVideo(String stepOneVideo) {
+        this.stepOneVideo = stepOneVideo;
+    }
+
+    public String getStepTwoVideo() {
+        return stepTwoVideo;
+    }
+
+    public void setStepTwoVideo(String stepTwoVideo) {
+        this.stepTwoVideo = stepTwoVideo;
+    }
+
+    public String getStepThreeVideo() {
+        return stepThreeVideo;
+    }
+
+    public void setStepThreeVideo(String stepThreeVideo) {
+        this.stepThreeVideo = stepThreeVideo;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml

@@ -28,6 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="technologyInfo"    column="technology_info"    />
         <result property="effectContent"    column="effect_content"    />
+        <result property="stepOneVideo"    column="step_one_video"    />
+        <result property="stepTwoVideo"    column="step_two_video"    />
+        <result property="stepThreeVideo"    column="step_three_video"    />
     </resultMap>
 
     <resultMap type="WxMode" id="WxModeNewResult" extends="WxModeResult">
@@ -35,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxModeVo">
-        select id, instrument_type, instrument_model, mode_name, mode_desc, mode_banner, mode_video, mode_type, mode_class, is_cabin_mode, is_custom_mode, mode_time, preparation_video, began_video, pause_video, status, create_by, create_time, update_by, update_time, remark, technology_info, effect_content from wx_mode
+        select id, instrument_type, instrument_model, mode_name, mode_desc, mode_banner, mode_video, mode_type, mode_class, is_cabin_mode, is_custom_mode, mode_time, preparation_video, began_video, pause_video, status, create_by, create_time, update_by, update_time, remark, technology_info, effect_content, step_one_video, step_two_video, step_three_video from wx_mode
     </sql>
 
     <select id="selectWxModeList" parameterType="WxMode" resultMap="WxModeResult">
@@ -58,6 +61,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="technologyInfo != null "> and technology_info = #{technologyInfo}</if>
             <if test="effectContent != null "> and effect_content = #{effectContent}</if>
+            <if test="stepOneVideo != null "> and step_one_video = #{stepOneVideo}</if>
+            <if test="stepTwoVideo != null "> and step_two_video = #{stepTwoVideo}</if>
+            <if test="stepThreeVideo != null "> and step_three_video = #{stepThreeVideo}</if>
         </where>
         order by create_time desc
     </select>
@@ -101,8 +107,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-            <if test="technologyInfo != null "> technology_info</if>
+            <if test="technologyInfo != null "> technology_info,</if>
-            <if test="effectContent != null "> effect_content</if>
+            <if test="effectContent != null "> effect_content,</if>
+            <if test="stepOneVideo != null "> step_one_video,</if>
+            <if test="stepTwoVideo != null "> step_two_video,</if>
+            <if test="stepThreeVideo != null "> step_three_video,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="instrumentType != null">#{instrumentType},</if>
@@ -125,8 +134,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="technologyInfo != null "> #{technologyInfo}</if>
+            <if test="technologyInfo != null "> #{technologyInfo},</if>
-            <if test="effectContent != null "> #{effectContent}</if>
+            <if test="effectContent != null "> #{effectContent},</if>
+            <if test="stepOneVideo != null "> #{stepOneVideo},</if>
+            <if test="stepTwoVideo != null "> #{stepTwoVideo},</if>
+            <if test="stepThreeVideo != null "> #{stepThreeVideo},</if>
          </trim>
     </insert>
 
@@ -155,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="technologyInfo != null "> technology_info = #{technologyInfo}, </if>
             <if test="effectContent != null "> effect_content = #{effectContent}, </if>
+            <if test="stepOneVideo != null "> step_one_video = #{stepOneVideo}, </if>
+            <if test="stepTwoVideo != null "> step_two_video = #{stepTwoVideo}, </if>
+            <if test="stepThreeVideo != null "> step_three_video = #{stepThreeVideo}, </if>
         </trim>
         where id = #{id}
     </update>

flossom-ui/src/views/system/mode/index.vue

@@ -252,6 +252,60 @@
             <div slot="tip" class="el-upload__tip">只能上传视频文件，且不超过50M</div>
           </el-upload>
         </el-form-item>
+        <!--  步骤一视频      -->
+        <el-form-item label="步骤一视频" prop="stepOneVideo" v-if="form.instrumentModel == 'FR200' && form.modeType == 'moistureTest'" label-width="100px">
+          <el-upload
+            ref = "stepOneVideo"
+            class="upload-demo"
+            :action="upload.url"
+            :before-upload="limitVideFileType"
+            :on-preview="handlePreview"
+            :on-remove="handleRemoveStepOneVideo"
+            :on-success="handleFileSuccessStepOneVideo"
+            :headers="upload.headers"
+            :file-list="stepOneVideoFileList"
+            accept=".mp4,.avi,.mov,.rmvb,.rm,.flv,.3gp"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传视频文件，且不超过50M</div>
+          </el-upload>
+        </el-form-item>
+        <!--  步骤二视频      -->
+        <el-form-item label="步骤二视频" prop="stepTwoVideo" v-if="form.instrumentModel == 'FR200' && form.modeType == 'moistureTest'" label-width="100px">
+          <el-upload
+            ref = "stepTwoVideo"
+            class="upload-demo"
+            :action="upload.url"
+            :before-upload="limitVideFileType"
+            :on-preview="handlePreview"
+            :on-remove="handleRemoveStepTwoVideo"
+            :on-success="handleFileSuccessStepTwoVideo"
+            :headers="upload.headers"
+            :file-list="stepTwoVideoFileList"
+            accept=".mp4,.avi,.mov,.rmvb,.rm,.flv,.3gp"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传视频文件，且不超过50M</div>
+          </el-upload>
+        </el-form-item>
+        <!--  步骤三视频      -->
+        <el-form-item label="步骤三视频" prop="stepThreeVideo" v-if="form.instrumentModel == 'FR200' && form.modeType == 'moistureTest'" label-width="100px">
+          <el-upload
+            ref = "stepThreeVideo"
+            class="upload-demo"
+            :action="upload.url"
+            :before-upload="limitVideFileType"
+            :on-preview="handlePreview"
+            :on-remove="handleRemoveStepThreeVideo"
+            :on-success="handleFileSuccessStepThreeVideo"
+            :headers="upload.headers"
+            :file-list="stepThreeVideoFileList"
+            accept=".mp4,.avi,.mov,.rmvb,.rm,.flv,.3gp"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">只能上传视频文件，且不超过50M</div>
+          </el-upload>
+        </el-form-item>
         <el-form-item v-if="form.instrumentType == 2" label="弹出视频窗" prop="openSource"  label-width="100px">
           <el-button type="primary" @click="showOpenSource">添加弹窗</el-button>
           <el-table :data="openSourceData" style="width: 100%"  max-height="250">
@@ -523,6 +577,12 @@ export default {
       // 封面list
       fileList: [],
       bannerList:[],
+      // 步骤一视频
+      stepOneVideoFileList:[],
+      // 步骤二视频
+      stepTwoVideoFileList:[],
+      // 步骤三视频
+      stepThreeVideoFileList:[],
       // 上传参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -591,7 +651,16 @@ export default {
         ],
         modeTime: [
           { required: true, message: "模式时长不能为空", trigger: "blur" }
-        ]
+        ],
+        stepOneVideo: [
+          { required: true, message: "步骤一视频不能为空", trigger: "blur" }
+        ],
+        stepTwoVideo: [
+          { required: true, message: "步骤二视频不能为空", trigger: "blur" }
+        ],
+        stepThreeVideo: [
+          { required: true, message: "步骤三视频不能为空", trigger: "blur" }
+        ],
       }
     };
   },
@@ -674,6 +743,9 @@ export default {
         technologyArrayMode: [],
         technologyInfo: null,
         effectContent: null,
+        stepOneVideo: null,
+        stepTwoVideo: null,
+        stepThreeVideo: null,
       };
       this.resetForm("form");
       this.bannerList = [];
@@ -704,6 +776,9 @@ export default {
       this.title = "添加模式";
       this.form.instrumentType = 1;
       this.openSourceData = [];
+      this.stepOneVideoFileList = [];
+      this.stepTwoVideoFileList = [];
+      this.stepThreeVideoFileList = [];
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -711,6 +786,9 @@ export default {
       const id = row.id || this.ids
       this.bannerList = [];
       this.fileList = [];
+      this.stepOneVideoFileList = [];
+      this.stepTwoVideoFileList = [];
+      this.stepThreeVideoFileList = [];
       getMode(id).then(response => {
         this.form = response.data;
         this.form.modeType = String(this.form.modeType)
@@ -742,6 +820,25 @@ export default {
         if(this.form.technologyInfo) {
           this.form.technologyArrayMode = this.form.technologyInfo.split(",");
         }
+        // FR200仪器水分测试步骤视频清理
+        if(this.form.stepOneVideo != null) {
+          this.stepOneVideoFileList.push({
+            name: this.handleFileInfo(this.form.stepOneVideo),
+            url: this.form.stepOneVideo
+          })
+        }
+        if(this.form.stepTwoVideo != null) {
+          this.stepTwoVideoFileList.push({
+            name: this.handleFileInfo(this.form.stepTwoVideo),
+            url: this.form.stepTwoVideo
+          })
+        }
+        if(this.form.stepThreeVideo != null) {
+          this.stepThreeVideoFileList.push({
+            name: this.handleFileInfo(this.form.stepThreeVideo),
+            url: this.form.stepThreeVideo
+          })
+        }
       });
     },
     handleFileInfo(url) {
@@ -847,7 +944,7 @@ export default {
         }
       }
       // 使用技术
-      if(this.form.technologyArrayMode.length > 0) {
+      if(this.form.technologyArrayMode!=null &&this.form.technologyArrayMode.length > 0) {
         this.form.technologyInfo = this.form.technologyArrayMode.join(",");
       }
       this.$refs["form"].validate(valid => {
@@ -902,6 +999,21 @@ export default {
       // console.log('调用了删除')
       this.bannerList = [];
     },
+    handleRemoveStepOneVideo(file, fileList) {
+      this.$refs.stepOneVideo.clearFiles();
+      this.stepOneVideoFileList = [];
+      this.form.stepOneVideo = null;
+    },
+    handleRemoveStepTwoVideo(file, fileList) {
+      this.$refs.stepTwoVideo.clearFiles();
+      this.stepTwoVideoFileList = [];
+      this.form.stepTwoVideo = null;
+    },
+    handleRemoveStepThreeVideo(file, fileList) {
+      this.$refs.stepThreeVideo.clearFiles();
+      this.stepThreeVideoFileList = [];
+      this.form.stepThreeVideo = null;
+    },
     handlePreview(file) {
       console.log(file);
     },
@@ -983,6 +1095,40 @@ export default {
         this.form.modeVideo = response.data.url;
       }
     },
+    // 步骤一视频
+    handleFileSuccessStepOneVideo(response, file, fileList, item) {
+      console.log('上传后的结果==>',JSON.stringify(response))
+      if(response.code == '200') {
+        this.stepOneVideoFileList = [];
+        this.stepOneVideoFileList.push({
+          name: response.data.name,
+          url: response.data.url,
+        })
+        this.form.stepOneVideo = response.data.url;
+      }
+    },
+    handleFileSuccessStepTwoVideo(response, file, fileList, item) {
+      console.log('上传后的结果==>',JSON.stringify(response))
+      if(response.code == '200') {
+        this.stepTwoVideoFileList = [];
+        this.stepTwoVideoFileList.push({
+          name: response.data.name,
+          url: response.data.url,
+        })
+        this.form.stepTwoVideo = response.data.url;
+      }
+    },
+    handleFileSuccessStepThreeVideo(response, file, fileList, item) {
+      console.log('上传后的结果==>',JSON.stringify(response))
+      if(response.code == '200') {
+        this.stepThreeVideoFileList = [];
+        this.stepThreeVideoFileList.push({
+          name: response.data.name,
+          url: response.data.url,
+        })
+        this.form.stepThreeVideo = response.data.url;
+      }
+    },
     // 封面上传成功处理
     handleBannerFileSuccess(response, file, fileList, item) {
       console.log('上传后的结果==>',JSON.stringify(response))