From dbbc507324a732c6729869a2a9c916c5e1e3e174 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Mon, 15 Apr 2024 18:11:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?'=E6=9B=B4=E6=96=B0=E4=BA=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BF=AE=E6=94=B9=E7=AD=89'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoSprout-ui/src/api/device/device.js        |   78 +-
 .../src/views/device/device/index.vue         | 1687 ++++++++++++++---
 .../src/views/device/record/index.vue         |  146 +-
 AutoSprout-ui/vue.config.js                   |    4 +-
 4 files changed, 1617 insertions(+), 298 deletions(-)

diff --git a/AutoSprout-ui/src/api/device/device.js b/AutoSprout-ui/src/api/device/device.js
index 7039814..965693a 100644
--- a/AutoSprout-ui/src/api/device/device.js
+++ b/AutoSprout-ui/src/api/device/device.js
@@ -1,51 +1,81 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询设备列表列表
 export function listDevice(query) {
   return request({
-    url: '/device/device/list',
-    method: 'get',
-    params: query
-  })
+    url: "/device/device/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询设备列表详细
 export function getDevice(deviceId) {
   return request({
-    url: '/device/device/' + deviceId,
-    method: 'get'
-  })
+    url: "/device/device/" + deviceId,
+    method: "get",
+  });
+}
+// 查询定时列表
+export function getregulartime(params) {
+  return request({
+    url: "/app/timer/list/",
+    method: "get",
+    params: params,
+  });
+}
+// 定时删除
+export function deleteTimer(deviceId,index) {
+	return request({
+		url: '/app/timer/' + deviceId + '/' + index,
+		method: 'DELETE',
+	});
 }
 // 手动浇水
-export function watering(deviceId,wateringSwitch) {
+export function watering(deviceId, wateringSwitch) {
   return request({
-    url: '/device/device/watering/' + deviceId+"/"+wateringSwitch,
-    method: 'get'
-  })
+    url: "/device/device/watering/" + deviceId + "/" + wateringSwitch,
+    method: "get",
+  });
+}
+// 新建定时
+export function getadd(data) {
+	return request({
+		url: '/app/timer',
+		method: 'post',
+		data: data
+	})
+}
+// 定时修改
+export function getxiug(data) {
+	return request({
+		url: '/app/timer',
+		method: 'PUT',
+		data: data
+	})
 }
-
 // 新增设备列表
 export function addDevice(data) {
   return request({
-    url: '/device/device',
-    method: 'post',
-    data: data
-  })
+    url: "/device/device",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改设备列表
 export function updateDevice(data) {
   return request({
-    url: '/device/device',
-    method: 'put',
-    data: data
-  })
+    url: "/device/device",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除设备列表
 export function delDevice(deviceId) {
   return request({
-    url: '/device/device/' + deviceId,
-    method: 'delete'
-  })
+    url: "/device/device/" + deviceId,
+    method: "delete",
+  });
 }
diff --git a/AutoSprout-ui/src/views/device/device/index.vue b/AutoSprout-ui/src/views/device/device/index.vue
index 5b0b734..85e3b95 100644
--- a/AutoSprout-ui/src/views/device/device/index.vue
+++ b/AutoSprout-ui/src/views/device/device/index.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索区   -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="设备名称" prop="deviceName">
         <el-input
           v-model="queryParams.deviceName"
@@ -36,7 +42,11 @@
         />
       </el-form-item>
       <el-form-item label="在线状态" prop="onlineStatus">
-        <el-select v-model="queryParams.onlineStatus" placeholder="请选择在线状态" clearable>
+        <el-select
+          v-model="queryParams.onlineStatus"
+          placeholder="请选择在线状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.as_online_status"
             :key="dict.value"
@@ -54,8 +64,16 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -69,7 +87,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:device:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -80,7 +99,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:device:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -91,7 +111,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:device:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -101,37 +122,58 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:device:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表区   -->
-    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="deviceList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="deviceId" />
       <el-table-column label="图片" align="center" prop="picture" width="100">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+          <image-preview :src="scope.row.picture" :width="50" :height="50" />
         </template>
       </el-table-column>
       <el-table-column label="名称" align="center" prop="deviceName" />
       <el-table-column label="分类" align="center" prop="classifyName" />
       <el-table-column label="型号" align="center" prop="model" />
       <el-table-column label="设备Mac号" align="center" prop="mac" />
-      <el-table-column label="激活时间" align="center" prop="activationTime" width="180">
+      <el-table-column
+        label="激活时间"
+        align="center"
+        prop="activationTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.activationTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.activationTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="在线状态" align="center" prop="onlineStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.as_online_status" :value="scope.row.onlineStatus"/>
+          <dict-tag
+            :options="dict.type.as_online_status"
+            :value="scope.row.onlineStatus"
+          />
         </template>
       </el-table-column>
       <el-table-column label="用户" align="center" prop="nickName" />
       <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="操作" :width="200" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        :width="200"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -139,21 +181,31 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:device:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:device:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-alarm-clock"
+            @click="handleclock(scope.row)"
+            v-hasPermi="['device:device:remove']"
+            >定时</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页区   -->
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -161,154 +213,298 @@
     />
 
     <!-- 添加或修改设备列表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-col :span="24">
           <el-col :span="12">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入设备名称"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="分类" prop="classifyId" style="width:100%;">
-              <el-input v-model="form.classifyName" v-if="false"  />
-              <el-select v-model="form.classifyId" filterable clearable placeholder="请选择" >
+            <el-form-item label="分类" prop="classifyId" style="width: 100%">
+              <el-input v-model="form.classifyName" v-if="false" />
+              <el-select
+                v-model="form.classifyId"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="item in classifyOptions"
                   :key="item.classifyId"
                   :label="item.classifyName"
-                  :value="item.classifyId">
+                  :value="item.classifyId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="型号" prop="modelId" style="width:100%;">
-              <el-select v-model="form.modelId" filterable clearable placeholder="请选择型号" >
+            <el-form-item label="型号" prop="modelId" style="width: 100%">
+              <el-select
+                v-model="form.modelId"
+                filterable
+                clearable
+                placeholder="请选择型号"
+              >
                 <el-option
                   v-for="item in modelOptions"
                   :key="item.modelId"
                   :label="item.modelName"
-                  :value="item.modelId">
+                  :value="item.modelId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="版本号" prop="versionId" style="width:100%;">
-              <el-select v-model="form.versionId" filterable clearable placeholder="请选择" >
+            <el-form-item label="版本号" prop="versionId" style="width: 100%">
+              <el-select
+                v-model="form.versionId"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="item in versionOptions"
                   :key="item.versionId"
                   :label="item.version"
-                  :value="item.versionId">
+                  :value="item.versionId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="图片" prop="picture">
-              <image-upload v-model="form.picture"/>
+              <image-upload v-model="form.picture" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备Mac" prop="mac">
-              <el-input v-model="form.mac" placeholder="请输入设备Mac号" />
+              <el-input v-model="form.mac" placeholder="请输入设备Mac号" :disabled="title=='修改设备'"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户" prop="userId" style="width:100%;">
-              <el-select v-model="form.userId" filterable clearable placeholder="请选择" >
+            <el-form-item label="用户" prop="userId" style="width: 100%">
+              <el-select
+                v-model="form.userId"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="item in userOptions"
                   :key="item.userId"
                   :label="item.userName"
-                  :value="item.userId">
+                  :value="item.userId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-col>
 
-        <hr style="border-style: groove;">
+        <hr style="border-style: groove" />
 
         <el-col :span="24">
-
           <!-- 定时浇水 -->
           <el-col :span="12" class="col-style">
-            <el-form-item class="el-form-item" label="定时" label-width="60px" prop="regularWatering"><!-- 浇水规则json -->
-              <el-switch v-model="form.regularWatering" class="drawer-switch switch-margin" active-color="#13ce66"/>
+            <el-form-item
+              class="el-form-item"
+              label="定时"
+              label-width="60px"
+              prop="regularWatering"
+              ><!-- 浇水规则json -->
+              <el-switch
+                v-model="form.regularWatering"
+                class="drawer-switch switch-margin"
+                active-color="#13ce66"
+              />
             </el-form-item>
             <div class="fontdesc margin-40px">按照间隔时间进行定时浇水</div>
-            <div class="div1" >
+            <div class="div1">
               <span class="span1">启动时间：</span>
               <span class="span3">分</span>
