3.04

src/js/lindex.js

@@ -6,7 +6,7 @@ export function timestampToTime(timestamp) {
         let hour = ("0" + date.getHours()).slice(-2);
         let minute = ("0" + date.getMinutes()).slice(-2);
         let second = ("0" + date.getSeconds()).slice(-2);
-        let formattedTime = year + "/" + month + "/" + day + " " + hour + ":" + minute + ":" + second;
+        let formattedTime = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
         console.log(formattedTime)
         return formattedTime;
      }

src/view/Dialoges.vue

@@ -187,7 +187,7 @@
             <span class="inputtext_1">选择时间</span>
             <div class="block">
             <el-date-picker
-                v-model="pickertime"
+                v-model="tuiyanobj.pickertime"
                 type="datetime"
                 placeholder="Pick a Date"
                 format="YYYY-MM-DD HH:mm:ss"
@@ -266,7 +266,7 @@
             <span class="inputtext_1">选择时间</span>
             <div class="block">
             <el-date-picker
-                v-model="pickertime"
+                v-model="tuiyanobj.pickertime"
                 type="datetime"
                 placeholder="Pick a Date"
                 format="YYYY-MM-DD HH:mm:ss"
@@ -327,7 +327,7 @@
   </div>
   </div>
 </template>
-
+<!-- timestampToTime -->
 <script setup>
 import { computed,ref,onMounted,reactive, toRef } from "vue";
 import { request, uploadFile } from "@/utils/request";
@@ -353,7 +353,7 @@ const props= defineProps({
     }
 
  });
- let pickertime=ref('');
+
  let zqname=ref({});
  let shiguobj=ref({
         source:'自荐',
@@ -396,7 +396,8 @@ const dialog=ref({
 })
 let tuiyanobj=ref({
     value:[''],
-    acctime:'24-03-06 00:00:00',
+    pickertime:'24-03-06 00:00:00',
+    acctime:'2024-03-06 00:00:00',
     dt:'',
     dx:'',
     reportstep:'',
@@ -408,7 +409,8 @@ let tuiyanobj=ref({
 })
 let tuiyanobj2=ref({
     value:['SO2'],
-    acctime:'24-03-06 00:00:00',
+    pickertime:'',
+    acctime:'2024-03-06 00:00:00',
     dt:'0.1',
     dx:'10',
     reportstep:'60',
@@ -420,7 +422,8 @@ let tuiyanobj2=ref({
 })
 let tuiyanobj3=ref({
     value:['SO2'],
-    acctime:'24-03-06 00:00:00',
+    pickertime:'',
+    acctime:'2024-03-06 00:00:00',
     dt:'5',
     dx:'5',
     reportstep:'60',
@@ -444,20 +447,7 @@ const formInline = ref({
   
 })
 const value = ref([])
-const options = ref([
-  {
-    value: 'HTML',
-    label: 'HTML',
-  },
-  {
-    value: 'CSS',
-    label: 'CSS',
-  },
-  {
-    value: 'JavaScript',
-    label: 'JavaScript',
-  },
-])
+const options = ref([])
 let scoperadio=ref(1);
 // 推演结果
 const customColor = ref('#409eff')
@@ -635,19 +625,23 @@ const pollute=()=>{
 //默认时间
 const inititimeDefaultal=()=>{
       var date = new Date();
-      var s1 = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + (date.getDate()) + " 00:00:00";
-      var s2 = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + (date.getDate()) + " 23:59:59";
-    console.log(s1)
+    var timeStamp = Date.parse(date)
+  var  s1=timestampToTime(timeStamp );
       return s1;
 }
 
 // 初始数据
 const initial=()=>{
     if(classradio.value=="Fire"){
+        options.value.coid=["CO2"];
+        tuiyanobj2.value.pickertime=inititimeDefaultal();
         tuiyanobj2.value.acctime=inititimeDefaultal();
-    tuiyanobj.value=tuiyanobj2.value;
+        tuiyanobj.value=tuiyanobj2.value;
+        console.log(tuiyanobj.value);
     }else{
-        tuiyanobj2.value.acctime=inititimeDefaultal();
+
+        tuiyanobj3.value.pickertime=inititimeDefaultal();
+        tuiyanobj3.value.acctime=inititimeDefaultal();
        tuiyanobj.value=tuiyanobj3.value;
     }
 
@@ -659,8 +653,9 @@ function zdtimechange() {
 
 }
 const timeclick=()=>{
-    console.log(pickertime.value)
-    //tuiyanobj.value.acctime=pickertime.value.getFullYear() + "-" + (pickertime.value.getMonth() + 1) + "-" + (pickertime.value.getDate()) + " 00:00:00";
+
+    var timeStamp = Date.parse(tuiyanobj.value.pickertime)
+    tuiyanobj.value.acctime=timestampToTime(timeStamp );
 }
 //  下拉多选
 const selectchange=(val)=>{
@@ -670,10 +665,7 @@ const selectchange=(val)=>{
         console.log(val[i])
         arr1.push(val[i].coid);
         arr2.push(val[i].code);
-      
-
     }
-    console.log(arr2);
     tuiyanobj.value.coids= arr1.join(',');
     tuiyanobj.value.cocodes =arr2.join(',');
 }

src/view/components/MyBoundary.vue

@@ -336,8 +336,8 @@ let bformInline = ref({
     region: 'Pressure',
     options2: [
         {
-            value: 'Pressure',
-            label: ' 压力入口',
+            value: '压力出口',
+            label: ' 压力出口',
         },
     ]