From df116c3c2ff9a1dddeff2d72af25b58a51669f30 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Mon, 25 Mar 2024 15:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=A8=A1=E5=BC=8F=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxInstrumentServiceImpl.java |  4 +-
 flossom-ui/src/views/system/mode/index.vue    | 63 +++++++++++++++----
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
index 506a0e6..9ee1f03 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
@@ -457,7 +457,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             BeanUtils.copyProperties(wxMode, wxModeRet);
             if (wxMode.getInstrumentType() == 2) {
                 // IOT仪器才可以设置模式时长
-                wxModeRet.setModeTime(LocalTime.of(0, wxMode.getModeTime()));
+                if(wxMode.getModeTime() != null) {
+                    wxModeRet.setModeTime(LocalTime.ofSecondOfDay(wxMode.getModeTime()));
+                }
             }
             Boolean isLock = false;
             if (wxModeTagList != null && wxModeTagList.size() > 0) {
diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue
index 3ed1c0d..469d434 100644
--- a/flossom-ui/src/views/system/mode/index.vue
+++ b/flossom-ui/src/views/system/mode/index.vue
@@ -38,7 +38,11 @@
         </template>
       </el-table-column>
       <el-table-column label="模式名称" align="center" prop="modeName" />
-      <el-table-column label="模式时长(分钟)" align="center" prop="modeTime" width="180" />
+      <el-table-column label="模式时长" align="center" prop="modeTime" width="180" >
+        <template slot-scope="scope">
+          {{ convertToHMS(scope.row.modeTime) }}
+        </template>
+      </el-table-column>
       <el-table-column label="模式封面图片" align="center" prop="modeBanner" >
         <template slot-scope="scope">
           <el-image :src="scope.row.modeBanner" style="width: 60px;height: 80px" :preview-src-list="[scope.row.modeBanner]">
@@ -215,7 +219,14 @@
           <el-input v-model="form.modeDesc" placeholder="请输入模式描述" maxlength="10"/>
         </el-form-item>
         <el-form-item label="模式时长" prop="modeTime" v-if="form.instrumentType == 2">
-          <el-input type="number" v-model="form.modeTime" placeholder="请输入模式时间" maxlength="5" oninput ="value=value.replace(/[^\d]/g,'')"/>
+          <el-time-picker
+            v-model="form.modeTimeStr"
+            value-format="HH:mm:ss"
+            placeholder="请选择模式时长"
+            default-value="00:00:00"
+            @input="pickedTimeComponentChange"
+          >
+          </el-time-picker>
         </el-form-item>
         <el-form-item label="模式封面" prop="modeBanner">
           <el-upload
@@ -733,7 +744,7 @@ export default {
         modeVideo: [
           { required: true, message: "模式视频不能为空", trigger: "blur" }
         ],
-        modeTime: [
+        modeTimeStr: [
           { required: true, message: "模式时长不能为空", trigger: "blur" }
         ],
         stepOneVideo: [
@@ -814,7 +825,8 @@ export default {
         modeType: null,
         modeClass: null,
         isCabinMode: null,
-        modeTime: 0,
+        modeTime: null,
+        modeTimeStr: '00:00:00',
         preparationVideo: null,
         beganVideo: null,
         pauseVideo: null,
@@ -929,6 +941,12 @@ export default {
             url: this.form.stepThreeVideo
           })
         }
+        if(this.form.modeTime == null||this.form.modeTime == 0) {
+          this.form.modeTimeStr = '00:00:00';
+          this.form.modeTime = 0;
+        } else {
+          this.form.modeTimeStr = this.convertToHMS(this.form.modeTime);
+        }
       });
     },
     handleFileInfo(url) {
@@ -1033,13 +1051,6 @@ export default {
         this.$message.error("模式功效不能为空");
         return;
       }
-      if (this.form.modeTime) {
-        const regex = /[^0-9]/g;
-        if (regex.test(this.form.modeTime)) {
-          this.$modal.msgError("时长仅支持输入正整数");
-          return;
-        }
-      }
       // 使用技术
       if(this.form.technologyArrayMode!=null &&this.form.technologyArrayMode.length > 0) {
         this.form.technologyInfo = this.form.technologyArrayMode.join(",");
@@ -1419,7 +1430,35 @@ export default {
         this.combineData = this.combineData.filter(x => x.id != row.id);
       }
     },
-  }
+    // 处理时间组件
+    pickedTimeComponentChange() {
+      console.log(this.form.modeTimeStr)
+      if(this.form.modeTimeStr == null) {
+        this.form.modeTimeStr = '00:00:00'
+        this.form.modeTime = 0;
+      } else {
+        this.form.modeTime = this.convertToSeconds(this.form.modeTimeStr);
+        this.$forceUpdate();
+      }
+    },
+    convertToSeconds(timeStr) {
+      let hms = timeStr.split(':'); // split it at the colons
+      return (+hms[0]) * 60 * 60 + (+hms[1]) * 60 + (+hms[2]);
+    },
+    convertToHMS(seconds) {
+      var hours = Math.floor(seconds / 3600);
+      seconds %= 3600;
+      var minutes = Math.floor(seconds / 60);
+      var seconds = seconds % 60;
+      // Pad the time values if they are less than 10
+      hours = hours < 10 ? '0' + hours : hours;
+      minutes = minutes < 10 ? '0' + minutes : minutes;
+      seconds = seconds < 10 ? '0' + seconds : seconds;
+      return hours + ':' + minutes + ':' + seconds;
+    }
+
+
+}
 };
 </script>