-              <el-input-number class="span2" size="mini" v-model="form.regularWateringJsonObj.startMin"></el-input-number>
+              <el-input-number
+                class="span2"
+                size="mini"
+                v-model="form.regularWateringJsonObj.startMin"
+              ></el-input-number>
               <span class="span3">时</span>
-              <el-input-number class="span2" size="mini" v-model="form.regularWateringJsonObj.startHour"></el-input-number>
+              <el-input-number
+                class="span2"
+                size="mini"
+                v-model="form.regularWateringJsonObj.startHour"
+              ></el-input-number>
             </div>
             <div class="div1">
               <span class="span1">喷洒时间：</span>
               <span class="span3">秒</span>
-              <el-input-number class="span2" size="mini" v-model="form.sprayTimeSec"></el-input-number>
+              <el-input-number
+                class="span2"
+                size="mini"
+                v-model="form.sprayTimeSec"
+              ></el-input-number>
               <span class="span3">分</span>
-              <el-input-number class="span2" size="mini" v-model="form.sprayTimeMin"></el-input-number>
+              <el-input-number
+                class="span2"
+                size="mini"
+                v-model="form.sprayTimeMin"
+              ></el-input-number>
             </div>
             <div class="div1 font11">
-              <span>单次浇水时间不可超过20分钟，防止电机过度发热，浇水量大可缩短浇水间隔时间</span>
+              <span
+                >单次浇水时间不可超过20分钟，防止电机过度发热，浇水量大可缩短浇水间隔时间</span
+              >
             </div>
           </el-col>
 
           <!-- 智能土壤湿度 -->
-          <el-col :span="12" class="col-style ">
-            <el-form-item label="智能土壤湿度" class="margin-40px el-form-item" label-width="100px" prop="soilMoistureOpen">
-              <el-switch v-model="form.soilMoisture" class="drawer-switch switch-margin" active-color="#13ce66"/>
+          <el-col :span="12" class="col-style">
+            <el-form-item
+              label="智能土壤湿度"
+              class="margin-40px el-form-item"
+              label-width="100px"
+              prop="soilMoistureOpen"
+            >
+              <el-switch
+                v-model="form.soilMoisture"
+                class="drawer-switch switch-margin"
+                active-color="#13ce66"
+              />
             </el-form-item>
             <div class="fontdesc margin-40px">开启设备将自动调整土壤湿度</div>
             <span class="margin-5px margin-40px">启动土壤湿度</span>
-            <el-slider  v-model="form.soilMoistureOpen" class="margin-5px margin-40px">
+            <el-slider
+              v-model="form.soilMoistureOpen"
+              class="margin-5px margin-40px"
+            >
             </el-slider>
             <span class="margin-5px margin-40px">停止土壤湿度</span>
-            <el-slider  v-model="form.soilMoistureClose" class="margin-5px margin-40px">
+            <el-slider
+              v-model="form.soilMoistureClose"
+              class="margin-5px margin-40px"
+            >
             </el-slider>
           </el-col>
 
           <!-- 脉冲模式 -->
           <el-col :span="12" class="col-style">
-              <el-form-item class="el-form-item"  label="脉冲模式" prop="pulseMode">
-                <el-switch v-model="form.pulseMode" class="drawer-switch switch-margin" active-color="#13ce66"/>
-              </el-form-item>
-              <div class="fontdesc margin-40px">开启脉冲将会浇水停止相互循环</div>
-              <div class="div1" >
-                <span class="span1">喷洒时间：</span>
-                <span class="span3">秒</span>
-                <el-input-number class="span2" size="mini" v-model="form.pulseModeParamObj.sprayTime"></el-input-number>
-              </div>
-              <div class="div1">
-                <span class="span1">间隔时间：</span>
-                <span class="span3">秒</span>
-                <el-input-number class="span2" size="mini" v-model="form.pulseModeParamObj.intervalTime"></el-input-number>
-              </div>
+            <el-form-item
+              class="el-form-item"
+              label="脉冲模式"
+              prop="pulseMode"
+            >
+              <el-switch
+                v-model="form.pulseMode"
+                class="drawer-switch switch-margin"
+                active-color="#13ce66"
+              />
+            </el-form-item>
+            <div class="fontdesc margin-40px">开启脉冲将会浇水停止相互循环</div>
+            <div class="div1">
+              <span class="span1">喷洒时间：</span>
+              <span class="span3">秒</span>
+              <el-input-number
+                class="span2"
+                size="mini"
+                v-model="form.pulseModeParamObj.sprayTime"
+              ></el-input-number>
+            </div>
+            <div class="div1">
+              <span class="span1">间隔时间：</span>
+              <span class="span3">秒</span>
+              <el-input-number
+                class="span2"
+                size="mini"
+                v-model="form.pulseModeParamObj.intervalTime"
+              ></el-input-number>
+            </div>
           </el-col>
 
           <!-- 水流强度 -->
           <el-col :span="12" class="col-style">
-            <el-form-item  class="el-form-item" label="水流强度" label-width="90px" prop="waterIntensity">
-              <el-switch v-model="form.waterIntensitySwitch" class="drawer-switch switch-margin" active-color="#13ce66"/>
+            <el-form-item
+              class="el-form-item"
+              label="水流强度"
+              label-width="90px"
+              prop="waterIntensity"
+            >
+              <el-switch
+                v-model="form.waterIntensitySwitch"
+                class="drawer-switch switch-margin"
+                active-color="#13ce66"
+              />
             </el-form-item>
             <div class="fontdesc margin-40px">水流强度分为5档</div>
-            <el-slider :max="5"
-                       v-model="form.waterIntensity"
-                       :step="1"
-                       :min="1"
-                       show-stops class="margin-40px switch-water">
+            <div class="fontdesc margin-40px">当前水流强度分为{{form.waterIntensity}}档</div>
+            <el-slider
+              :max="5"
+              v-model="form.waterIntensity"
+              :step="1"
+              :min="1"
+              show-stops
+              class="margin-40px switch-water"
+            >
             </el-slider>
           </el-col>
 
+          <!-- 日期选择 -->
+          <!-- <el-col :span="12" class="col-style">
+            <el-form-item
+              class="el-form-item"
+              label="浇水日期"
+              label-width="90px"
+              prop="waterIntensity"
+            ></el-form-item>
+            <div class="fontdesc margin-40px">浇水循环日期</div>
+            <div class="day" style="padding-left: 20px">
+              <div class="title">
+                <span
+                  v-for="(item, index) in daytext"
+                  :key="index"
+                  style="display: inline-block; margin-right: 22px"
+                  >{{ item }}</span
+                >
+              </div>
+              <ul style="list-style: none; display: flex">
+                <li
+                  v-for="(item, index) in weekady"
+                  :key="index"
+                  style="width: 40px; height: 40px"
+                  :class="{ activeli: activeDays[index] }"
+                  @click="btnweek(item, index)"
+                >
+                  {{ item }}
+                </li>
+              </ul>
+            </div>
+          </el-col> -->
+          <!-- <el-col :span="12" style="width:50%,height:200px">
+            <div class="kongb"></div>
+          </el-col> -->
+
           <!-- 息屏 -->
           <el-col :span="12">
-            <el-form-item label="息屏" prop="screenRestTime" class="margin-top20">
-              <el-select v-model="form.screenRestTime" placeholder="请选择息屏时间">
+            <el-form-item
+              label="息屏"
+              prop="screenRestTime"
+              class="margin-top20"
+            >
+              <el-select
+                v-model="form.screenRestTime"
+                placeholder="请选择息屏时间"
+              >
                 <el-option
                   v-for="dict in dict.type.as_screen_rest_time"
                   :key="dict.value"
@@ -320,66 +516,362 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="手动浇水" prop="wateringSwitch" class="margin-top20">
+            <el-form-item
+              label="手动浇水"
+              prop="wateringSwitch"
+              class="margin-top20"
+            >
               <el-switch
                 v-model="wateringSwitch"
                 active-value="1"
                 inactive-value="0"
                 @change="handleWatering()"
