bug修改3

src/App.vue

@@ -185,9 +185,10 @@
           title="设备定时"
           width="800"
           align-center
+          destroy-on-close
       >
         <el-form ref="elFormRefTime" :model="formDataTime" label-position="right" :rules="rule" label-width="80px">
-          <deviceLoopReplayTimeSet :selected-devices="selectedDevices" @save="save" />
+          <deviceLoopReplayTimeSet :selected-devices="selectedDevices" :openLoop-timing="openLoopTiming" @save="save" />
         </el-form>
       </el-dialog>
     </el-drawer>
@@ -307,7 +308,7 @@ const addDevice = () => {
     return
   }
 
-  if (isRepeatSn(addDeviceData.value.sn)) {
+  if (isRepeatSn2(addDeviceData.value.sn)) {
     ElMessage.error("sn已被使用")
     return
   }
@@ -346,6 +347,17 @@ const isRepeatSn = (sn) => {
   return number === 2;
 }
 
+const isRepeatSn2 = (sn) => {
+  for (let i = 0; i < regionData.value.length; i++) {
+    for (let j = 0; j < regionData.value[i].devices.length; j++) {
+      if (regionData.value[i].devices[j].sn === sn) {
+        return true;
+      }
+    }
+  }
+  return false
+}
+
 //编辑
 const isUpdateDevice = ref(false)
 const updateDeviceData = ref()
@@ -516,6 +528,9 @@ const openLoopTiming = ref(false)
 
 //保存
 const save = () => {
+  openLoopTiming.value = false
+  openDeviceTiming.value = false
+  console.log(regionData.value)
   saveData(regionData.value)
 }
 // 定时查询

src/comm/deviceLoopReplayTimeSet.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button v-for="item in selectedDevices[0].deviceLoops" @click="selectItem(item)" :class="{ 'active': s === item }">{{item.name}}</el-button>
+  <el-button v-for="item in deepClone[0].deviceLoops" @click="selectItem(item)" :class="{ 'active': s.id === item.id }">{{item.name}}</el-button>
   <div style="margin: 5px 0;"/>
   <el-form ref="elFormRefTime" label-position="right" label-width="80px">
     <el-row>
@@ -114,8 +114,9 @@ export default {
 <script setup>
 import { ref, reactive, onMounted, toRefs } from 'vue'
 import { ElMessage } from 'element-plus'
+import {bloom} from "three/addons/tsl/display/BloomNode.js";
 
-const d = ref([1,2,3,4,5,6,7,8])
+// const d = ref([1,2,3,4,5,6,7,8])
 
 const s = ref(0)
 
@@ -125,10 +126,13 @@ const selectItem = (item) => {
 
 const props = defineProps({
   selectedDevices: Array,
+  openLoopTiming: Boolean,
 })
 const emit = defineEmits(['save'])
 
-const { selectedDevices } = toRefs(props)
+const { selectedDevices,openLoopTiming } = toRefs(props)
+
+const deepClone = JSON.parse(JSON.stringify(props.selectedDevices));
 
 // 批量定时
 const enterDialogTime = async() => {
@@ -140,13 +144,13 @@ const enterDialogTime = async() => {
     })
     return
   }
-  selectedDevices.value[0].deviceLoops[s.value-1].timeCondition1OnTime = formDataTime.timeCondition1OnTime
-  selectedDevices.value[0].deviceLoops[s.value-1].timeCondition1OffTime = formDataTime.timeCondition1OffTime
-  selectedDevices.value[0].deviceLoops[s.value-1].timeCondition2OnTime = formDataTime.timeCondition2OnTime
-  selectedDevices.value[0].deviceLoops[s.value-1].timeCondition2OffTime = formDataTime.timeCondition2OffTime
 
+  props.selectedDevices[0].deviceLoops[s.value.id-1].timeCondition1OnTime = formDataTime.timeCondition1OnTime
+  props.selectedDevices[0].deviceLoops[s.value.id-1].timeCondition1OffTime = formDataTime.timeCondition1OffTime
+  props.selectedDevices[0].deviceLoops[s.value.id-1].timeCondition2OnTime = formDataTime.timeCondition2OnTime
+  props.selectedDevices[0].deviceLoops[s.value.id-1].timeCondition2OffTime = formDataTime.timeCondition2OffTime
   emit('save')
-
+  props.openLoopTiming = false
   ElMessage({
     message: '操作成功',
     type: 'success'