From a71bbd82e9c99ddbf5cf5af36724b53e6801c3bc Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Mon, 15 May 2023 15:06:41 +0800
Subject: [PATCH] 11

---
 psdc-ui/src/api/control/manual.js             |   4 +
 psdc-ui/src/api/control/timer.js              |   6 +
 psdc-ui/src/assets/images/功率.png          | Bin 0 -> 1979 bytes
 psdc-ui/src/assets/images/温度.png          | Bin 0 -> 1829 bytes
 psdc-ui/src/assets/images/温度传感器.png | Bin 0 -> 1971 bytes
 psdc-ui/src/assets/images/用电量.png       | Bin 0 -> 1667 bytes
 psdc-ui/src/views/control/manual/index.vue    |  76 ++++++++++++-
 psdc-ui/src/views/control/timer/index.vue     | 103 ++++++++++++++----
 8 files changed, 165 insertions(+), 24 deletions(-)
 create mode 100644 psdc-ui/src/assets/images/功率.png
 create mode 100644 psdc-ui/src/assets/images/温度.png
 create mode 100644 psdc-ui/src/assets/images/温度传感器.png
 create mode 100644 psdc-ui/src/assets/images/用电量.png

diff --git a/psdc-ui/src/api/control/manual.js b/psdc-ui/src/api/control/manual.js
index 6ee57e7..b754ed7 100644
--- a/psdc-ui/src/api/control/manual.js
+++ b/psdc-ui/src/api/control/manual.js
@@ -7,4 +7,8 @@ export function getDevice() {
 /** 获取调控日志列表*/
 export function getControlLogList(data) {
     return request.post('/control/manual/controlLogList',data)
+}
+/** 获取策略列表*/
+export function getStrategyList(data) {
+    return request.get('/control/manual/strategyList',data)
 }
\ No newline at end of file
diff --git a/psdc-ui/src/api/control/timer.js b/psdc-ui/src/api/control/timer.js
index e69de29..8ecf3d2 100644
--- a/psdc-ui/src/api/control/timer.js
+++ b/psdc-ui/src/api/control/timer.js
@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+
+/** 获取定时控制列表*/
+export function getList(data) {
+    return request.post('/control/timer/list',data)
+}
\ No newline at end of file
diff --git a/psdc-ui/src/assets/images/功率.png b/psdc-ui/src/assets/images/功率.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef520cfa7cd55ade92a1e242abcdb74b3b434854
GIT binary patch
literal 1979
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
N002ovPDHLkV1o5&rm+A3

literal 0
HcmV?d00001

diff --git a/psdc-ui/src/assets/images/温度.png b/psdc-ui/src/assets/images/温度.png
new file mode 100644
index 0000000000000000000000000000000000000000..90ce78ddac4bcc88c095ad9ca134e8379c288b5e
GIT binary patch
literal 1829
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
TvFEVl00000NkvXXu0mjf;_8p<

literal 0
HcmV?d00001

diff --git a/psdc-ui/src/assets/images/温度传感器.png b/psdc-ui/src/assets/images/温度传感器.png
new file mode 100644
index 0000000000000000000000000000000000000000..051a33941e88ec0f0562e81a263e1080073378f7
GIT binary patch
literal 1971
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
FV1hF*qS*id

literal 0
HcmV?d00001

diff --git a/psdc-ui/src/assets/images/用电量.png b/psdc-ui/src/assets/images/用电量.png
new file mode 100644
index 0000000000000000000000000000000000000000..832f09769a853c6d1f764bc614e9284a51cbc5ef
GIT binary patch
literal 1667
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
N002ovPDHLkV1hvo4~+l-

literal 0
HcmV?d00001

diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index 9e72f2a..9790278 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -16,6 +16,7 @@
               <el-form-item label="当前状态："><span :class="{'green':item.deviceRunstatus === '开启','red':item.deviceRunstatus === '关闭'}">{{ item.deviceRunstatus }}</span></el-form-item>
               <el-form-item label="进水温度："><el-input v-model="form1.enter" /></el-form-item>
               <el-form-item label="出水温度："><el-input v-model="form1.leave" /></el-form-item>
+<!--              <el-form-item label="当前温度："><el-input v-model="form1.now" /></el-form-item>-->
               <div class="submit" @click="onSubmit1">确定</div>
             </el-form>
           </div>
@@ -151,8 +152,18 @@
     <el-drawer v-model="drawerIshow">
       <template #header><h4>策略导入</h4></template>
       <template #default>
-        <el-radio v-model="radio" label="策略1" size="large">策略1</el-radio>
-        <el-radio v-model="radio" label="策略2" size="large">策略2</el-radio>
+          <el-radio v-for="(item,index) in celueList" :key="index" class="celueBox" v-model="radio" :label="item.sceneName" size="large">
+          <span style="font-weight: bold; display: inline-block; margin-bottom: 20px;">{{ item.sceneName }}</span>
+          <div class="celueItem" v-for="items in item.data" :key="items.device_id">
+            <span>{{ items.device_name }}</span>
+            <div class="itemsValue">
+              <span class="txtInput" v-for="itemsValue in items.value" :key="itemsValue.sceneKey">
+                <span class="txt">{{ itemsValue.sceneContext }}：</span>
+                <input type="text" :value="itemsValue.sceneValue" disabled/>
+              </span>
+            </div>
+          </div>
+        </el-radio>
       </template>
       <template #footer>
         <div style="flex: auto">
@@ -167,15 +178,19 @@
 import { Download } from '@element-plus/icons-vue'  //element字体图标
 import { ref,reactive,onMounted } from 'vue'
 import { ElMessageBox } from 'element-plus'
-import { getDevice,getControlLogList } from '@/api/control/manual'
+import { getDevice,getControlLogList,getStrategyList } from '@/api/control/manual'
 
 onMounted(()=>{
   getDeviceFun();
   getControlLogListFun();
+  getStrategyListFun()
 })
 
 /** 获取所有设备*/
 const deviceArr = ref([])
+const isShow1 = ref(true)
+const isShow2 = ref(true)
+const isShow3 = ref(true)
 function getDeviceFun(){
   getDevice().then((res)=>{
     console.log(res.data)
@@ -201,6 +216,7 @@ const value7 = ref(false)
 const form1 = reactive({
   enter:'',
   leave:'',
+  now:''
 })
 const form2 = reactive({
   enter:'',
@@ -254,10 +270,18 @@ function getControlLogListFun(){
 /** 策略导入处理*/
 const drawerIshow = ref(false)
 const radio = ref()
+const celueList = ref([])
+function getStrategyListFun(){
+  getStrategyList().then((res)=>{
+    celueList.value = res.data
+    console.log(res.data)
+  })
+}
 function confirmClick() {
   ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => {
     drawerIshow.value = false;
-      })
+    console.log('确定')
+  })
 }
 
 
@@ -363,6 +387,43 @@ function confirmClick() {
   }
 }
 
+.celueBox{
+  width: 100%;
+  height: auto;
+  padding: 10px;
+  margin-bottom: 12px;
+  border: 1px solid #ddd;
+  &:hover{
+    border: 1px solid #409EFF;
+  }
+  .celueItem{
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: nowrap;
+    padding: 10px 0;
+    border-bottom: 1px solid #dddddd50;
+    .itemsValue{
+      display: flex;
+      justify-content: flex-start;
+      flex-wrap: nowrap;
+      width: 80%;
+      .txtInput{
+        margin-right: 10px;
+        .txt{
+          display: inline-block;
+          width: 80px;
+          text-align: right;
+        }
+        input{
+          padding: 3px 3px;
+          width: 100px;
+          border: 1px solid #ddd;
+        }
+      }
+    }
+  }
+}
+
 ::v-deep .el-button{
   border-radius: 2px;
   margin-bottom: 12px;
@@ -396,5 +457,12 @@ function confirmClick() {
 ::v-deep .el-table--fit{
   background-color: #2D3D88;
 }
+::v-deep .el-radio{
+  display: inline-block;
+}
+::v-deep .el-drawer__body{
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 </style>
 
diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue
index 916a378..c044c49 100644
--- a/psdc-ui/src/views/control/timer/index.vue
+++ b/psdc-ui/src/views/control/timer/index.vue
@@ -16,7 +16,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="有效日期" style="width: 308px;">
-            <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-date-picker v-model="dateRange"
+                            value-format="YYYY-MM-DD"
+                            type="daterange"
+                            range-separator="-"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            @click="seletDate"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,8 +38,8 @@
           <div class="dev_control_table">
             <el-table :data="timingList" height="500px">
               <el-table-column label="序号" align="center" width="50"/>
-              <el-table-column label="指令内容" align="center" prop="content" width="700"/>
-              <el-table-column label="执行时间" align="center" prop="time"/>
+              <el-table-column label="指令内容" align="center" prop="controlValue" width="700"/>
+              <el-table-column label="执行时间" align="center" prop="createTime"/>
               <el-table-column label="有效日期" align="center" prop="dateRange"/>
               <el-table-column label="有效星期" align="center" prop="week"/>
               <el-table-column label="操作" align="center" prop="handle">
@@ -49,7 +56,7 @@
                 :disabled="disabled"
                 :background="background"
                 layout="total, sizes, prev, pager, next, jumper"
-                :total="timingList.length"
+                :total="total"
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"/>
           </div>
@@ -107,46 +114,93 @@
 
 <script setup name="Index">
 import {Delete} from '@element-plus/icons-vue'
-import {ref,reactive,watch} from "vue";
+import {ref,reactive,watch,onMounted} from "vue";
+import { getList } from '@/api/control/timer'
+
+
+/** 页面加载时*/
+onMounted(()=>{
+  formattedDateFun()
+  getListFun()
+})
+
+
+/** 格式化日期*/
+const YYYYMMDD = ref();
+const timer = ref()
+function formattedDateFun(){
+  let date = new Date()
+  let year = date.getFullYear()
+  let month = (date.getMonth()+1).toString().padStart(2, '0');
+  let day = date.getDate().toString().padStart(2, '0');
+  let hours = date.getHours()
+  let minutes = date.getMinutes()
+  let seconds = date.getSeconds()
+  YYYYMMDD.value = `${year}-${month}-${day}`
+  timer.value = `${hours}:${minutes}:${seconds}`
+  console.log(YYYYMMDD.value)
+  console.log(timer.value)
+}
+
 
 
 /** 筛选处理 */
+//选择的日期
 const dateRange = ref([]);
+const startDate = ref()
+const endDate = ref()
+const wacthSelectDate = watch(()=> dateRange.value,(val) =>{
+  console.log(val[0])
+  startDate.value = val[0]
+  console.log(val[1])
+  endDate.value = val[1]
+})
 const data = reactive({
   queryParams: {
     week: '',
     time: '',
   }
 });
+//选择日期
+function seletDate(){
+  console.log('选择的日期',dateRange.value)
+}
 //搜索按钮
 function handleQuery(){
+  getListFun()
 }
 //重置按钮
 function resetQuery(){
-  dateRange.value = []
+  dateRange.value = [];
+  getListFun()
 }
 
 
 /** 数据表格处理 */
-const timingList = reactive([
-  {
-    content:'11',
-    time:'22',
-    dateRange:'44',
-    week:'55',
-  },
-  {
-    content:'11',
-    time:'22',
-    dateRange:'44',
-    week:'55',
-  }
-])
+const timingList = ref([])
 const currentPage = ref(1)
 const pageSize = ref(5)
+const total = ref()
 const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
+
+function getListFun(){
+  getList({
+    "timerId":null,
+    "deviceId":null,
+    "controlContext":null,
+    "timerStatus":null,
+    "createStart":startDate.value,
+    "createEnd": endDate.value,
+    "pageNum": currentPage.value,
+    "pageSize": pageSize.value
+  }).then((res)=>{
+    total.value = res.total
+    timingList.value = res.rows
+  })
+}
+
 const handleSizeChange = (val) => {
   console.log(`${val}`)
 }
@@ -236,5 +290,14 @@ const { queryParams } = toRefs(data);
 ::v-deep .el-form-item__content{
   //display: flex;
 }
+::v-deep .el-input__inner{
+  color: #f3ffff;
+}
+::v-deep .el-date-editor .el-range-input{
+  color: #f3ffff;
+}
+::v-deep .el-scrollbar__wrap.el-scrollbar__wrap--hidden-default{
+  background-color: rgba(47,61,138);
+}
 </style>