-                class="drawer-switch switch-margin" active-color="#13ce66"/>
+                class="drawer-switch switch-margin"
+                active-color="#13ce66"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-col>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 定时弹框 -->
+    <div class="dingshibox" v-if="dingshiflag">
+      <div
+        class="qx"
+        style="
+          text-align: right;
+          padding-top: 10px;
+          padding-right: 10px;
+          display: flex;
+          justify-content: space-between;
+        "
+      >
+        <el-button type="primary" style="margin-left: 10px" @click="addbtntj"
+          >添加定时</el-button
+        >
+        <a href="javascript:;" @click="btnqx">X</a>
+      </div>
+      <div class="list">
+        <ul>
+          <li v-for="(item, index) in list" :key="index">
+            <div class="lt" @click="editds(item, index)">
+              <div class="tltle" style="font-size: 24px">
+                {{ item.startTime }} <span style="font-size: 18px;color:#ccc">{{ item.mode == 1 ? '单次浇水' : '循环浇水' }}</span>
+              </div> 
+              <span>{{ item.displayedDays[index] }}</span>
+              <span
+                style="
+                  width: 2px;
+                  height: 12px;
+                  display: inline-block;
+                  background-color: #ccc;
+                  margin: 0 15px;
+                "
+              ></span>
+              <span
+                >{{ item.minutes }}分{{
+                  item.seconds < 10 ? "0" + item.seconds : item.seconds
+                }}秒</span
+              >
+            </div>
+            <div class="rt">
+              <el-button
+                type="danger"
+                :plain="true"
+                @click="onCheckboxChange(item)"
+                >删 除</el-button
+              >
+            </div>
+          </li>
+        </ul>
+      </div>
+
+      <div class="anniu">
+        <el-button type="primary" @click="btnqx">确 定</el-button>
+        <el-button @click="btnqx">取 消</el-button>
+      </div>
+    </div>
+
+    <!-- 新增定时 -->
+    <div class="adddingshi" v-if="addflag">
+      <el-form ref="form" :model="sizeForm" label-width="80px" size="mini">
+        <el-form-item label="启动时间">
+          <el-col :span="11">
+            <el-time-picker
+              placeholder="选择时间"
+              v-model="sizeForm.date1"
+              style="width: 200px"
+            ></el-time-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="浇水时长">
+          <el-col :span="11">
+            <el-time-picker
+              placeholder="选择时间"
+              v-model="sizeForm.date2"
+              style="width: 200px"
+            ></el-time-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="定时模式">
+          <el-select
+            v-model="sizeForm.region"
+            placeholder="请选择"
+            style="width: 200px"
+          >
+            <el-option label="单次浇水" value="1"></el-option>
+            <el-option label="循环浇水" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <div class="circulate">
+          <div class="circulatetext">
+            <div class="">浇水循环日期</div> <div style="font-size: 18px;">全选: <input style="width:20px;height:20px;vertical-align: middle;" type="checkbox" v-model="checkedval" @change="inpqx"></div>
+          </div>
+          <div class="circulateday">
+            {{ dayyi }} {{ dayer }} {{ daysan }} {{ daysi }} {{ daywu }}
+            {{ dayliu }} {{ dayri }}
+          </div>
+          <div class="circulatelist">
+            <span @click="btnyi(index)" :class="yiindex == 1 ? 'active' : ''"
+              >一</span
+            >
+            <span @click="btner(index)" :class="erindex == 1 ? 'active' : ''"
+              >二</span
+            >
+            <span @click="btnsan(index)" :class="sanindex == 1 ? 'active' : ''"
+              >三</span
+            >
+            <span @click="btnsi(index)" :class="siindex == 1 ? 'active' : ''"
+              >四</span
+            >
+            <span @click="btnwu(index)" :class="wuindex == 1 ? 'active' : ''"
+              >五</span
+            >
+            <span @click="btnliu(index)" :class="liuindex == 1 ? 'active' : ''"
+              >六</span
+            >
+            <span @click="btnri(index)" :class="riindex == 1 ? 'active' : ''"
+              >日</span
+            >
+          </div>
+        </div>
+
+        <el-form-item size="large">
+          <el-button type="primary" :plain="true" @click="btnadd"
+            >确定添加</el-button
+          >
+          <el-button @click="addqutj">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 新增定时结束 -->
+
+    <!-- 修改定时 -->
+    <div class="adddingshi" v-if="addflag2">
+       <div style="margin-bottom: 10px;">
+         <span style="margin-right: 10px;">启动时间</span>
+         <el-time-picker
+        v-model="value1"
+        :picker-options="{
+          selectableRange: '00:00:00 - 23:59:59'
+        }"
+        placeholder="请选择时间"></el-time-picker>
+      </el-time-picker>
+       </div>
+       <div style="margin-bottom: 10px;">
+         <span style="margin-right: 10px;">浇水时长</span>
+         <el-time-picker
+        v-model="value2"
+        :picker-options="{
+          selectableRange: '00:00:00 - 23:59:59'
+        }"
+        placeholder="请选择时间"></el-time-picker>
+      </el-time-picker>
+       </div>
+       <div style="margin-bottom: 20px;">
+        <span style="margin-right: 10px;" >定时模式</span>
+        <el-select v-model="value" placeholder="请选择" style="width: 220px;">
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value">
+    </el-option>
+  </el-select>
+       </div>
+      <el-form ref="form" :model="sizeForm" label-width="80px" size="mini">
+        <div class="circulate">
+          <div class="circulatetext">
+            <div class="">浇水循环日期</div><div style="font-size: 18px;">全选: <input style="width:20px;height:20px;vertical-align: middle;" type="checkbox" v-model="checkedval" @change="inpqx"></div>
+          </div>
+          <div class="circulateday">
+            {{ dayyi }} {{ dayer }} {{ daysan }} {{ daysi }} {{ daywu }}
+            {{ dayliu }} {{ dayri }}
+          </div>
+          <div class="circulatelist">
+            <span @click="btnyi(index)" :class="yiindex == 1 ? 'active' : ''"
+              >一</span
+            >
+            <span @click="btner(index)" :class="erindex == 1 ? 'active' : ''"
+              >二</span
+            >
+            <span @click="btnsan(index)" :class="sanindex == 1 ? 'active' : ''"
+              >三</span
+            >
+            <span @click="btnsi(index)" :class="siindex == 1 ? 'active' : ''"
+              >四</span
+            >
+            <span @click="btnwu(index)" :class="wuindex == 1 ? 'active' : ''"
+              >五</span
+            >
+            <span @click="btnliu(index)" :class="liuindex == 1 ? 'active' : ''"
+              >六</span
+            >
+            <span @click="btnri(index)" :class="riindex == 1 ? 'active' : ''"
+              >日</span
+            >
+          </div>
+        </div>
+
+        <el-form-item size="large">
+          <el-button type="primary" :plain="true" @click="btnedit" >确定修改</el-button
+          >
+          <el-button @click="addqutjedit">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 修改定时结束 -->
+    <div class="mask" v-if="maskflag"></div>
   </div>
 </template>
 
 <script>
