From 33f45c5ca7befc63e20fa62061b03e1ece8cace1 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 29 Aug 2024 18:11:03 +0800
Subject: [PATCH 1/4] add tid1641 style && logic

---
 src/pages.json                                     |  12 ++
 .../device/pages/lighting_timie/list.vue           |  86 ++++++++
 .../device/pages/lighting_timie/setting.vue        | 217 +++++++++++++++++++++
 3 files changed, 315 insertions(+)
 create mode 100644 src/subpackage/device/pages/lighting_timie/list.vue
 create mode 100644 src/subpackage/device/pages/lighting_timie/setting.vue

diff --git a/src/pages.json b/src/pages.json
index 5dcf150..2eb219c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -438,6 +438,18 @@
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},
+				{
+					"path": "pages/lighting_timie/list",
+					"style": {
+						"navigationBarTitleText": "照明管理"
+					}
+				},
+				{
+					"path": "pages/lighting_timie/setting",
+					"style": {
+						"navigationBarTitleText": "照明管理"
+					}
 				}
 			]
 		},
diff --git a/src/subpackage/device/pages/lighting_timie/list.vue b/src/subpackage/device/pages/lighting_timie/list.vue
new file mode 100644
index 0000000..8522d70
--- /dev/null
+++ b/src/subpackage/device/pages/lighting_timie/list.vue
@@ -0,0 +1,86 @@
+<template>
+    <view class="lt-list">
+        <view class="ll-title">1号馆照明定时</view>
+        <view class="ll-list">
+            <view class="ll-item" v-for="i in 12" :key="i">
+                <view class="li-line">
+                    <view class="ll-txt">指令：关闭</view>
+                    <image class="ll-icon"></image>
+                </view>
+                <view class="li-line">
+                    <view class="ll-txt">时间：08:00</view>
+                </view>
+                <view class="li-line">
+                    <view class="ll-txt">日期：周日、周一、周二、周三、周四、周五、周六</view>
+                </view>
+            </view>
+        </view>
+        <view class="ll-fixed-space"></view>
+        <view class="ll-fixed">
+            <view class="lf-btn">添加定时任务</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data(){
+        return {
+            condition: {
+                
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .ll-title{
+        padding: 46upx 40upx 60upx;
+        @include flcw(44upx, 60upx, #1a1a1a, 500);
+        @include tHide;
+    }
+    .ll-list{
+        .ll-item{
+            padding: 24upx 30upx;
+            background: #fff;
+            &+.ll-item{
+                margin-top: 24upx;
+            }
+            .li-line{
+                @include ctf(space-between);
+                align-items: baseline;
+                &+.li-line{
+                    margin-top: 16upx;
+                }
+                .ll-txt{
+                    @include flcw(28upx, 40upx, #1a1a1a);
+                }
+                .ll-icon {
+                    flex-shrink: 0;
+                    margin-left: 12upx;
+                    width: 44upx;
+                    height: 44upx;
+                    background: skyblue;
+                }
+            }
+        }
+    }
+    .ll-fixed-space{
+        padding-bottom: 132upx;
+        @include isPd(132upx);
+    }
+    .ll-fixed{
+        position: fixed;
+        bottom: 0;
+        padding: 10upx 24upx;
+        width: 100%;
+        @include isPd(10upx);
+        .lf-btn{
+            text-align: center;
+            border-radius: 10upx;
+            background: $mColor;
+            @include flcw(32upx, 112upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/device/pages/lighting_timie/setting.vue b/src/subpackage/device/pages/lighting_timie/setting.vue
new file mode 100644
index 0000000..cb16a96
--- /dev/null
+++ b/src/subpackage/device/pages/lighting_timie/setting.vue
@@ -0,0 +1,217 @@
+<template>
+    <view class="lt-setting">
+        <view class="ll-title">1号馆照明定时</view>
+
+        <view class="ls-container">
+            <view class="lc-select">
+                <view class="lc-name">指令</view>
+                <view class="ls-options">
+                    <view class="lp-item"  @click="condition.instruct = 'open'">
+                        <view class="li-txt">开</view>
+                        <image 
+                            class="li-icon"
+                            mode="aspectFit"
+                            :class="{active: condition.instruct === 'open'}"
+                            :src="condition.instruct === 'open' ? '/subpackage/device/static/images/selected_987.png' : ''"
+                        ></image>
+                    </view>
+                    <view class="lp-item" @click="condition.instruct = 'close'">
+                        <view class="li-txt">关</view>
+                        <image 
+                            class="li-icon"
+                            mode="aspectFit"
+                            :class="{active: condition.instruct === 'close'}"
+                            :src="condition.instruct === 'close' ? '/subpackage/device/static/images/selected_987.png' : ''"
+                        ></image>
+                    </view>
+                </view>
+            </view>
+            <view class="lc-picker">
+                <view class="lc-name">时间点</view>
+                <picker mode="time" @change="condition.time = $event.detail.value">
+                    <view class="lp-box">
+                        <input disabled type="text" class="lb-ipt" v-model="condition.time">
+                        <image class="lb-icon" mode="aspectFit" src="/subpackage/device/static/images/arrow_b2.png"></image>
+                    </view>
+                </picker>
+            </view>
+            <view class="lc-switch">
+                <view class="lc-name">日期</view>
+                <view class="ls-right">
+                    <switch class="lr-switch" color="#009874" @change="switchChange"></switch>
+                    <view class="lr-txt">全选</view>
+                </view>
+            </view>
+
+            <view class="lc-week-ls">
+                <view 
+                    class="lwl-item" 
+                    v-for="(e, i) in weeks" 
+                    :key="i"
+                    :class="{active: condition.weekLs.includes(e)}"
+                    @click="weekItemClick(e)"
+                >{{ e }}</view>
+            </view>
+        </view>
+        
+        <view class="ll-fixed-space"></view>
+        <view class="ll-fixed">
+            <view class="lf-btn">添加定时任务</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data(){
+        return {
+            weeks: [ '周日', '周一', '周二', '周三', '周四', '周五', '周六' ],
+            condition: {
+                instruct: 'open', // 指令 open: 开, close: 关
+                time: '', // 时间点
+                weekLs: [], // 日期
+            }
+        }
+    },
+    methods: {
+        switchChange(e){
+            if(e.detail.value){
+                this.condition.weekLs = [ ...this.weeks];
+            }else{
+                this.condition.weekLs = [];
+            }
+        },
+        weekItemClick(e){
+            let { weekLs } = this.condition;
+            if(weekLs.includes(e)){
+                weekLs.splice(weekLs.indexOf(e), 1);
+            }else{
+                weekLs.push(e);
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .ll-title{
+        padding: 46upx 40upx 60upx;
+        @include flcw(44upx, 60upx, #1a1a1a, 500);
+        @include tHide;
+    }
+    .ls-container{
+        margin: 0 auto;
+        padding: 50upx 30upx 100upx;
+        width: 678upx;
+        border-radius: 10upx;
+        background: #fff;
+        .lc-name{
+            flex-shrink: 0;
+            @include flcw(32upx, 44upx, #1a1a1a);
+        }
+        .lc-select{
+            @include ctf(space-between);
+            .ls-options{
+                width: 480upx;
+                @include ctf;
+                .lp-item{
+                    width: 50%;
+                    @include ctf;
+                    .li-txt{
+                        @include flcw(32upx, 44upx, #1a1a1a);
+                    }
+                    .li-icon{
+                        margin-left: 22upx;
+                        flex-shrink: 0;
+                        width: 40upx;
+                        height: 40upx;
+                        border: 2upx solid #D8D8D8;
+                        border-radius: 50%;
+                        &.active{
+                            border-width: 0upx;
+                            border-color: transparent;
+                        }
+                    }
+                }
+                
+            }
+        }
+        .lc-picker{
+            margin-top: 50upx;
+            @include ctf(space-between);
+            .lp-box{
+                @include ctf(space-between);
+                width: 480upx;
+                height: 96upx;
+                border: 2upx solid #D8D8D8;
+                border-radius: 10upx;
+                padding: 0 20upx;
+                .lb-ipt{
+                    flex-grow: 1;
+                    @include flcw(32upx, 44upx, #1a1a1a);
+                }
+                .lb-icon{
+                    flex-shrink: 0;
+                    width: 28upx;
+                    height: 28upx;
+                    transform: rotateZ(90deg);
+                }
+            }
+        }
+        .lc-switch{
+            margin-top: 50upx;
+            @include ctf(space-between);
+            .ls-right{
+                width: 480upx;
+                @include ctf;
+                .lr-switch{
+                    transform: scale(.8);
+                }
+                .lr-txt{
+                    margin-left: 20upx;
+                    @include flcw(32upx, 44upx, #1a1a1a);
+                }
+            }
+        }
+        .lc-week-ls{
+            margin-top: 60upx;
+            display: flex;
+            flex-wrap: wrap;
+            .lwl-item{
+                margin: 0 20upx;
+                width: 160upx;
+                height: 88upx;
+                border-radius: 6upx;
+                border: 2upx solid #979797;
+                text-align: center;
+                @include flcw(32upx, 84upx, #979797);
+                &:nth-child(n + 4){
+                    margin-top: 40upx;
+                }
+                &.active{
+                    color: $mColor;
+                    border-color: $mColor;
+                    background: rgba($color: $mColor, $alpha: .12);
+                }
+            }
+        }
+        
+    }
+    .ll-fixed-space{
+        padding-bottom: 132upx;
+        @include isPd(132upx);
+    }
+    .ll-fixed{
+        position: fixed;
+        bottom: 0;
+        padding: 10upx 24upx;
+        width: 100%;
+        @include isPd(10upx);
+        .lf-btn{
+            text-align: center;
+            border-radius: 10upx;
+            background: $mColor;
+            @include flcw(32upx, 112upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file

From d2b06226977058023f3f1e70038f84864854d4c3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 30 Aug 2024 18:24:12 +0800
Subject: [PATCH 2/4] finish tid1641

---
 src/pages.json                                     |   4 +-
 src/subpackage/device/js/device_api.js             |   6 +
 src/subpackage/device/pages/index/index.vue        |  34 ++-
 src/subpackage/device/pages/lighting_time/list.vue | 180 ++++++++++++++
 .../device/pages/lighting_time/setting.vue         | 271 +++++++++++++++++++++
 .../device/pages/lighting_timie/list.vue           |  86 -------
 .../device/pages/lighting_timie/setting.vue        | 217 -----------------
 .../device/pages/switch_manage/switch_manage.vue   |   8 +-
 src/subpackage/device/static/images/delete.png     | Bin 0 -> 365 bytes
 src/utils/util.js                                  |   4 +-
 10 files changed, 492 insertions(+), 318 deletions(-)
 create mode 100644 src/subpackage/device/pages/lighting_time/list.vue
 create mode 100644 src/subpackage/device/pages/lighting_time/setting.vue
 delete mode 100644 src/subpackage/device/pages/lighting_timie/list.vue
 delete mode 100644 src/subpackage/device/pages/lighting_timie/setting.vue
 create mode 100644 src/subpackage/device/static/images/delete.png

diff --git a/src/pages.json b/src/pages.json
index 2eb219c..df82c08 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -440,13 +440,13 @@
 					}
 				},
 				{
-					"path": "pages/lighting_timie/list",
+					"path": "pages/lighting_time/list",
 					"style": {
 						"navigationBarTitleText": "照明管理"
 					}
 				},
 				{
-					"path": "pages/lighting_timie/setting",
+					"path": "pages/lighting_time/setting",
 					"style": {
 						"navigationBarTitleText": "照明管理"
 					}
diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js
index b6ef2e5..7d129e4 100644
--- a/src/subpackage/device/js/device_api.js
+++ b/src/subpackage/device/js/device_api.js
@@ -69,6 +69,12 @@ export const DEVICE_API = {
     brandList:`${ORIGIN}/stadium/brand/all`, // 获取品牌列表
     brandInfo:`${ORIGIN}/stadium/brand/get`, // 获取品牌信息
     
+    // 20240830 tid1641 小程序-商家助手小程序照明定时任务优化
+    cacScheduledTaskGet:`${ORIGIN}/admin/cacScheduledTask/data`, // 获取YZK照明定时列表接口
+    cacScheduledTaskSave:`${ORIGIN}/admin/cacScheduledTask/save`, // 设置YZK照明定时
+    cacScheduledTaskDelete:`${ORIGIN}/admin/cacScheduledTask/delete`, // 删除YZK照明定时
+
+    
 }
 
 export default DEVICE_API;
\ No newline at end of file
diff --git a/src/subpackage/device/pages/index/index.vue b/src/subpackage/device/pages/index/index.vue
index a9432b8..3f0547b 100644
--- a/src/subpackage/device/pages/index/index.vue
+++ b/src/subpackage/device/pages/index/index.vue
@@ -10,7 +10,8 @@
 			<store-name :theme="'light'"></store-name>
 			<view class="ih-container">
 				<view class="ic-title">欧轩智能中控</view>
-				<view class="ic-info">
+
+				<view class="ic-info" v-if="curStoreInfo.device_name">
 					<view class="ii-veiw">
 						<view class="iv-view">
 							<veiw class="iv-txt">设备id：{{ curStoreInfo.device_name || "-" }}</veiw>
@@ -32,7 +33,7 @@
 				</view>
 				<view class="ic-btn-box">
 					<view 
-						v-if="oxAcInfo.extension&&oxAcInfo.extension.switch_device_name"
+						v-if="oxAcInfo.extension&&oxAcInfo.extension.switch_device_name&&curStoreInfo.device_name"
 						class="ic-btn" 
 						hover-class="hover-active" 
 						@click="restartBtn"
@@ -118,13 +119,14 @@ export default {
 				line-height:${titleBarHeight}px;
 			`
 			return _styleStr
-		},
+		}
 	},
 	watch: {
 		async curStoreInfo(nw, od){
 			util.hideLoad();
-			this.getOuxuanacInfo(nw.device_name);
 			this.getHardwareTypeList(nw.id);
+			if(!nw.device_name)return; // tid1641 如果没有中控的（即设备id返回为空），设备id、状态、最后上线时间，定时列表、重启按钮都不显示
+			this.getOuxuanacInfo(nw.device_name);
 			this.updateAC(nw.device_name);
 		},
 		switchBrandInfo(nw, od){
@@ -156,7 +158,7 @@ export default {
             await this.$store.dispatch('getStoreList', { stadium_id: +options.stadium_id || '', storeChange: true });
 			let { curStoreInfo } = this;
 			this.getHardwareTypeList(curStoreInfo.id);
-			this.getOuxuanacInfo(curStoreInfo.device_name);
+			if(curStoreInfo?.device_name)this.getOuxuanacInfo(curStoreInfo.device_name);
 			this.getBrandSwitch();
             util.hideLoad();
         }catch(err){
@@ -246,14 +248,26 @@ export default {
 			deviceServer.get({
 			    url: deviceApi.acUpdate,
 			    data: { id: device_name },
-			    failMsg: '加载失败！'
+				isDefaultGet: false,
+			    // failMsg: '加载失败！'
 			})
 			.then(res=>{
-			    util.hideLoad();
-			    this.deviceInfo = res || {};
-				uni.setStorageSync("deviceInfo",res)
+				let _data = res?.data || {}
+				util.hideLoad();
+				if(_data.code === 0){
+					this.deviceInfo = _data?.data || {};
+					uni.setStorageSync("deviceInfo",res)
+				}else{
+					return Promise.reject(_data);
+				}
+			})
+			.catch(err=>{
+				util.hideLoad();
+				util.showModal({
+					title: '提示',
+					content: err?.message || '中控在线状态查询失败！'
+				})
 			})
-			.catch(util.hideLoad)
 		},
 		goBack(){
 			uni.navigateBack({ delta:1 });
diff --git a/src/subpackage/device/pages/lighting_time/list.vue b/src/subpackage/device/pages/lighting_time/list.vue
new file mode 100644
index 0000000..991df61
--- /dev/null
+++ b/src/subpackage/device/pages/lighting_time/list.vue
@@ -0,0 +1,180 @@
+<template>
+    <view class="lt-list">
+        <view class="ll-title">{{ optionsQuery.hardware_name || '-' }}</view>
+        <view class="ll-list">
+            <view class="ll-item" v-for="(e, i) in timingLs" :key="i">
+                <view class="li-line">
+                    <view class="ll-txt">指令：{{ getInstructTxt(e.operate) }}</view>
+                    <image class="ll-icon" @click="deleteItem(e)" mode="aspectFit" src="/subpackage/device/static/images/delete.png"></image>
+                </view>
+                <view class="li-line">
+                    <view class="ll-txt">时间：{{ e.h_m_s || '-'}}</view>
+                </view>
+                <view class="li-line">
+                    <view class="ll-txt">日期：{{ e.day_of_week || '-' }}</view>
+                </view>
+            </view>
+        </view>
+        <view class="ll-fixed-space"></view>
+        <view class="ll-fixed">
+            <view class="lf-btn" @click="addTask">添加定时任务</view>
+        </view>
+    </view>
+</template>
+
+<script>
+import deviceServer from '../../js/device_server';
+import deviceApi from '../../js/device_api';
+import { showModal, showNone, showLoad, hideLoad, routeTo, jsonPar, jsonStr } from "@/utils/util";
+export default {
+    data(){
+        return {
+            timingLs: [],
+            optionsQuery: {},
+        }
+    },
+    onLoad(options){
+        options.hardware_name = jsonPar(options?.hardware_name);
+        this.optionsQuery = options;
+    },
+    onShow(){
+        let { optionsQuery } = this;
+        this.getTimingList({
+            hardware_id: optionsQuery?.hardware_id || ''
+        })
+    },
+    methods: {
+        addTask(){
+            let { hardware_id, hardware_name } = this.optionsQuery;
+            let _qryStr = `hardware_id=${hardware_id || ''}&hardware_name=${jsonStr(hardware_name || '')}`
+            routeTo(`/subpackage/device/pages/lighting_time/setting?${_qryStr}`, 'nT')
+        },
+        deleteItem(e){
+            showModal({
+                title: '提示',
+                content: '是否删除该项？',
+                showCancel: true,
+                confirmText: '是',
+                cancelText: '否',
+                success: res =>{
+                    if(res?.confirm){
+                        this.cacScheduledTaskDelete(e?.id)
+                        .then(res=>{
+                            if(res === 'SUCCESS')this.getTimingList({ hardware_id: e?.hardware_id })
+                        })
+                    }
+                }
+            })
+        },
+        cacScheduledTaskDelete(id){
+            showLoad();
+            return deviceServer.post({
+                url: deviceApi.cacScheduledTaskDelete,
+                data: { id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+                hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showModal({
+                        title: '提示',
+                        content: _data.message || '操作成功！'
+                    })
+                    return "SUCCESS"
+                }else{
+                    return Promise.reject(_data);
+                }
+                
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('setting cacScheduledTaskSave err', err);
+            })
+        },
+        getInstructTxt(operate){
+            let _obj = {
+                'open': '开启',
+                'close': '关闭'
+            }
+            return _obj?.[operate] || operate || '未知'
+        },
+        getTimingList({ 
+            hardware_id = '',
+        }){
+            showLoad();
+            return deviceServer.get({
+                url: deviceApi.cacScheduledTaskGet,
+                data: { 
+                    hardware_id,
+                },
+                failMsg: '获取定时列表失败'
+            })
+            .then(res => {
+                hideLoad();
+                let _ls = res || [];
+                this.timingLs = _ls;
+            })
+            .catch(err => {
+                hideLoad();
+                console.warn('lighting_time list getTimingList err --->', err);
+                // return Promise.reject(err);
+            })
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    .ll-title{
+        padding: 46upx 40upx 60upx;
+        @include flcw(44upx, 60upx, #1a1a1a, 500);
+        @include tHide;
+    }
+    .ll-list{
+        .ll-item{
+            padding: 24upx 30upx;
+            background: #fff;
+            &+.ll-item{
+                margin-top: 24upx;
+            }
+            .li-line{
+                @include ctf(space-between);
+                align-items: baseline;
+                &+.li-line{
+                    margin-top: 16upx;
+                }
+                .ll-txt{
+                    @include flcw(28upx, 40upx, #1a1a1a);
+                }
+                .ll-icon {
+                    flex-shrink: 0;
+                    margin-left: 12upx;
+                    width: 44upx;
+                    height: 44upx;
+                }
+            }
+        }
+    }
+    .ll-fixed-space{
+        padding-bottom: 132upx;
+        @include isPd(132upx);
+    }
+    .ll-fixed{
+        position: fixed;
+        bottom: 0;
+        padding: 10upx 24upx;
+        width: 100%;
+        @include isPd(10upx);
+        .lf-btn{
+            text-align: center;
+            border-radius: 10upx;
+            background: $mColor;
+            @include flcw(32upx, 112upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/device/pages/lighting_time/setting.vue b/src/subpackage/device/pages/lighting_time/setting.vue
new file mode 100644
index 0000000..de2990a
--- /dev/null
+++ b/src/subpackage/device/pages/lighting_time/setting.vue
@@ -0,0 +1,271 @@
+<template>
+    <view class="lt-setting">
+        <view class="ll-title">{{ optionsQuery.hardware_name || '-' }}</view>
+
+        <view class="ls-container">
+            <view class="lc-select">
+                <view class="lc-name">指令</view>
+                <view class="ls-options">
+                    <view class="lp-item"  @click="condition.instruct = 'open'">
+                        <view class="li-txt">开</view>
+                        <image 
+                            class="li-icon"
+                            mode="aspectFit"
+                            :class="{active: condition.instruct === 'open'}"
+                            :src="condition.instruct === 'open' ? '/subpackage/device/static/images/selected_987.png' : ''"
+                        ></image>
+                    </view>
+                    <view class="lp-item" @click="condition.instruct = 'close'">
+                        <view class="li-txt">关</view>
+                        <image 
+                            class="li-icon"
+                            mode="aspectFit"
+                            :class="{active: condition.instruct === 'close'}"
+                            :src="condition.instruct === 'close' ? '/subpackage/device/static/images/selected_987.png' : ''"
+                        ></image>
+                    </view>
+                </view>
+            </view>
+            <view class="lc-picker">
+                <view class="lc-name">时间点</view>
+                <picker mode="time" @change="condition.time = $event.detail.value">
+                    <view class="lp-box">
+                        <input disabled type="text" class="lb-ipt" v-model="condition.time">
+                        <image class="lb-icon" mode="aspectFit" src="/subpackage/device/static/images/arrow_b2.png"></image>
+                    </view>
+                </picker>
+            </view>
+            <view class="lc-switch">
+                <view class="lc-name">日期</view>
+                <view class="ls-right">
+                    <switch class="lr-switch" color="#009874" @change="switchChange"></switch>
+                    <view class="lr-txt">全选</view>
+                </view>
+            </view>
+
+            <view class="lc-week-ls">
+                <view 
+                    class="lwl-item" 
+                    v-for="(e, i) in weeks" 
+                    :key="i"
+                    :class="{active: condition.weekLs.includes(e)}"
+                    @click="weekItemClick(e)"
+                >{{ e }}</view>
+            </view>
+        </view>
+        
+        <view class="ll-fixed-space"></view>
+        <view class="ll-fixed">
+            <view class="lf-btn" @click="confirmBtn">添加定时任务</view>
+        </view>
+    </view>
+</template>
+
+<script>
+import deviceServer from '../../js/device_server';
+import deviceApi from '../../js/device_api';
+import { showModal, showNone, showLoad, hideLoad, routeTo, jsonPar } from "@/utils/util";
+export default {
+    data(){
+        return {
+            weeks: [ '日', '一', '二', '三', '四', '五', '六' ].map(e=>`星期${e}`),
+            condition: {
+                instruct: 'open', // 指令 open: 开, close: 关
+                time: '00:00', // 时间点
+                weekLs: [], // 日期
+            },
+            optionsQuery: {}
+        }
+    },
+    onLoad(options){
+        options.hardware_name = jsonPar(options?.hardware_name);
+        this.optionsQuery = options || {}
+    },
+    methods: {
+        switchChange(e){
+            if(e.detail.value){
+                this.condition.weekLs = [ ...this.weeks];
+            }else{
+                this.condition.weekLs = [];
+            }
+        },
+        weekItemClick(e){
+            let { weekLs } = this.condition;
+            if(weekLs.includes(e)){
+                weekLs.splice(weekLs.indexOf(e), 1);
+            }else{
+                weekLs.push(e);
+            }
+        },
+        confirmBtn(){
+            let { optionsQuery, condition } = this;
+            if(!condition?.weekLs?.length)return showNone('请选择日期！');
+            if(!condition?.time)return showNone('请选时间点！');
+            this.cacScheduledTaskSave({
+                hardware_id: optionsQuery?.hardware_id || '',
+                day_of_week: condition?.weekLs?.join(','),
+                h_m_s: `${condition?.time}:00`,
+                operate: condition?.instruct,
+
+            })
+        },
+        cacScheduledTaskSave({
+            hardware_id = '', 
+            day_of_week = '', 
+            h_m_s = '', 
+            operate = ''
+        }){
+            showLoad();
+            return deviceServer.post({
+                url: deviceApi.cacScheduledTaskSave,
+                data: { hardware_id, day_of_week, h_m_s, operate },
+                isDefaultGet: false,
+            })
+            .then(res => {
+                hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showModal({
+                        title: '提示',
+                        content: _data.message || '操作成功！',
+                    })
+                }else{
+                    return Promise.reject(_data);
+                }
+                
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('setting cacScheduledTaskSave err', err);
+            })
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    .ll-title{
+        padding: 46upx 40upx 60upx;
+        @include flcw(44upx, 60upx, #1a1a1a, 500);
+        @include tHide;
+    }
+    .ls-container{
+        margin: 0 auto;
+        padding: 50upx 30upx 100upx;
+        width: 678upx;
+        border-radius: 10upx;
+        background: #fff;
+        .lc-name{
+            flex-shrink: 0;
+            @include flcw(32upx, 44upx, #1a1a1a);
+        }
+        .lc-select{
+            @include ctf(space-between);
+            .ls-options{
+                width: 480upx;
+                @include ctf;
+                .lp-item{
+                    width: 50%;
+                    @include ctf;
+                    .li-txt{
+                        @include flcw(32upx, 44upx, #1a1a1a);
+                    }
+                    .li-icon{
+                        margin-left: 22upx;
+                        flex-shrink: 0;
+                        width: 40upx;
+                        height: 40upx;
+                        border: 2upx solid #D8D8D8;
+                        border-radius: 50%;
+                        &.active{
+                            border-width: 0upx;
+                            border-color: transparent;
+                        }
+                    }
+                }
+                
+            }
+        }
+        .lc-picker{
+            margin-top: 50upx;
+            @include ctf(space-between);
+            .lp-box{
+                @include ctf(space-between);
+                width: 480upx;
+                height: 96upx;
+                border: 2upx solid #D8D8D8;
+                border-radius: 10upx;
+                padding: 0 20upx;
+                .lb-ipt{
+                    flex-grow: 1;
+                    @include flcw(32upx, 44upx, #1a1a1a);
+                }
+                .lb-icon{
+                    flex-shrink: 0;
+                    width: 28upx;
+                    height: 28upx;
+                    transform: rotateZ(90deg);
+                }
+            }
+        }
+        .lc-switch{
+            margin-top: 50upx;
+            @include ctf(space-between);
+            .ls-right{
+                width: 480upx;
+                @include ctf;
+                .lr-switch{
+                    transform: scale(.8);
+                }
+                .lr-txt{
+                    margin-left: 20upx;
+                    @include flcw(32upx, 44upx, #1a1a1a);
+                }
+            }
+        }
+        .lc-week-ls{
+            margin-top: 60upx;
+            display: flex;
+            flex-wrap: wrap;
+            .lwl-item{
+                margin: 0 20upx;
+                width: 160upx;
+                height: 88upx;
+                border-radius: 6upx;
+                border: 2upx solid #979797;
+                text-align: center;
+                @include flcw(32upx, 84upx, #979797);
+                &:nth-child(n + 4){
+                    margin-top: 40upx;
+                }
+                &.active{
+                    color: $mColor;
+                    border-color: $mColor;
+                    background: rgba($color: $mColor, $alpha: .12);
+                }
+            }
+        }
+        
+    }
+    .ll-fixed-space{
+        padding-bottom: 132upx;
+        @include isPd(132upx);
+    }
+    .ll-fixed{
+        position: fixed;
+        bottom: 0;
+        padding: 10upx 24upx;
+        width: 100%;
+        @include isPd(10upx);
+        .lf-btn{
+            text-align: center;
+            border-radius: 10upx;
+            background: $mColor;
+            @include flcw(32upx, 112upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/device/pages/lighting_timie/list.vue b/src/subpackage/device/pages/lighting_timie/list.vue
deleted file mode 100644
index 8522d70..0000000
--- a/src/subpackage/device/pages/lighting_timie/list.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-    <view class="lt-list">
-        <view class="ll-title">1号馆照明定时</view>
-        <view class="ll-list">
-            <view class="ll-item" v-for="i in 12" :key="i">
-                <view class="li-line">
-                    <view class="ll-txt">指令：关闭</view>
-                    <image class="ll-icon"></image>
-                </view>
-                <view class="li-line">
-                    <view class="ll-txt">时间：08:00</view>
-                </view>
-                <view class="li-line">
-                    <view class="ll-txt">日期：周日、周一、周二、周三、周四、周五、周六</view>
-                </view>
-            </view>
-        </view>
-        <view class="ll-fixed-space"></view>
-        <view class="ll-fixed">
-            <view class="lf-btn">添加定时任务</view>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-    data(){
-        return {
-            condition: {
-                
-            }
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-    .ll-title{
-        padding: 46upx 40upx 60upx;
-        @include flcw(44upx, 60upx, #1a1a1a, 500);
-        @include tHide;
-    }
-    .ll-list{
-        .ll-item{
-            padding: 24upx 30upx;
-            background: #fff;
-            &+.ll-item{
-                margin-top: 24upx;
-            }
-            .li-line{
-                @include ctf(space-between);
-                align-items: baseline;
-                &+.li-line{
-                    margin-top: 16upx;
-                }
-                .ll-txt{
-                    @include flcw(28upx, 40upx, #1a1a1a);
-                }
-                .ll-icon {
-                    flex-shrink: 0;
-                    margin-left: 12upx;
-                    width: 44upx;
-                    height: 44upx;
-                    background: skyblue;
-                }
-            }
-        }
-    }
-    .ll-fixed-space{
-        padding-bottom: 132upx;
-        @include isPd(132upx);
-    }
-    .ll-fixed{
-        position: fixed;
-        bottom: 0;
-        padding: 10upx 24upx;
-        width: 100%;
-        @include isPd(10upx);
-        .lf-btn{
-            text-align: center;
-            border-radius: 10upx;
-            background: $mColor;
-            @include flcw(32upx, 112upx, #fff, 500);
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/subpackage/device/pages/lighting_timie/setting.vue b/src/subpackage/device/pages/lighting_timie/setting.vue
deleted file mode 100644
index cb16a96..0000000
--- a/src/subpackage/device/pages/lighting_timie/setting.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-    <view class="lt-setting">
-        <view class="ll-title">1号馆照明定时</view>
-
-        <view class="ls-container">
-            <view class="lc-select">
-                <view class="lc-name">指令</view>
-                <view class="ls-options">
-                    <view class="lp-item"  @click="condition.instruct = 'open'">
-                        <view class="li-txt">开</view>
-                        <image 
-                            class="li-icon"
-                            mode="aspectFit"
-                            :class="{active: condition.instruct === 'open'}"
-                            :src="condition.instruct === 'open' ? '/subpackage/device/static/images/selected_987.png' : ''"
-                        ></image>
-                    </view>
-                    <view class="lp-item" @click="condition.instruct = 'close'">
-                        <view class="li-txt">关</view>
-                        <image 
-                            class="li-icon"
-                            mode="aspectFit"
-                            :class="{active: condition.instruct === 'close'}"
-                            :src="condition.instruct === 'close' ? '/subpackage/device/static/images/selected_987.png' : ''"
-                        ></image>
-                    </view>
-                </view>
-            </view>
-            <view class="lc-picker">
-                <view class="lc-name">时间点</view>
-                <picker mode="time" @change="condition.time = $event.detail.value">
-                    <view class="lp-box">
-                        <input disabled type="text" class="lb-ipt" v-model="condition.time">
-                        <image class="lb-icon" mode="aspectFit" src="/subpackage/device/static/images/arrow_b2.png"></image>
-                    </view>
-                </picker>
-            </view>
-            <view class="lc-switch">
-                <view class="lc-name">日期</view>
-                <view class="ls-right">
-                    <switch class="lr-switch" color="#009874" @change="switchChange"></switch>
-                    <view class="lr-txt">全选</view>
-                </view>
-            </view>
-
-            <view class="lc-week-ls">
-                <view 
-                    class="lwl-item" 
-                    v-for="(e, i) in weeks" 
-                    :key="i"
-                    :class="{active: condition.weekLs.includes(e)}"
-                    @click="weekItemClick(e)"
-                >{{ e }}</view>
-            </view>
-        </view>
-        
-        <view class="ll-fixed-space"></view>
-        <view class="ll-fixed">
-            <view class="lf-btn">添加定时任务</view>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-    data(){
-        return {
-            weeks: [ '周日', '周一', '周二', '周三', '周四', '周五', '周六' ],
-            condition: {
-                instruct: 'open', // 指令 open: 开, close: 关
-                time: '', // 时间点
-                weekLs: [], // 日期
-            }
-        }
-    },
-    methods: {
-        switchChange(e){
-            if(e.detail.value){
-                this.condition.weekLs = [ ...this.weeks];
-            }else{
-                this.condition.weekLs = [];
-            }
-        },
-        weekItemClick(e){
-            let { weekLs } = this.condition;
-            if(weekLs.includes(e)){
-                weekLs.splice(weekLs.indexOf(e), 1);
-            }else{
-                weekLs.push(e);
-            }
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-    .ll-title{
-        padding: 46upx 40upx 60upx;
-        @include flcw(44upx, 60upx, #1a1a1a, 500);
-        @include tHide;
-    }
-    .ls-container{
-        margin: 0 auto;
-        padding: 50upx 30upx 100upx;
-        width: 678upx;
-        border-radius: 10upx;
-        background: #fff;
-        .lc-name{
-            flex-shrink: 0;
-            @include flcw(32upx, 44upx, #1a1a1a);
-        }
-        .lc-select{
-            @include ctf(space-between);
-            .ls-options{
-                width: 480upx;
-                @include ctf;
-                .lp-item{
-                    width: 50%;
-                    @include ctf;
-                    .li-txt{
-                        @include flcw(32upx, 44upx, #1a1a1a);
-                    }
-                    .li-icon{
-                        margin-left: 22upx;
-                        flex-shrink: 0;
-                        width: 40upx;
-                        height: 40upx;
-                        border: 2upx solid #D8D8D8;
-                        border-radius: 50%;
-                        &.active{
-                            border-width: 0upx;
-                            border-color: transparent;
-                        }
-                    }
-                }
-                
-            }
-        }
-        .lc-picker{
-            margin-top: 50upx;
-            @include ctf(space-between);
-            .lp-box{
-                @include ctf(space-between);
-                width: 480upx;
-                height: 96upx;
-                border: 2upx solid #D8D8D8;
-                border-radius: 10upx;
-                padding: 0 20upx;
-                .lb-ipt{
-                    flex-grow: 1;
-                    @include flcw(32upx, 44upx, #1a1a1a);
-                }
-                .lb-icon{
-                    flex-shrink: 0;
-                    width: 28upx;
-                    height: 28upx;
-                    transform: rotateZ(90deg);
-                }
-            }
-        }
-        .lc-switch{
-            margin-top: 50upx;
-            @include ctf(space-between);
-            .ls-right{
-                width: 480upx;
-                @include ctf;
-                .lr-switch{
-                    transform: scale(.8);
-                }
-                .lr-txt{
-                    margin-left: 20upx;
-                    @include flcw(32upx, 44upx, #1a1a1a);
-                }
-            }
-        }
-        .lc-week-ls{
-            margin-top: 60upx;
-            display: flex;
-            flex-wrap: wrap;
-            .lwl-item{
-                margin: 0 20upx;
-                width: 160upx;
-                height: 88upx;
-                border-radius: 6upx;
-                border: 2upx solid #979797;
-                text-align: center;
-                @include flcw(32upx, 84upx, #979797);
-                &:nth-child(n + 4){
-                    margin-top: 40upx;
-                }
-                &.active{
-                    color: $mColor;
-                    border-color: $mColor;
-                    background: rgba($color: $mColor, $alpha: .12);
-                }
-            }
-        }
-        
-    }
-    .ll-fixed-space{
-        padding-bottom: 132upx;
-        @include isPd(132upx);
-    }
-    .ll-fixed{
-        position: fixed;
-        bottom: 0;
-        padding: 10upx 24upx;
-        width: 100%;
-        @include isPd(10upx);
-        .lf-btn{
-            text-align: center;
-            border-radius: 10upx;
-            background: $mColor;
-            @include flcw(32upx, 112upx, #fff, 500);
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index d00c0af..8b1ddac 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -210,7 +210,13 @@ export default {
 				if(this.pageInfo.hardware_type=='IotSim')return util.routeTo(`/subpackage/device/pages/index/lot_manage?mac=${switchInfo.hardware_standard}`, 'nT');
 				
 			}
-			if(status == 3) return (()=>{
+
+            // 云中空，照明，开定时得区分开来
+            if(status === 3 && switchInfo?.hardware_type === "Light" && switchInfo?.hardware_connect_method === "YZK" ){
+                let { hardware_name, id } = switchInfo;
+                let _qryStr = `hardware_id=${id || ''}&hardware_name=${util.jsonStr(hardware_name || '')}`
+                return util.routeTo(`/subpackage/device/pages/lighting_time/list?${_qryStr}`, 'nT');
+            } else if (status == 3) return (()=>{
 				switchInfo.switchData = _data;//将中控组合数据传递到下层
 				let timing_setting = `/subpackage/device/pages/timing/timing_setting?switchInfo=${encodeURIComponent(JSON.stringify(switchInfo))}`
 				util.routeTo(`${timing_setting}`, 'nT');
diff --git a/src/subpackage/device/static/images/delete.png b/src/subpackage/device/static/images/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..b358e0b3085bf5667ea9d73b211f5028c29cb599
GIT binary patch
literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZTmyVUT!HktbLY;UJqsiu3?Lg0
z;DX3fK=zq4XMp7S^XE^WJ`GfSaGi$+&>*prAirRSrIAw~ddYo!z4b8v_qLjHTT%A2
zsp|WuKGXxMIOyr(7-Dhy?WEH}M+5|1-z!`?@%!O_`_fsbeB6XKoyt4sH2t>w!UM@K
zuFVLWE_<<JnV@R=2We-=P4Xv~{k*ZS%xS(xkA0%`yY9~sCf|dYi}fXU#GRVi(PNWn
zF>mP`S*C{vnABZ%Fw8ivBKy63mx|=NjhUN*YOGjSe5i<A`6!Cnbowj(sj5sXG%O#P
z_?=8ueUUe_A@k*z$^Sh+`6N9z5}WrjeC~#Cb~h7(?3!nNSbEAcwCLC`ua*4UC9PNU
e-N?H$EB{cH`o@5*UQ>adVeoYIb6Mw<&;$S<NVGEm

literal 0
HcmV?d00001

diff --git a/src/utils/util.js b/src/utils/util.js
index c38a21b..cb9c6d4 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -150,10 +150,10 @@ export function debounce(func, wait, immediate) {
   }
 }
 
-function jsonStr(data){
+export function jsonStr(data){
   return encodeURIComponent(JSON.stringify(data))
 }
-function jsonPar(json){
+export function jsonPar(json){
   return JSON.parse(decodeURIComponent(json))
 }
 

From 22c167c5ef3b4edfd549ce21f6baa429e6e4e640 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 2 Sep 2024 14:21:31 +0800
Subject: [PATCH 3/4] vtest 1.1.60

---
 src/subpackage/device/js/device_api.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js
index 7d129e4..db1f4f5 100644
--- a/src/subpackage/device/js/device_api.js
+++ b/src/subpackage/device/js/device_api.js
@@ -73,7 +73,6 @@ export const DEVICE_API = {
     cacScheduledTaskGet:`${ORIGIN}/admin/cacScheduledTask/data`, // 获取YZK照明定时列表接口
     cacScheduledTaskSave:`${ORIGIN}/admin/cacScheduledTask/save`, // 设置YZK照明定时
     cacScheduledTaskDelete:`${ORIGIN}/admin/cacScheduledTask/delete`, // 删除YZK照明定时
-
     
 }
 

From a5885c5afc27aec7933903e6e5537093c270d535 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 2 Sep 2024 14:36:25 +0800
Subject: [PATCH 4/4] v 1.1.60 formal & tid1641

---
 src/js/api.js     | 4 ++--
 src/manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index 550179d..88f6939 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,5 +1,5 @@
-export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
-// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
+// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
diff --git a/src/manifest.json b/src/manifest.json
index d409cc9..3fe960c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -73,7 +73,7 @@
 			//  }
 		 // },
         /* 正式 wxf1294b279ad1b845 */ 
-        "appid" : "wx7106e84614cf0060",
+        "appid" : "wxf1294b279ad1b845",
         "setting" : {
             "urlCheck" : false,
             "minified" : true