qw

components.d.ts

@@ -12,6 +12,7 @@ declare module 'vue' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCol: typeof import('element-plus/es')['ElCol']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
@@ -27,6 +28,7 @@ declare module 'vue' {
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']

src/hooks/handleFun.ts

@@ -83,3 +83,29 @@ export function handleEchartsData_timeStamp_p(data, value) {
 
     return timeArray_1
 }
+export function handleEchartsData_timeStamp_p_u_i(data, value) {
+    // 间隔可以设置成动态的
+    let timeArray_1 = [];
+    for (let hour = 0; hour < 24; hour++) {
+        for (let minute = 0; minute < 60; minute += value) {
+            let timeString = (hour < 10 ? '0' + hour : hour) + ':' + (minute < 10 ? '0' + minute : minute);
+            timeArray_1.push(
+                { timeStamp: timeString, p: '-',u:'',i:''}
+            );
+        }
+    }
+    console.log(timeArray_1)
+    timeArray_1.forEach(item => {
+        data.forEach(ite => {
+            let iteTime = ite.timeStamp.split(' ')[1].split(':')[0] + ':' + ite.timeStamp.split(' ')[1].split(':')[1]
+            if (iteTime === item.timeStamp) {
+                item.p =ite.p
+                item.u =ite.u
+                item.i =ite.i
+
+            }
+        })
+    })
+
+    return timeArray_1
+}

src/views/pages/carPage/index.vue

@@ -369,31 +369,58 @@
                 placeholder="输入调节值"
               />
             </el-form-item>
-            <el-form-item label="起始时间" prop="password">
+            <el-form-item label="结束时间">
-              <!-- <el-input v-model="form.password" type="password"></el-input> -->
+              <el-col :span="11">
-
                 <el-date-picker
-                v-model="value1"
+                  v-model="formData.start_date"
-                type="datetime"
+                  type="date"
-                placeholder="Select date and time"
+                  placeholder="Pick a date"
-                style="width: 240px"
+                  style="width: 100%"
                 />
+              </el-col>
+              <el-col :span="2" class="text-center">
+                <span class="text-gray-500">-</span>
+              </el-col>
+              <el-col :span="11">
+                <el-time-picker
+                  v-model="formData.start_time"
+                  placeholder="Pick a time"
+                  style="width: 100%"
+                />
+              </el-col>
             </el-form-item>
-            <el-form-item label="结束时间" prop="password">
+
             <!-- <el-input v-model="form.password" type="password"></el-input> -->
+            <el-form-item label="结束时间">
+              <el-col :span="11">
                 <el-date-picker
-                v-model="value1"
+                  v-model="formData.end_date"
-                type="datetime"
+                  type="date"
-                placeholder="Select date and time"
+                  placeholder="Pick a date"
-                style="width: 240px"
+                  style="width: 100%"
                 />
+              </el-col>
+              <el-col :span="2" class="text-center">
+                <span class="text-gray-500">-</span>
+              </el-col>
+              <el-col :span="11">
+                <el-time-picker
+                  v-model="formData.end_time"
+                  placeholder="Pick a time"
+                  style="width: 100%"
+                />
+              </el-col>
             </el-form-item>
             <!-- 添加提交按钮 -->
             <el-form-item>
+              <el-button
+                type="primary"
+                @click="submitForm('formRef')"
+              ></el-button>
               <el-button type="primary" @click="submitForm('formRef')"
-                >提交</el-button
+                >下发指令</el-button
               >
-              <el-button @click="resetForm('formRef')">重置</el-button>
+              <!-- <el-button @click="resetForm('formRef')">清空</el-button> -->
             </el-form-item>
           </el-form>
         </div>
@@ -662,16 +689,17 @@ let getRunning_api = () => {
 //
 // 调节信息框
 let formData = ref({
-  username: "",
   type: "",
-  whether:"",
+  whether: "",
-  number:"",
+  number: "",
   start_date: "",
-  end_start_date: "",
+  start_time: "",
-  end_end_date: "",
+  end_date: "",
+  end_time: "",
 });
-
+const submitForm = () => {
-
+  console.log(formData, "1--------------formData");
+};
 //进入调节
 let ajustCarPageFlag = ref(true);
 const ajustCarPage = () => {
@@ -1846,7 +1874,7 @@ const styleVar = computed(() => {
     }
     .ajustCar {
       box-sizing: border-box;
-      width: changeHeight(840.17);
+      width: changeHeight(1040.17);
       height: changeHeight(801.49);
       background: url("@/assets/images/osPage/run_detail_bg.png") no-repeat;
       background-size: 100% 100%;
@@ -1886,6 +1914,63 @@ const styleVar = computed(() => {
           }
         }
       }
+      .content {
+        margin-top: 3%;
+        width: 95%;
+        height: 100%;
+        border: 1px solid pink;
+        :deep(.el-form) {
+          border: 1px solid red;
+          height: 100%;
+          // label标签
+          .el-form-item__label {
+            width: changeHeight(200) !important;
+            height: changeHeight(80) !important;
+            line-height: changeHeight(80) !important;
+            color: #fff;
+            font-size: changeHeight(35);
+          }
+          //  输入框
+          .el-select--large .el-select__wrapper,
+          .el-input__wrapper,
+          .el-select-dropdown__item {
+            background: transparent !important;
+            font-size: changeHeight(35) !important;
+            width: changeHeight(300) !important;
+            height: changeHeight(80) !important;
+          }
+          .el-input__inner {
+            color: #fff !important;
+          }
+       
+          .el-select__placeholder{
+
+            color: #fff !important;
+          }
+          .el-radio__label{
+            color: #fff !important;
+
+          }
+          // 按钮
+          .el-button {
+            width: changeHeight(250);
+            height: changeHeight(80);
+          }
+          .el-button:nth-child(1) {
+            background-color: transparent !important;
+            border: none;
+          }
+          .el-button:nth-child(2) {
+            margin-top: 2%;
+            margin-left: changeHeight(180);
+          }
+          // 没一行
+          .el-form-item{
+            height: changeHeight(80) !important;
+            margin-bottom:changeHeight(50) !important;
+          }
+        }
+      }
     }
     .area_load {
       width: changeHeight(1156.86);