-import {listDevice, getDevice, delDevice, addDevice, updateDevice, watering} from "@/api/device/device";
-import {listClassify} from "@/api/device/classify";
-import {listVersion} from "@/api/device/version";
-import {listModel} from "@/api/device/model";
-import {listUser} from "@/api/system/user";
+import {
+  listDevice,
+  getDevice,
+  delDevice,
+  addDevice,
+  updateDevice,
+  watering,
+  getregulartime,
+  deleteTimer,
+  getadd,
+  getxiug,
+} from "@/api/device/device";
+import { listClassify } from "@/api/device/classify";
+import { listVersion } from "@/api/device/version";
+import { listModel } from "@/api/device/model";
+import { listUser } from "@/api/user/user";
 
 export default {
   name: "Device",
-  dicts: ['as_pulse_mode', 'as_screen_rest_time', 'as_online_status', 'as_water_intensity'],
+  dicts: [
+    "as_pulse_mode",
+    "as_screen_rest_time",
+    "as_online_status",
+    "as_water_intensity",
+  ],
   data() {
     return {
+      checkedval:false,
+      value2: new Date(2016,9,12,18,40,12),
+      value1:'',
+
+      addflag: false,
+      addlist: [],
+      deviceid: "",
+      index: "",
+      dayri: "",
+      dayyi: "",
+      dayer: "",
+      daysan: "",
+      daysi: "",
+      daywu: "",
+      dayliu: "",
+      riindex: 0,
+      yiindex: 0,
+      erindex: 0,
+      sanindex: 0,
+      siindex: 0,
+      wuindex: 0,
+      liuindex: 0,
+
+      sizeForm: {
+        name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+      },
+
+      options: [{
+          value: '1',
+          label: '单次浇水'
+        }, {
+          value: '2',
+          label: '循环浇水'
+        }],
+        value: '',
+      addflag2: false,
+
+      result: [],
+      list: [],
+      maskflag: false,
+      dingshiflag: false,
+      weeknumber: "",
+      activeDays: {
+        0: false,
+        1: false,
+        2: false,
+        3: false,
+        4: false,
+        5: false,
+        6: false,
+      },
+      daytext: [],
+      weekady: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
       wateringSwitch: null,
       intervalTime: null,
       sprayTime: null,
       //启动土壤湿度值
-      soilMoistureOpen:0,
+      soilMoistureOpen: 0,
       //停止土壤湿度值
-      soilMoistureClose:0,
+      soilMoistureClose: 0,
       //脉冲模式 {"sprayTime":1,"endTime":1}
-      pulseModeParam:{},
+      pulseModeParam: {},
       //水流强度
       waterIntensity: 1,
       //定时浇水json {"intervalTime":{"hour":1,"min":1},"sprayTime":{"min":1,"sec":1}}
       regularWateringJson: {
-        intervalTime:null
+        intervalTime: null,
       },
       //用户列表
-      userOptions:[],
+      userOptions: [],
       //型号列表
       modelOptions: [],
       //分类列表
       classifyOptions: [],
       //版本列表
       versionOptions: [],
+      weekday:'',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -409,76 +901,378 @@ export default {
         onlineStatus: null,
         nickName: null,
       },
+      deviceidedit:'',
+      indexsedit:'',
+      isSwitchedit:'',
+      sjmiao:'',
       // 表单参数
       form: {
-        sprayTimeMin:null,//喷洒时间分钟
-        sprayTimeSec:null,//喷洒时间秒
+        sprayTimeMin: null, //喷洒时间分钟
+        sprayTimeSec: null, //喷洒时间秒
         /**1.定时浇水开关*/
-        regularWatering:false,
+        regularWatering: false,
         //定时浇水json {"intervalTime":{"hour":1,"min":1},"sprayTime":{"min":1,"sec":1}}
-        regularWateringJsonObj:{
+        regularWateringJsonObj: {
           startHour: null,
           startMin: null,
           sprayTime: null,
         },
-        regularWateringJson:null,
+        regularWateringJson: null,
         /**2.智能土壤湿度开关*/
-        soilMoisture:false,
+        soilMoisture: false,
         //启动土壤湿度值
-        soilMoistureOpen:38,
+        soilMoistureOpen: 38,
         //停止土壤湿度值
-        soilMoistureClose:88,
+        soilMoistureClose: 88,
 
         /**3.脉冲模式开关*/
-        pulseMode:false,
+        pulseMode: false,
         //脉冲模式 {"sprayTime":1,"endTime":1}
-        pulseModeParamObj:{
+        pulseModeParamObj: {
           sprayTime: null,
-          intervalTime: null
+          intervalTime: null,
         },
-        pulseModeParam:null,
+        pulseModeParam: null,
 
         /**4.水流强度开关*/
-        waterIntensitySwitch:false,
+        waterIntensitySwitch: false,
         //水流强度
-        waterIntensity: 4
+        waterIntensity: 4,
       },
       // 表单校验
       rules: {
         deviceName: [
-          { required: true, message: "设备名称不能为空", trigger: "blur" }
+          { required: true, message: "设备名称不能为空", trigger: "blur" },
         ],
         classifyId: [
-          { required: true, message: "分类不能为空", trigger: "blur" }
+          { required: true, message: "分类不能为空", trigger: "blur" },
         ],
         versionId: [
-          { required: true, message: "版本不能为空", trigger: "blur" }
+          { required: true, message: "版本不能为空", trigger: "blur" },
         ],
         // classifyName: [
         //   { required: true, message: "分类名称不能为空", trigger: "blur" }
         // ],
-        modelId: [
-          { required: true, message: "型号不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户不能为空", trigger: "blur" }
-        ],
-        mac: [
-          { required: true, message: "mac值不能为空", trigger: "blur" }
-        ],
-
-      }
+        modelId: [{ required: true, message: "型号不能为空", trigger: "blur" }],
+        userId: [{ required: true, message: "用户不能为空", trigger: "blur" }],
+        mac: [{ required: true, message: "mac值不能为空", trigger: "blur" }],
+      },
     };
   },
   created() {
     this.getList();
   },
+  computed: {
+    // 将星期转成0000000制
+    dayBinaryString() {
+      // 定义一个包含所有星期几的数组
+      const allWeekdays = [
+        "周一",
+        "周二",
+        "周三",
+        "周四",
+        "周五",
+        "周六",
+        "周日",
+      ];
+      // 初始化一个只包含'0'的字符串
+      let binaryString = "0000000";
+      // 遍历所有星期几
+      allWeekdays.forEach((weekday, index) => {
+        // 检查this.daytext中是否包含当前星期几
+        if (this.daytext.includes(weekday)) {
+          // 如果包含，则在binaryString的对应位置放置'1'
+          binaryString =
+            binaryString.slice(0, index) + "1" + binaryString.slice(index + 1);
+        }
+        // 否则保持'0'不变
+      });
+      return binaryString;
+    },
+  },
   methods: {
+    // switchwater(){
+    //     console.log(this.form.waterIntensity);
+    // },
+    // 全选
+    inpqx(){
+       if (this.checkedval == true) {
+					this.riindex = 1
+					this.yiindex = 1
+					this.erindex = 1
+					this.sanindex = 1
+					this.siindex = 1
+					this.wuindex = 1
+					this.liuindex = 1
+					this.funxz()
+				} else {
+					this.riindex = 0
+					this.yiindex = 0
+					this.erindex = 0
+					this.sanindex = 0
+					this.siindex = 0
+					this.wuindex = 0
+					this.liuindex = 0
+					this.funxz()
+				}
+    },
+    addqutjedit() {
+      this.addflag2 = false;
+      this.sizeForm.date1 = "";
+      this.sizeForm.date2 = "";
+      this.checkedval = false
+      this.result = [];
+      this.inpqx()
+    },
+    editds(item, index) {
+      // console.log(item);
+      this.result = [];
+      this.deviceidedit = item.deviceId;
+      this.indexsedit = item.index;
+      this.isSwitchedit = item.isSwitch;
+      this.value = item.mode;
+      this.value1 = new Date(2016,9,12,item.startTime.slice(0, 2),item.startTime.slice(3, 5),item.startTime.slice(6, 8));
+      const miao = this.formatSeconds(item.wateringDuration)
+      this.value2 = new Date(2016,9,12,miao.slice(0, 2),miao.slice(3, 5),miao.slice(6, 8));
+      this.weekday = item.week
+      // const weekday = weekdays.toString()
+      // console.log(this.weekday);
+      if(this.weekday == '1111111'){
+				this.riindex = 1
+        this.yiindex = 1
+				this.erindex = 1
+				this.sanindex = 1
+				this.siindex = 1
+				this.wuindex = 1
+				this.liuindex = 1
+				this.funxz()
+			}else{
+        this.weekday = String(this.weekday);
+				this.weekday = this.weekday.padStart(7, '0')
+				this.yiindex = this.weekday.charAt(6)
+				this.erindex = this.weekday.charAt(5)
+				this.sanindex = this.weekday.charAt(4)
+				this.siindex = this.weekday.charAt(3)
+				this.wuindex = this.weekday.charAt(2)
+				this.liuindex = this.weekday.charAt(1)
+				this.riindex = this.weekday.charAt(0)
+				this.funxz()
+			}
+      this.addflag2 = true;
+    },
+    convertToSecondsFromArray(arr) {  
+        return parseInt(arr[0], 10) * 3600 + parseInt(arr[1], 10) * 60 + parseInt(arr[2], 10); 
+      },
+       
+    btnedit(){
+						this.addlist.push(this.yiindex==''?0:this.yiindex, this.erindex==''?0:this.erindex, this.sanindex == '' ? 0:this.sanindex, this.siindex == '' ? 0 :this.siindex, this.wuindex == 0 ? 0 :this.wuindex, this.liuindex == '' ? 0 : this.liuindex,this.riindex == '' ? 0 :this.riindex)
+            console.log(this.addlist);
+						this.addlist = this.addlist.reverse().join('');
+            this.value1 = this.extractedTime(this.value1)
+            this.value2 = this.extractedTimeToArrays(this.value2)
+            this.sjmiao = this.convertToSecondsFromArray(this.value2)
+						console.log(this.sjmiao);
+						let data = {
+							deviceId: this.deviceidedit,
+							startTimeStr: this.value1,
+							wateringDuration:this.sjmiao,
+							week: this.addlist,
+							mode:this.value,
+							isSwitch:this.isSwitchedit,
+							index:this.indexsedit
+						}
+						getxiug(data).then(res => {
+              this.$message({
+                  message: "修改成功",
+                  type: "success",
+                });
+              setTimeout(() => {
+                this.getgetregular(this.deviceid);
+              }, 2000);
+              this.addflag2 = false
+              this.addlist = []
+              this.checkedval = false
+						})
+    },
+    extractedTimeToArrays(originalDateString) {    
+  // 尝试解析日期字符串  
+  const date = new Date(originalDateString);  
+  if (isNaN(date)) {  
+    console.error('无法解析日期字符串');  
+    return null; // 或者返回一个空数组，取决于你如何处理错误情况  
+  }  
+    
+  // 提取时分秒  
+  const hours = date.getHours().toString().padStart(2, '0');  
+  const minutes = date.getMinutes().toString().padStart(2, '0');  
+  const seconds = date.getSeconds().toString().padStart(2, '0');  
+    
+  // 返回时分秒组成的数组  
+  return [hours, minutes, seconds];  
+},
+    extractedTime(originalDateString) {  
+      // 尝试解析日期字符串  
+      const date = new Date(originalDateString);  
+      if (isNaN(date)) {  
+        console.error('无法解析日期字符串');  
+        return '';  
+      }  
+        
+      // 提取时分秒  
+      const hours = date.getHours().toString().padStart(2, '0');  
+      const minutes = date.getMinutes().toString().padStart(2, '0');  
+      const seconds = date.getSeconds().toString().padStart(2, '0');  
+        
+      // 返回格式化后的字符串  
+      return `${hours}:${minutes}:${seconds}`;  
+    },
+
+
+    formatSeconds(totalSeconds) {  
+    const hours = Math.floor(totalSeconds / 3600);  
+    const minutes = Math.floor((totalSeconds % 3600) / 60);  
+    const seconds = totalSeconds % 60;  
+    // 使用padStart来确保小时、分钟和秒数都是两位数  
+    const formattedHours = String(hours).padStart(2, '0');  
+    const formattedMinutes = String(minutes).padStart(2, '0');  
+    const formattedSeconds = String(seconds).padStart(2, '0');  
+    return `${formattedHours}:${formattedMinutes}:${formattedSeconds}`;  
+  },
+
+    // 请求定时列表
+    getgetregular(deviceId) {
+      let params = {
+        deviceId: deviceId,
+      };
+      getregulartime(params).then((res) => {
+        res.rows.forEach((item) => {
+          let result;
+          if (item.week === "1111111") {
+            // 如果全部为1，则每天浇
+            result = "每天";
+          } else if (item.week === "0000000") {
+            // 如果全部为0，则只浇一次
+            result = "浇一次";
+          } else {
+            // 否则，调用convertWeekDays函数并检查结果
+            const displayedDays = this.convertWeekDays(parseInt(item.week, 2));
+            if (displayedDays) {
+              result = displayedDays;
+            }
+          }
+          // 如果设置了result，则将其倒转并添加到this.result中
+          if (result) {
+            // result = result.split(' ').reverse().join(' ');
+            this.result.push(result);
+          }
+          // 打印当前this.result状态，用于调试
+          // console.log(this.result);
+          // console.log(`ID: ${item.id}, 浇水日: ${result}`)
+        });
+        // 将数据使用map添加到数组中
+        this.list = res.rows.map((item) => {
+          // 将分钟转成总秒数
+          const minutes = Math.floor(item.wateringDuration / 60);
+          const seconds = item.wateringDuration % 60;
+          // 调用将week转成星期的函数
+          const displayedDays = this.convertWeekDays(parseInt(item.week));
+          return {
+            ...item, // 保留原始数据的所有属性
+            // isSwitchedOn: false, // 初始开关状态为关闭
+            // textClass: 'default-color', // 初始类名为默认颜色
+            minutes: minutes, // 添加分钟属性
+            seconds: seconds, // 添加秒属性
+            displayedDays: this.result, //添加星期属性
+          };
+        });
+        // console.log(this.list, "listlist");
+      });
+    },
+    // 根据0000000进行判断星期几
+    convertWeekDays(number) {
+      // console.log(number);
+      const daysOfWeek = [
+        "周一",
+        "周二",
+        "周三",
+        "周四",
+        "周五",
+        "周六",
+        "周日",
+      ];
+      let result = "";
+      // 将获取到的week中的0000000一个个进行循环判断
+      for (let i = 0; i < 7; i++) {
+        // << 将所有值左移一个一个判断是否为0
+        if ((number & (1 << i)) !== 0) {
+          // 判断有不等于0的则添加对应的星期几到result中
+          result += daysOfWeek[i] + "";
+        }
+      }
+      return result.trim();
+    },
+    addbtntj() {
+      this.result = [];
+      this.inpqx()
+      this.addflag = true;
+    },
+    // 点击取消定时
+    btnqx() {
+      this.dingshiflag = false;
+      this.maskflag = false;
+      this.result = [];
+    },
+    // 点击定时展开列表
+    handleclock(val) {
+      this.list = [];
+      this.deviceid = val.deviceId;
+      this.getgetregular(val.deviceId);
+      this.result = [];
+      this.maskflag = true;
+      this.dingshiflag = true;
+    },
+
+    printBinaryString() {
+      // 给weeknumber赋值
+      this.weeknumber = this.dayBinaryString;
+    },
+    // 点击日期
+    btnweek(item, index) {
+      this.$set(this.activeDays, index, !this.activeDays[index]);
+      const exists = this.daytext.includes(item);
+      if (exists) {
+        // 如果存在，则从数组中删除该值
+        const indexToRemove = this.daytext.indexOf(item);
+        if (indexToRemove !== -1) {
+          this.daytext.splice(indexToRemove, 1);
+        }
+      } else {
+        // 如果不存在，则添加到数组中
+        this.daytext.push(item);
+      }
+      // 进行日期排序
+      this.daytext.sort((a, b) => {
+        const weekdays = [
+          "周一",
+          "周二",
+          "周三",
+          "周四",
+          "周五",
+          "周六",
+          "周日",
+        ];
+        return weekdays.indexOf(a) - weekdays.indexOf(b);
+      });
+      // 调用星期转0000000
+      this.printBinaryString();
+    },
+
     /** 查询设备列表列表 */
     getList() {
       this.loading = true;
-      listDevice(this.queryParams).then(response => {
+      listDevice(this.queryParams).then((response) => {
         this.deviceList = response.rows;
+        console.log(this.deviceList);
         this.total = response.total;
         this.loading = false;
       });
@@ -491,28 +1285,28 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        sprayTimeMin:null,//喷洒时间分钟
-        sprayTimeSec:null,//喷洒时间秒
+        sprayTimeMin: null, //喷洒时间分钟
+        sprayTimeSec: null, //喷洒时间秒
         /**1.定时浇水开关*/
         //定时浇水json {"intervalTime":{"hour":1,"min":1},"sprayTime":{"min":1,"sec":1}}
-        regularWateringJsonObj:{
+        regularWateringJsonObj: {
           startHour: null,
           startMin: null,
           sprayTime: null,
         },
-        regularWateringJson:null,
+        regularWateringJson: null,
         /**2.智能土壤湿度开关*/
-        soilMoisture:false,
+        soilMoisture: false,
 
         /**3.脉冲模式开关*/
         //脉冲模式 {"sprayTime":1,"endTime":1}
-        pulseModeParamObj:{
+        pulseModeParamObj: {
           sprayTime: null,
-          intervalTime: null
+          intervalTime: null,
         },
-        pulseModeParam:null,
+        pulseModeParam: null,
         /**3.水流强度开关*/
-        waterIntensitySwitch:false,
+        waterIntensitySwitch: false,
         //水流强度
         deviceId: null,
         picture: null,
@@ -538,7 +1332,9 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
+        daytext: null,
+        weekday: null,
       };
       this.resetForm("form");
     },
@@ -554,24 +1350,75 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.deviceId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.deviceId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     getInitData() {
-      listClassify(this.queryParams).then(response => {
+      listClassify(this.queryParams).then((response) => {
         this.classifyOptions = response.rows;
       });
-      listVersion(this.queryParams).then(response2 => {
+      listVersion(this.queryParams).then((response2) => {
         this.versionOptions = response2.rows;
       });
-      listModel(this.queryParams).then(response3 => {
+      listModel(this.queryParams).then((response3) => {
         this.modelOptions = response3.rows;
       });
-      listUser(this.queryParams).then(response4 => {
+      listUser(this.queryParams).then((response4) => {
         this.userOptions = response4.rows;
       });
     },
+    funxz() {
+				if (this.sanindex == 1) {
+					this.daysan = '周三'
+					this.sanindex = 1
+				} else {
+					this.daysan = ''
+					this.sanindex = 0
+				}
+				if (this.siindex == 1) {
+					this.daysi = '周四'
+					this.siindex = 1
+				} else {
+					this.daysi = ''
+					this.siindex = 0
+				}
+				if (this.wuindex == 1) {
+					this.daywu = '周五'
+					this.wuindex = 1
+				} else {
+					this.daywu = ''
+					this.wuindex = 0
+				}
+				if (this.riindex == 1) {
+					this.dayri = '周日'
+					this.riindex = 1
+				} else {
+					this.dayri = ''
+					this.riindex = 0
+				}
+				if (this.erindex == 1) {
+					this.dayer = '周二'
+					this.erindex = 1
+				} else {
+					this.dayer = ''
+					this.erindex = 0
+				}
+				if (this.yiindex == 1) {
+					this.dayyi = '周一'
+					this.yiindex = 1
+				} else {
+					this.dayyi = ''
+					this.yiindex = 0
+				}
+				if (this.liuindex == 1) {
+					this.dayliu = '周六'
+					this.liuindex = 1
+				} else {
+					this.dayliu = ''
+					this.liuindex = 0
+				}
+			},
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -584,20 +1431,24 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const deviceId = row.deviceId || this.ids
+      const deviceId = row.deviceId || this.ids;
       this.getInitData();
-      getDevice(deviceId).then(response => {
+      getDevice(deviceId).then((response) => {
         this.form = response.data;
         /** 参数解析成对象*/
         this.form.pulseModeParamObj = JSON.parse(this.form.pulseModeParam);
-        this.form.regularWateringJsonObj = JSON.parse(this.form.regularWateringJson);
+        this.form.regularWateringJsonObj = JSON.parse(
+          this.form.regularWateringJson
+        );
         const sprayTime = this.form.regularWateringJsonObj.sprayTime;
         this.form.sprayTimeMin = Math.trunc(sprayTime / 60);
         this.form.sprayTimeSec = sprayTime % 60;
         this.form.regularWatering = JSON.parse(this.form.regularWatering);
         this.form.pulseMode = JSON.parse(this.form.pulseMode);
         this.form.soilMoisture = JSON.parse(this.form.soilMoisture);
-        this.form.waterIntensitySwitch = JSON.parse(this.form.waterIntensitySwitch);
+        this.form.waterIntensitySwitch = JSON.parse(
+          this.form.waterIntensitySwitch
+        );
         this.open = true;
         this.title = "修改设备";
       });
@@ -606,25 +1457,39 @@ export default {
     handleWatering() {
       const deviceId = this.form.deviceId;
       const wateringSwitch = this.wateringSwitch;
-      watering(deviceId,wateringSwitch).then(response => {
+      watering(deviceId, wateringSwitch).then((response) => {
         this.$modal.msg(response.msg);
       });
     },
+    convertSecondsToString(seconds) {  
+			    const minutes = Math.floor(seconds / 60);  
+			    const secs = seconds % 60;  
+			    return `${minutes.toString().padStart(2, '0') + '分'}${secs.toString().padStart(2, '0') + '秒'}`;  
+			},
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.form.regularWateringJsonObj.sprayTime = this.form.sprayTimeMin*60 + this.form.sprayTimeSec;
-          this.form.pulseModeParam = JSON.stringify(this.form.pulseModeParamObj);
-          this.form.regularWateringJson = JSON.stringify(this.form.regularWateringJsonObj);
+          this.form.regularWateringJsonObj.sprayTime =
+          this.form.sprayTimeMin * 60 + this.form.sprayTimeSec;
+          // this.form.pulseModeParam = JSON.stringify(this.form.pulseModeParamObj);
+         console.log(JSON.stringify(this.form.pulseModeParamObj.jg_sec));
+					this.form.pulseModeParamObj.jg_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.jg_sec))
+					this.form.pulseModeParamObj.js_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.js_sec))
+          this.form.pulseModeParam = JSON.stringify(this.form.pulseModeParamObj)
+
+          this.form.regularWateringJson = JSON.stringify(
+            this.form.regularWateringJsonObj
+          );
+          this.form.week = this.weeknumber;
           if (this.form.deviceId != null) {
-            updateDevice(this.form).then(response => {
+            updateDevice(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addDevice(this.form).then(response => {
+            addDevice(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -636,99 +1501,459 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceIds = row.deviceId || this.ids;
-      this.$modal.confirm('是否确认删除设备列表编号为"' + deviceIds + '"的数据项？').then(function() {
-        return delDevice(deviceIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除设备列表编号为"' + deviceIds + '"的数据项？')
+        .then(function () {
+          return delDevice(deviceIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
+    // 删除定时操作
+    onCheckboxChange(item) {
+      this.result = [];
+      const delid = item.index;
+      const deviceid = item.deviceId;
+      deleteTimer(deviceid, delid).then((res) => {
+        // 删除成功后重新调用列表接口进行刷新
+        this.$message({
+          message: "删除成功",
+          type: "success",
+        });
+        setTimeout(() => {
+          this.getgetregular(deviceid);
+        }, 2000); 
+        this.list = [];
+        this.result = [];
+      });
+    },
+
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/device/export', {
-        ...this.queryParams
-      }, `device_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/device/export",
+        {
+          ...this.queryParams,
+        },
+        `device_${new Date().getTime()}.xlsx`
+      );
+    },
+    addqutj() {
+      // this.addlist = [];
+      this.addflag = false;
+      this.sizeForm.date1 = "";
+      this.sizeForm.date2 = "";
+      this.sizeForm.region = "";
+      this.checkedval = false
+      this.result = [];
+      this.inpqx()
+      this.getgetregular(this.deviceid)
+    },
+    btnadd() {
+      if (this.sizeForm.date1 == "") {
+        this.$message.error("请选择启动时间");
+      } else if (this.sizeForm.date2 == "") {
+        this.$message.error("请选择喷洒时间");
+      } else {
+        if (
+          this.yiindex == 0 &&
+          this.erindex == 0 &&
+          this.sanindex == 0 &&
+          this.siindex == 0 &&
+          this.wuindex == 0 &&
+          this.liuindex == 0 &&
+          this.riindex == 0
+        ) {
+          this.$message.error("请选择日期");
+        } else if (this.sizeForm.region == "") {
+          this.$message.error("请选择浇水模式");
+        } else {
+          // 将要循环的日期添加进数组
+          this.addlist.push(
+            this.yiindex,
+            this.erindex,
+            this.sanindex,
+            this.siindex,
+            this.wuindex,
+            this.liuindex,
+            this.riindex
+          );
+          this.addlist = this.addlist.reverse().join("");
+          if (this.addlist == "0000000") {
+            this.$message.error("请选择日期");
+          } else {
+            // 给请求的data添加参数
+            this.sizeForm.date1 = this.formatTime(this.sizeForm.date1);
+            this.sizeForm.date2 = this.convertToTotalSeconds(
+              this.sizeForm.date2
+            );
+            const data = {
+              deviceId: this.deviceid,
+              startTimeStr: this.sizeForm.date1,
+              wateringDuration: this.sizeForm.date2,
+              week: this.addlist,
+              mode: this.sizeForm.region,
+            };
+            // 请求新建定时
+            getadd(data).then((res) => {
+              if (res.msg == "操作成功") {
+                this.$message({
+                  message: "添加成功",
+                  type: "success",
+                });
+                setTimeout(() => {
+                  this.getgetregular(this.deviceid);
+                }, 1500);
+                this.addflag = false;
+                this.sizeForm.date1 = "";
+                this.sizeForm.date2 = "";
+                this.sizeForm.region = "";
+                this.list = [];
+                this.addlist = [];
+                this.result = [];
+                this.funcsj();
+                this.checkedval = false
+              }
+            });
+          }
+        }
+      }
+    },
+    funcsj() {
+      this.index = "";
+      this.dayri = "";
+      this.dayyi = "";
+      this.dayer = "";
+      this.daysan = "";
+      this.daysi = "";
+      this.daywu = "";
+      this.dayliu = "";
+      this.riindex = 0;
+      this.yiindex = 0;
+      this.erindex = 0;
+      this.sanindex = 0;
+      this.siindex = 0;
+      this.wuindex = 0;
+      this.liuindex = 0;
+    },
+    // 转总秒数
+    convertToTotalSeconds(timestamp) {
+      const date = new Date(timestamp);
+      const hours = date.getHours();
+      const minutes = date.getMinutes();
+      const seconds = date.getSeconds();
+
+      // 将时、分、秒转换为总秒数
+      const totalSeconds = hours * 3600 + minutes * 60 + seconds;
+
+      return totalSeconds;
+    },
+    // 取时分秒
+    formatTime(timestamp) {
+      const date = new Date(timestamp);
+      const hours = date.getHours().toString().padStart(2, "0");
+      const minutes = date.getMinutes().toString().padStart(2, "0");
+      const seconds = date.getSeconds().toString().padStart(2, "0");
+      return `${hours}:${minutes}:${seconds}`;
+    },
+
+    btnri(index) {
+      if (this.riindex == 1) {
+        this.dayri = "";
+        this.riindex = index;
+      } else {
+        this.dayri = "周日";
+        this.riindex = 1;
+      }
+    },
+    btnyi(index) {
+      if (this.yiindex == 1) {
+        this.dayyi = "";
+        this.yiindex = index;
+      } else {
+        this.dayyi = "周一";
+        this.yiindex = 1;
+      }
+    },
+    btner(index) {
+      if (this.erindex == 1) {
+        this.dayer = "";
+        this.erindex = index;
+      } else {
+        this.dayer = "周二";
+        this.erindex = 1;
+      }
+    },
+    btnsan(index) {
+      if (this.sanindex == 1) {
+        this.daysan = "";
+        this.sanindex = index;
+      } else {
+        this.daysan = "周三";
+        this.sanindex = 1;
+      }
+    },
+    btnsi(index) {
+      if (this.siindex == 1) {
+        this.daysi = "";
+        this.siindex = index;
+      } else {
+        this.daysi = "周四";
+        this.siindex = 1;
+      }
+    },
+    btnwu(index) {
+      if (this.wuindex == 1) {
+        this.daywu = "";
+        this.wuindex = index;
+      } else {
+        this.daywu = "周五";
+        this.wuindex = 1;
+      }
+    },
+    btnliu(index) {
+      if (this.liuindex == 1) {
+        this.dayliu = "";
+        this.liuindex = index;
+      } else {
+        this.dayliu = "周六";
+        this.liuindex = 1;
+      }
+    },
+  },
 };
 </script>
 
 <style>
-  .switch-margin{
-    margin-right: 40px;
-    float: right;
-    padding: 15px 0 0 0;
-  }
-  .margin-5px{
-    margin-left: 5px;
-    width: 90%;
-  }
-  .fontdesc{
-    font-size: 14px;
-    font-weight: 600;
-  }
+/* 添加定时 */
+.active {
+  background: #3dada9 !important;
+  color: #fff !important;
+}
+.circulate {
+  width: 600px;
+  height: 100%;
+  background: #ffffff;
+  box-shadow: 0px 10px 64px 0px rgba(0, 0, 0, 0.08);
+  opacity: 1;
+  /* margin: auto; */
+  border-radius: 20px;
+  margin-bottom: 30px;
+  padding-top: 20px;
+  padding-left: 46px;
+  padding-right: 46px;
+  padding-bottom: 20px;
+  box-sizing: border-box;
+}
+.circulatetext {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  height: 48px;
+  font-size: 28px;
+  font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+  font-weight: 400;
+  color: #3d3d3d;
+  line-height: 40px;
+}
+.circulateday {
+  width: 432px;
+  height: 60px;
+  font-size: 18px;
+  font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+  font-weight: 400;
+  color: #3dada9;
+  line-height: 40px;
+}
+.circulatelist {
+  display: flex;
+  justify-content: space-between;
+}
+.circulatelist span {
+  width: 50px;
+  height: 50px;
+  background: #d8d8d8;
+  opacity: 1;
+  display: block;
+  text-align: center;
+  line-height: 50px;
+  border-radius: 50%;
+}
+.adddingshi {
+  width: 1000px;
+  background-color: #fff;
+  margin: auto;
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  margin-top: 6vh;
+  padding-top: 50px;
+  padding-left: 20px;
+  overflow: auto;
+  z-index: 99;
+}
 
-  .margin-40px{
-    padding-left: 20px;
-  }
+/* 添加定时 */
 
-  .col-style{
-    border-radius: 25px;
-    border: 1px solid #e7e7e7;
-    box-shadow: 5px 5px 5px #e7e7e7;
-    padding: 5px;
-    height: 200px;
-  }
-  .div1{
-    margin-left: 20px;
-    padding: 5px 0 0 0;
-    height: 40px;
-  }
-  .div1:hover{
-    background-color: #e7e7e7;
-  }
-  .span1{
-    font-weight: 500;
-    float: left;
-  }
-  .span2{
-    float: right;
-    width: 100px !important;
-  }
-  .span3{
-    float: right;
-    line-height: 30px;
-  }
-  .el-form-item{
-    margin-bottom: 10px;
-  }
-  .font11{
-    font-size: 11px;
-    color: #7a7a7a;
-  }
+.qx a:hover {
+  color: #409eff;
+}
+.mask {
+  width: 100%;
+  height: 100vh;
+  background-color: #666;
+  opacity: 0.6;
+  position: fixed;
+  top: 0;
+  z-index: 98;
+  left: 0;
+}
+/* 定时样式 */
+.anniu {
+  text-align: right;
+  padding-right: 40px;
+  padding-bottom: 40px;
+  box-sizing: border-box;
+}
+.dingshibox {
+  width: 1000px;
+  background-color: #fff;
+  margin: auto;
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  margin-top: 6vh;
+  overflow: auto;
+  z-index: 99;
+}
+.dingshibox ul {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding-right: 40px;
+}
+.dingshibox ul li {
+  /* display: inline-block !important; */
+  flex: 0 0 calc(50% - 10px);
+  /* width: 40%; */
+  list-style: none;
+  display: flex;
+  justify-content: space-between;
+  padding: 20px;
+  box-sizing: border-box;
+  border: 1px solid #eee;
+  border-radius: 20px;
+  margin-top: 20px;
+}
 
-  .col-style{
-    margin-top: 10px;
-  }
-  .switch-water .el-slider__button{
-    width: 30px;
-    height: 30px;
-    background-color: #1890ff;
-  }
-  .switch-water{
-    padding-top: 25px;
-    padding-right: 20px;
-  }
-  .margin-top20{
-    margin-top: 20px;
-  }
-  .el-select{
-   width: 100%;
-  }
-  .col-style {
-    margin-right: 15px;
-  }
-  .el-col-12 {
-    width: 48%;
-  }
+.day ul li {
+  text-align: center;
+  line-height: 40px;
+  border-radius: 50%;
+  background-color: #eee;
+  margin-left: 10px;
+  color: #666;
+}
+.activeli {
+  background-color: #1890ff !important;
+  color: #fff !important;
+}
+.day ul li:hover {
+  cursor: pointer;
+}
+.day .title {
+  padding-left: 55px;
+  color: #1890ff;
+  margin-top: 20px;
+  display: flex;
+  height: 20px;
+}
+.kongb {
+  width: 100%;
+  height: 220px;
+}
+.switch-margin {
+  margin-right: 40px;
+  float: right;
+  padding: 15px 0 0 0;
+}
+.margin-5px {
+  margin-left: 5px;
+  width: 90%;
+}
+.fontdesc {
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.margin-40px {
+  padding-left: 20px;
+}
+
+.col-style {
+  border-radius: 25px;
+  border: 1px solid #e7e7e7;
+  box-shadow: 5px 5px 5px #e7e7e7;
+  padding: 5px;
+  height: 200px;
+}
+.div1 {
+  margin-left: 20px;
+  padding: 5px 0 0 0;
+  height: 40px;
+}
+.div1:hover {
+  background-color: #e7e7e7;
+}
+.span1 {
+  font-weight: 500;
+  float: left;
+}
+.span2 {
+  float: right;
+  width: 100px !important;
+}
+.span3 {
+  float: right;
+  line-height: 30px;
+}
+.el-form-item {
+  margin-bottom: 10px;
+}
+.font11 {
+  font-size: 11px;
+  color: #7a7a7a;
+}
+
+.col-style {
+  margin-top: 10px;
+}
+.switch-water .el-slider__button {
+  width: 30px;
+  height: 30px;
+  background-color: #1890ff;
+}
+.switch-water {
+  padding-top: 25px;
+  padding-right: 20px;
+}
+.margin-top20 {
+  margin-top: 20px;
+}
+.el-select {
+  width: 100%;
+}
+.col-style {
+  margin-right: 15px;
+}
+.el-col-12 {
+  width: 48%;
+}
 </style>
diff --git a/AutoSprout-ui/src/views/device/record/index.vue b/AutoSprout-ui/src/views/device/record/index.vue
index fd31d97..ee6d37b 100644
--- a/AutoSprout-ui/src/views/device/record/index.vue
+++ b/AutoSprout-ui/src/views/device/record/index.vue
@@ -1,17 +1,29 @@
 <template>
   <div class="app-container">
-
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="浇水时间" prop="waterTime">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.waterTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择浇水时间">
+          placeholder="请选择浇水时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="启动模式" prop="startMode">
-        <el-select v-model="queryParams.startMode" placeholder="请选择启动模式" clearable>
+        <el-select
+          v-model="queryParams.startMode"
+          placeholder="请选择启动模式"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.as_start_mode"
             :key="dict.value"
@@ -29,8 +41,16 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -43,35 +63,56 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:record:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="recordList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备id" align="center" prop="deviceId" />
-      <el-table-column label="浇水时间" align="center" prop="waterTime" width="180">
+      <el-table-column
+        label="浇水时间"
+        align="center"
+        prop="waterTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.waterTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.waterTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="脉冲模式" align="center" prop="pulseMode" />
       <el-table-column label="启动模式" align="center" prop="startMode">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.as_start_mode" :value="scope.row.startMode"/>
+          <dict-tag
+            :options="dict.type.as_start_mode"
+            :value="scope.row.startMode"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="喷洒时间" align="center" prop="sprayingTime" width="180">
+      <el-table-column
+        label="喷洒时间"
+        align="center"
+        prop="sprayingTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sprayingTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.sprayingTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="用户账号" align="center" prop="userName" />
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -91,11 +132,17 @@
 </template>
 
 <script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/device/record";
+import {
+  listRecord,
+  getRecord,
+  delRecord,
+  addRecord,
+  updateRecord,
+} from "@/api/device/record";
 
 export default {
   name: "Record",
-  dicts: ['as_start_mode'],
+  dicts: ["as_start_mode"],
   data() {
     return {
       // 遮罩层
@@ -122,13 +169,12 @@ export default {
         pageSize: 10,
         waterTime: null,
         startMode: null,
-        userName: null
+        userName: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -138,8 +184,16 @@ export default {
     /** 查询浇水记录列表 */
     getList() {
       this.loading = true;
-      listRecord(this.queryParams).then(response => {
+      listRecord(this.queryParams).then((response) => {
         this.recordList = response.rows;
+        this.recordList.forEach((record) => {
+          // 根据pulseMode的值来重新赋值
+          if (record.pulseMode) {
+            this.$set(record, "pulseMode", "开");
+          } else {
+            this.$set(record, "pulseMode", "关");
+          }
+        });
         this.total = response.total;
         this.loading = false;
       });
@@ -157,7 +211,7 @@ export default {
         pulseMode: null,
         startMode: null,
         sprayingTime: null,
-        userName: null
+        userName: null,
       };
       this.resetForm("form");
     },
@@ -173,9 +227,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.deviceId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.deviceId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -186,8 +240,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const deviceId = row.deviceId || this.ids
-      getRecord(deviceId).then(response => {
+      const deviceId = row.deviceId || this.ids;
+      getRecord(deviceId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改浇水记录";
@@ -195,16 +249,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.deviceId != null) {
-            updateRecord(this.form).then(response => {
+            updateRecord(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addRecord(this.form).then(response => {
+            addRecord(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -216,19 +270,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceIds = row.deviceId || this.ids;
-      this.$modal.confirm('是否确认删除浇水记录编号为"' + deviceIds + '"的数据项？').then(function() {
-        return delRecord(deviceIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除浇水记录编号为"' + deviceIds + '"的数据项？')
+        .then(function () {
+          return delRecord(deviceIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/record/export', {
-        ...this.queryParams
-      }, `record_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/record/export",
+        {
+          ...this.queryParams,
+        },
+        `record_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/AutoSprout-ui/vue.config.js b/AutoSprout-ui/vue.config.js
index 4e3aa32..65655a6 100644
--- a/AutoSprout-ui/vue.config.js
+++ b/AutoSprout-ui/vue.config.js
@@ -35,8 +35,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8081`,
+        // target: `http://localhost:8081`,
         // target: `http://117.50.215.20:8080`,
+        target:`https://yxd.ccttiot.com/prod-api/`,
+        //  target:`http://192.168.2.5:8081`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

From cb648020fe25dda4a2b002768a87b62a7b5153e3 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Mon, 15 Apr 2024 18:13:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?'=E6=8F=90=E4=BA=A4'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoSprout-ui/src/views/device/device/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AutoSprout-ui/src/views/device/device/index.vue b/AutoSprout-ui/src/views/device/device/index.vue
index 85e3b95..12a537d 100644
--- a/AutoSprout-ui/src/views/device/device/index.vue
+++ b/AutoSprout-ui/src/views/device/device/index.vue
@@ -451,8 +451,8 @@
             <el-slider
               :max="5"
               v-model="form.waterIntensity"
-              :step="1"
-              :min="1"
+              :step="1" 
+              :min="1" 
               show-stops
               class="margin-40px switch-water"
             >

From 892b741346d0f4c378c1a6ae901aaa21f97011e5 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Mon, 15 Apr 2024 18:36:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?'=E6=8F=90=E4=BA=A4'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoSprout-ui/src/views/device/device/index.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/AutoSprout-ui/src/views/device/device/index.vue b/AutoSprout-ui/src/views/device/device/index.vue
index 12a537d..d1190e8 100644
--- a/AutoSprout-ui/src/views/device/device/index.vue
+++ b/AutoSprout-ui/src/views/device/device/index.vue
@@ -1473,10 +1473,17 @@ export default {
           this.form.regularWateringJsonObj.sprayTime =
           this.form.sprayTimeMin * 60 + this.form.sprayTimeSec;
           // this.form.pulseModeParam = JSON.stringify(this.form.pulseModeParamObj);
-         console.log(JSON.stringify(this.form.pulseModeParamObj.jg_sec));
-					this.form.pulseModeParamObj.jg_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.jg_sec))
+        //  console.log(JSON.stringify(this.form.pulseModeParamObj.jg_sec));
+         if(JSON.stringify(this.form.pulseModeParamObj.sprayTime) && JSON.stringify(this.form.pulseModeParamObj.intervalTime)){
+          this.form.pulseModeParamObj.jg_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.sprayTime))
+					this.form.pulseModeParamObj.js_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.intervalTime))
+          this.form.pulseModeParam = JSON.stringify(this.form.pulseModeParamObj)
+         }else{
+          this.form.pulseModeParamObj.jg_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.jg_sec))
 					this.form.pulseModeParamObj.js_sec = this.convertSecondsToString(JSON.stringify(this.form.pulseModeParamObj.js_sec))
           this.form.pulseModeParam = JSON.stringify(this.form.pulseModeParamObj)
+         }
+					
 
           this.form.regularWateringJson = JSON.stringify(
             this.form.regularWateringJsonObj