3.2下班提交

src/view/Dialoges.vue

@@ -270,6 +270,7 @@
                 type="datetime"
                 placeholder="Pick a Date"
                 format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 @change="timeclick()"
             />
             </div>
@@ -416,6 +417,18 @@ let tuiyanobj2=ref({
     coids:'1',
     cocodes:'CO2'
 
+})
+let tuiyanobj3=ref({
+    value:['SO2'],
+    acctime:'24-03-06 00:00:00',
+    dt:'5',
+    dx:'5',
+    reportstep:'60',
+    interactionstep:'3600',
+    totaltime:'3600',
+    coids:'1',
+    cocodes:'CO2'
+
 })
 let coolactiveName=ref(["1","2"]);
 let rizhi=ref({
@@ -630,14 +643,24 @@ const inititimeDefaultal=()=>{
 
 // 初始数据
 const initial=()=>{
-   tuiyanobj2.value.acctime=inititimeDefaultal();
+    if(classradio.value=="Fire"){
+        tuiyanobj2.value.acctime=inititimeDefaultal();
     tuiyanobj.value=tuiyanobj2.value;
+    }else{
+        tuiyanobj2.value.acctime=inititimeDefaultal();
+       tuiyanobj.value=tuiyanobj3.value;
+    }
+
 
 }
 //推演的开始计算
+function zdtimechange() {
+ 
 
+}
 const timeclick=()=>{
-    tuiyanobj.value.acctime=pickertime.value.getFullYear() + "-" + (pickertime.value.getMonth() + 1) + "-" + (pickertime.value.getDate()) + " 00:00:00";
+    console.log(pickertime.value)
+    //tuiyanobj.value.acctime=pickertime.value.getFullYear() + "-" + (pickertime.value.getMonth() + 1) + "-" + (pickertime.value.getDate()) + " 00:00:00";
 }
 //  下拉多选
 const selectchange=(val)=>{
@@ -1419,15 +1442,5 @@ border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255,
 .el-select__input{
     font-size: 12px;
 }
-.L_aside1{
-    background: rgba(13, 22, 57, 0.6);
-    border-bottom: 1px solid;
-    border-left: 1px solid;
-    border-right: 1px solid;
-    -o-border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255, 0.48)) 1 1;
-    border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255, 0.48)) 1 1;
-    box-shadow: inset 0px 0px 17px 5px rgba(12, 97, 197, 0.2);
-    border-radius: 0px 0px 0px 0px;
-    background-color: rgba(13, 22, 57, 0.4); 
-}
+
 </style>

src/view/appmian.vue

@@ -105,7 +105,7 @@ const aidlist=()=>{
 const childfun=()=>{
     sourcedis.value.handledisaster(aid.value);
     boundary.value.addboundary(aid.value);
-   sourcedis.value.accident3();
+     sourcedis.value.accident3();
 }
 const headerclick=(data)=>{
     headerobj.value.name=data.name;

src/view/components/MyBoundary.vue

@@ -275,7 +275,7 @@ import closeimg from "@/assets/img/colse.png";
 import { ElMessage, ElButton, ElDialog } from 'element-plus'
 const props = defineProps({
     classradio: String,
-    aid: String
+   
 
 
 });
@@ -301,6 +301,7 @@ const currentPage4 = ref(1);
 const pageSize4 = ref(5)
 let nid=ref();
 let bid=ref();
+let  aid=ref();
 let bformInline = ref({
     nname:'',
     type:'Pressure',
@@ -428,7 +429,7 @@ const  accidentboun=()=>{
         nid:nid.value,
         nname:bformInline.value.nname,
         type:bformInline.value.type,
-        aid: props.aid,
+        aid: aid.value,
         flow:bformInline.value.flow,
         pressure:bformInline.value.pressure,
         temperature:bformInline.value.temperature,
@@ -437,7 +438,7 @@ const  accidentboun=()=>{
     }
     request(params)
         .then((res) => {
-         addboundary();
+         addboundary(aid.value);
           
         })
         .catch((err) => {
@@ -446,9 +447,11 @@ const  accidentboun=()=>{
 }
 // 边界数据的查询
 const addboundary = (valaid) => {
+   
+    aid.value=valaid;
     const params = {
         transCode: 'D10007',
-        aid:props.aid,
+        aid:aid.value,
     }
     request(params)
         .then((res) => {
@@ -478,7 +481,7 @@ const addboundary = (valaid) => {
                 message: '删除成功',
                 type: 'success',
               })
-              addboundary();
+              addboundary(aid.value);
               })
               .catch((err) => {
                 ElMessage.error(err.returnMsg)
@@ -897,7 +900,7 @@ defineExpose({ boun, accident4,addboundary });
 }
 
 .asideg .el-collapse-item__wrap {
-    /* height: calc(100vh - 120px); */
+    height: calc(100vh - 120px);
     background: rgba(13, 22, 57, 0.4);
     /* //border: 1px solid; */
     border-bottom: 1px solid;

src/view/components/Sourcedisaster.vue

@@ -1042,7 +1042,7 @@ text-transform: none;
 
 }
 .asideg .el-collapse-item__wrap{
-    /* height: calc(100vh - 120px); */
+    height: calc(100vh - 120px);
     background: rgba(13, 22, 57, 0.4);
     /* //border: 1px solid; */
     border-bottom: 1px solid;