Quellcode durchsuchen

3.15修改时间

liuqiao vor 1 Jahr
Ursprung
Commit
fa6f93b145

+ 1 - 7
src/view/InfoDialoges.vue

@@ -634,12 +634,8 @@ const pollute = () => {
     request(params)
         .then((res) => {
             options.value = res.rows;
-         // value.value= res.rows[0].code.split(',');
-        //    tuiyanobj2.value.coids=res.rows[0].coid;
-        //    tuiyanobj2.value.value= value.value;
            value.value.push(res.rows[0]);
-        // tuiyanobj2.value.cocodes =res.rows[0].code;
-        // tuiyanobj2.value.coids=res.rows[0].coid;
+     
 
         })
         .catch((err) => {
@@ -700,9 +696,7 @@ const addinitial=()=>{
         tuiyanobj2.value.acctime = inititimeDefaultal();
         tuiyanobj2.value.cocodes = options.value[0].code;
         tuiyanobj2.value.coids=options.value[0].coid;
-        console.log(value.value);
         tuiyanobj.value = tuiyanobj2.value;
-        console.log(tuiyanobj2.value);
     } else {
 
         tuiyanobj3.value.pickertime = inititimeDefaultal();

+ 7 - 1
src/view/appmian.vue

@@ -121,6 +121,7 @@ const qingsel=()=>{
 
 const titleclick = () => {
     lliudialog.value.dialogVisible = true;
+    clearInterval();
 }
 //获取aid
 const aidlist = () => {
@@ -149,6 +150,7 @@ const handleSelect = (key) => {
             lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
             resultbidui.value.accident6(key)
+            tanimation.value.accident5(aid.value,key);
             activeIndex.value='1';
             break;
         case '2':
@@ -158,6 +160,7 @@ const handleSelect = (key) => {
             lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
             resultbidui.value.accident6(key)
+            tanimation.value.accident5(aid.value,key);
             activeIndex.value='2'
             break;
         case '3':
@@ -167,11 +170,13 @@ const handleSelect = (key) => {
             lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
             activeIndex.value='3';
+            tanimation.value.accident5(aid.value,key);
             resultbidui.value.accident6(key)
+       
             break;
         case '4':
             boundary.value.accident4(key);
-            tanimation.value.accident5(aid.value);
+            tanimation.value.accident5(aid.value,key);
              sourcedis.value.accident3(key);
             lliudialog.value.accident2(key);
             resultbidui.value.accident6(key)
@@ -183,6 +188,7 @@ const handleSelect = (key) => {
             boundary.value.accident4(key);
             lliudialog.value.accident2(key);
             resultbidui.value.accident6(key)
+            tanimation.value.accident5(aid.value,key);
             tanimation.value.monitor = false;
             activeIndex.value='5';
         default:

+ 20 - 18
src/view/components/InfoAnimation.vue

@@ -182,6 +182,7 @@ let endtime = ref(60);
 let timenum = ref(2);
 let aid = ref();
 let timing = ref(null);
+let timing3 = ref(null);
 let timing2 = ref(null);
 let jgSelectPointId=ref(0);
 const percentage = ref(20);
@@ -239,6 +240,7 @@ const cocodeIsInit = ref("false");
 function sliderchange(val) {
   //newcount.value=count.value;
   fcon.step = count.value;
+  console.log( count.value );
   // console.log(count.value);
   // vtkScalarRead();
   // getMonitor();
@@ -372,12 +374,12 @@ function regionchange(val) {
   vtkShow();
 }
 // aid获取
-const accident5 = (val) => {
+const accident5 = (val,key) => {
 
   aid.value = val;
   resultactiveName.value = "first";
-  // console.log(aid.value);
-  // console.log("props.classradio", props.classradio);
+if(key=='4'){
+  timehandclick();
   if (props.classradio == "Fire") {
     monitor.value = true;
   } else if (props.classradio == "Water") {
@@ -386,21 +388,13 @@ const accident5 = (val) => {
   cocodeIsInit.value = false;
   //获取任务信息
   readJob();
+  console.log(  resultactiveName.value)
+}else{
+  clearInterval(timing.value);
+}
 
-  if (resultactiveName.value == "first") {
-    timing.value = setInterval(() => {
-      const timestamp = new Date().getTime();
-      newtime.value = timestampToTime(timestamp);
-      reddate(new Date());
-    }, 1000);
-  } else {
-    timing.value = setInterval(() => {
-      const timestamp = new Date().getTime();
-      newtime.value = timestampToTime(timestamp);
-    }, 1000);
-  }
 
-  // fireRead()
+//   // fireRead()
 };
 
 const fcon = createFireControl();
@@ -594,6 +588,12 @@ function getMinMax(scalars) {
 
 const handleClick = (Tab, val) => {
   resultactiveName.value=Tab.props.name;
+  timehandclick();
+};
+const inittime=()=>{
+  clearInterval(timing.value);
+}
+const timehandclick=()=>{
   if (resultactiveName.value == "first") {
     timing.value = setInterval(() => {
       const timestamp = new Date().getTime();
@@ -607,11 +607,13 @@ const handleClick = (Tab, val) => {
   } else if ( resultactiveName.value== "third") {
     clearInterval(timing.value);
   }
-};
+}
 onBeforeUnmount(() => {
   clearInterval(timing.value);
 });
-onMounted(() => {});
+onMounted(() => {
+
+});
 
 watch(
   newcount,

+ 1 - 1
src/view/components/InfoDisaster.vue

@@ -439,7 +439,7 @@
               placeholder="请输入时间秒"
               maxlength="12"
               step="0.01"
-              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
+              oninput ="value=value.replace(/^|[^0-9]/g,'')" 
             />
           </el-form-item>
           <el-form-item label="温度℃" :label-width="formLabelWidth6">

+ 3 - 1
src/view/components/SetNode.vue

@@ -69,7 +69,9 @@ const textclick=()=>{
   emit('Dtext',selectObj.value);
   clearInterval(timing.value);
 }
-clearInterval(timing.value);
+const closeDialog=()=>{
+  clearInterval(timing.value);
+}
 onBeforeUnmount(() => {
   clearInterval(timing.value);
 });