状态修改-视频

digital-management-system/src/main/java/com/zehong/system/domain/track/TProductMarkDetail.java

@@ -37,6 +37,9 @@ public class TProductMarkDetail extends BaseEntity
     @Excel(name = "装配图片")
     private String imgUrl;
 
+    @Excel(name = "装配视频")
+    private String videoUrl;
+
     /** $column.columnComment */
     private Long createId;
 
@@ -94,7 +97,16 @@ public class TProductMarkDetail extends BaseEntity
     {
         return imgUrl;
     }
-    public void setCreateId(Long createId) 
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public void setCreateId(Long createId)
     {
         this.createId = createId;
     }

digital-management-system/src/main/resources/mapper/track/TProductMarkDetailMapper.xml

@@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="imgUrl"    column="img_url"    />
         <result property="createTime"    column="create_time"    />
         <result property="createId"    column="create_id"    />
+        <result property="videoUrl"    column="video_url"    />
     </resultMap>
 
     <sql id="selectTProductMarkDetailVo">
-        select id, mark_id, orders, title, content, img_url, create_time, create_id, <include refid="Common.createBy"/> from t_product_mark_detail
+        select id, mark_id, orders, title, content, img_url, create_time, create_id, video_url, <include refid="Common.createBy"/> from t_product_mark_detail
     </sql>
 
     <select id="selectTProductMarkDetailList" parameterType="TProductMarkDetail" resultMap="TProductMarkDetailResult">
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="imgUrl != null">img_url,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createId != null">create_id,</if>
+            <if test="videoUrl != null">video_url,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="markId != null">#{markId},</if>
@@ -53,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="imgUrl != null">#{imgUrl},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createId != null">#{createId},</if>
+            <if test="videoUrl != null">#{videoUrl},</if>
          </trim>
     </insert>
 
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="imgUrl != null">img_url = #{imgUrl},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createId != null">create_id = #{createId},</if>
+            <if test="videoUrl != null">video_url = #{videoUrl},</if>
         </trim>
         where id = #{id}
     </update>

digital-management-web/src/views/project/info/index.vue

@@ -172,6 +172,19 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="项目状态" prop="status">
+              <el-select style="width: 100%" v-model="form.status" placeholder="请选择项目状态" clearable size="small">
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
             <el-form-item label="项目描述">
               <el-input type="textarea" v-model="form.content" :autosize="{ minRows: 5 }"/>

digital-management-web/src/views/track/execute/index.vue

@@ -173,6 +173,19 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="执行状态" prop="status">
+              <el-select style="width: 100%" v-model="form.status" placeholder="请选择执行状态" clearable size="small">
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">

digital-management-web/src/views/track/mark/detail/components/DetailInfo.vue

@@ -37,14 +37,23 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <el-col :span="12">
+          <el-form-item label="装配视频">
+            <span v-if="detailInfo.videoUrl">
+              <video width="250" height="200" controls :src="detailInfo.videoUrl"/>
+            </span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
           <el-form-item label="装配图片">
             <el-image
               v-if="detailInfo.imgUrl"
               :src="detailInfo.imgUrl"
               :preview-src-list="[detailInfo.imgUrl]"
               :z-index="9999"
-              style="width: 100px;height: 100px;"
+              style="width: 200px;height: 200px;"
             ></el-image>
             <span v-else>-</span>
           </el-form-item>

digital-management-web/src/views/track/mark/detail/index.vue

@@ -132,12 +132,27 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="24">
+            <el-form-item label="装配视频">
+              <FileUpload
+                listType="picture"
+                @resFun="getFileInfoVideo"
+                @remove="listRemoveVideo"
+                :fileArr="fileListVideo"
+                :fileSize="50"
+                :fileType="['mp4']"
+              />
+              <el-input v-show="false" disabled v-model="form.videoUrl"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
             <el-form-item label="装配图片">
               <imageUpload v-model="form.imgUrl"/>
             </el-form-item>
           </el-col>
 
+
         </el-row>
 
       </el-form>
@@ -157,11 +172,14 @@
 import { listDetail, getDetail, delDetail, addDetail, updateDetail, exportDetail } from "@/api/track/detail";
 import ImageUpload from '@/components/ImageUpload';
 import DetailInfo from "./components/DetailInfo";
+import FileUpload from "@/components/FileUpload";
+import uploadfile from "@/assets/uploadfile.png";
 export default {
   name: "Detail",
   components: {
     ImageUpload,
-    DetailInfo
+    DetailInfo,
+    FileUpload
   },
   data() {
     return {
@@ -207,7 +225,8 @@ export default {
         content: [
           { required: true, message: "装配描述不能为空", trigger: "blur" }
         ]
-      }
+      },
+      fileListVideo: []
     };
   },
   created() {
@@ -239,9 +258,11 @@ export default {
         content: null,
         imgUrl: null,
         createTime: null,
-        createId: null
+        createId: null,
+        videoUrl: null
       };
       this.resetForm("form");
+      this.fileListVideo = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -273,6 +294,12 @@ export default {
       getDetail(id).then(response => {
         this.form = response.data;
         this.open = true;
+        this.fileListVideo = this.form.videoUrl? [
+          {
+            name: this.form.title + "视频",
+            url: uploadfile,
+          },
+        ]:[];
         this.title = "修改装配详情";
       });
     },
@@ -331,6 +358,19 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.id);
     },
+    getFileInfoVideo(res) {
+      this.form.videoUrl = res.url;
+      this.fileListVideo = [
+        {
+          name: res.fileName,
+          url: uploadfile,
+        },
+      ];
+    },
+    listRemoveVideo(e) {
+      this.fileListVideo = [];
+      this.form.videoUrl = "";
+    },
   }
 };
 </script>

digital-management-web/src/views/track/plan/index.vue

@@ -140,6 +140,19 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="计划状态" prop="status">
+              <el-select style="width: 100%;" v-model="form.status" placeholder="请选择计划状态" clearable size="small">
+                <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
             <el-form-item label="计划描述" prop="content">
               <el-input v-model="form.content" :autosize="{ minRows: 3 }" type="textarea" placeholder="请输入内容" />