liuqiao 1 anno fa
parent
commit
8697cd42ab
2 ha cambiato i file con 15 aggiunte e 16 eliminazioni
  1. 0 2
      src/view/appmian.vue
  2. 15 14
      src/view/index/first-left.vue

+ 0 - 2
src/view/appmian.vue

@@ -166,10 +166,8 @@ const  handleSelectzt=(val)=>{
 const resulysucss=(val)=>{
   state.value=val;
   // 求解成功
-  setTimeout(function(){ },300)
   if(  state.value=='1'){
     indexref.value.changeColor(0);
-    websockfrist();
   }
 }
 //求解成功

+ 15 - 14
src/view/index/first-left.vue

@@ -21,8 +21,8 @@
                   <el-option
                     v-for="item in strResultFormatlist"
                     :key="item.id"
-                    :label="item.name"
-                    :value="item.value"
+                    :label="item.code"
+                    :value="item.code"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -32,8 +32,8 @@
               </div>
             </div>
               <div class="zongji">
-                <div class="zongjili img1">{{ warnin }}<span>个</span></div>
-                <div class="zongjili img2">{{ warnin2 }}<span>个</span></div>
+                <div class="zongjili img1">{{ warnin2 }}<span>个</span></div>
+                <div class="zongjili img2">{{ warnin}}<span>个</span></div>
               </div>
               <div class="asides_content">
                 <div class="jc_content tablecolor">
@@ -209,7 +209,7 @@ const job = ref({
   cocodes: "", //物理属性code逗号分隔
 });
 const formInline = ref({
-  region: "shanghai",
+  region: "Height",
 });
 
 const tableData =ref( [
@@ -241,7 +241,7 @@ onMounted(() => {
 //     myChart.resize();
 
 // };
-
+fcon.step=count.value;
 });
 const fcon = createFireControl();
 // 检测点的结果获取
@@ -256,6 +256,7 @@ console.log(props.classradio);
   // vtkmodel.clearModeAddJg();
   // vtkGridRead()
  readJob();
+ console.log(666666666)
 
 }
 function regionchange(val) {
@@ -276,7 +277,7 @@ function regionchange(val) {
       danwei.value = key + value;
     }
   });
-  getMonitor();
+  //getMonitor();
   vtkShow();
 }
 //获取任务信息
@@ -285,6 +286,7 @@ const params = {
   transCode: "D10017",
   aid: aid.value,
 };
+console.log(111112222233343433+1)
 await request(params)
   .then((res) => {
     if (res.returnCode == "000000000") {
@@ -292,14 +294,11 @@ await request(params)
     
       if(res.state=='1'){
       //  vtkmodel.clearModeAddJg(); //隐藏模版显示结果
-   
-     // monitor.value = true;
       job.value = res;
-     
       getMonitor();
-      // vtkmodel.clearModeAddJg();
-      // reddate(new Date());
-      // vtkGridRead();
+      vtkmodel.clearModeAddJg();
+      reddate(new Date());
+      vtkGridRead();
   
       endtime.value= Number(res.totaltime)/Number(res.reportstep);
       console.log( endtime.value);
@@ -376,7 +375,8 @@ async  function getMonitor() {
         // { prop: 'state', label: '操作' },
         // ...更多表头数据
         }
-        console.log( strResultFormatlist.value);
+        strResultFormatlist.value=res.codes;
+        console.log(res);
          dynamicHeaders.value=headertable;
         let warning=[];//一级警告
         let warning2=[];//二级警告
@@ -599,6 +599,7 @@ const lineChart=()=>{
        {
          type: 'value',
          minInterval:1,
+         splitNumber: 5, 
          max: 700,
          splitLine: {
            show: true,