11.14

src/views/echart/BarChart.vue

@@ -40,37 +40,75 @@ const echatinit = () => {
     xdata.value = [];
 }
 // 从websocket取数据
-const getsockechart = (data) => {
-    curvedata.value = data;
-    series.value = [];
-    let rows = curvedata.value;
-    for (let i = 0; i < rows.length; i++) {
+// const getsockechart = (data) => {
+//     curvedata.value = data;
+//     series.value = [];
+//     let rows = curvedata.value;
+//     for (let i = 0; i < rows.length; i++) {
 
-        vars.value = (rows[i].vars).split(",");
-        vals.value = (rows[i].vals).split(" ");
-        let data = vals.value.map((str) => Number(str));
-        convergeDate.value.push(data);
-        xdata.value.push(rows[i].step);
+//         vars.value = (rows[i].vars).split(",");
+//         vals.value = (rows[i].vals).split(" ");
+//         let data = vals.value.map((str) => Number(str));
+//         convergeDate.value.push(data);
+//         xdata.value.push(rows[i].step);
+//     }
+//     for (let j = 0; j < vars.value.length; j++) {
+//         let firstColumn = (convergeDate.value.map((row) => row[j]));
+//         let item = {
+//               name: vars.value[j],
+//             type: 'bar',
+//             data: firstColumn
+//         }
+//         series.value.push(item)
+//     }
+//     myChart.setOption({
+//         legend: {
+//             data: vars.value
+//         },
+//         yAxis: {
+//             data: xdata.value,
+//         },
+//         series: series.value
+//     });
+// }
+// 数据 从接口处取
+const getsockechart=(data)=>{
+  curvedata.value=data;
+  convergeDate.value=[];
+  series.value=[];
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
+       vars.value=(rows[i].vars).split(",");
+       vals.value=(rows[i].vals).split(" ");
+       let data= vals.value.map((str) => Number(str));
+       convergeDate.value.push(data);
+       xdata.value.push(num);
     }
-    for (let j = 0; j < vars.value.length; j++) {
-        let firstColumn = (convergeDate.value.map((row) => row[j]));
-        let item = {
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
+    for(let j=0;j<vars.value.length;j++){
+     let firstColumn=  convergeDate.value.map(row => row[j]);
+     let item = {
               name: vars.value[j],
             type: 'bar',
             data: firstColumn
         }
-        series.value.push(item)
+    series.value.push(item)
     }
     myChart.setOption({
-        legend: {
-            data: vars.value
-        },
-        yAxis: {
-            data: xdata.value,
+      legend: {
+            data:vars.value
         },
-        series: series.value
+      xAxis:{
+        data:  xdata.value,
+      },
+      series: series.value
     });
-}
+
+  }
 const setOptionfun = () => {
     option.value = {
         title: {

src/views/echart/area.vue

@@ -47,22 +47,64 @@ var chartDom = document.getElementById('area');
   xdata.value=[];
 }
 // 从websocket取数据
-const getsockechart=(data)=>{
+// const getsockechart=(data)=>{
+//   curvedata.value=data;
+//   series.value=[];
+//   let rows=curvedata.value;
+//   for(let i=0;i<rows.length;i++){
+    
+//        vars.value=(rows[i].vars).split(",");
+//        vals.value=(rows[i].vals).split(" ");
+//        let data= vals.value.map((str) => Number(str));
+//        convergeDate.value.push(data);
+//        xdata.value.push(rows[i].step);
+//     }
+//     for(let j=0;j<vars.value.length;j++){
+//   let firstColumn=(convergeDate.value.map((row) => row[j]));
+//     let item={
+//       name: vars.value[j],
+//       type: 'line',
+//       stack: 'Total',
+//       areaStyle: {},
+//       emphasis: {
+//         focus: 'series'
+//       },
+//       data:firstColumn
+//     }
+//     series.value.push(item)
+//     }
+//     myChart.setOption({
+//       legend: {
+//             data:vars.value
+//         },
+//       xAxis:{
+//         data:  xdata.value,
+//       },
+//       series: series.value
+//     });
+// }
+ // 数据转化废弃
+ const getsockechart=(data)=>{
   curvedata.value=data;
+  convergeDate.value=[];
   series.value=[];
-  let rows=curvedata.value;
-  for(let i=0;i<rows.length;i++){
-    
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
        vars.value=(rows[i].vars).split(",");
        vals.value=(rows[i].vals).split(" ");
        let data= vals.value.map((str) => Number(str));
        convergeDate.value.push(data);
-       xdata.value.push(rows[i].step);
+       xdata.value.push(num);
     }
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
     for(let j=0;j<vars.value.length;j++){
-  let firstColumn=(convergeDate.value.map((row) => row[j]));
-    let item={
-      name: vars.value[j],
+     let firstColumn=  convergeDate.value.map(row => row[j]);
+    let item= {
+      name:vars.value[j] ,
       type: 'line',
       stack: 'Total',
       areaStyle: {},
@@ -82,7 +124,8 @@ const getsockechart=(data)=>{
       },
       series: series.value
     });
-}
+
+  }
 const setOptionfun=()=>{
     option.value = {
   title: {

src/views/echart/bargraph.vue

@@ -40,37 +40,111 @@ const echatinit = () => {
     xdata.value = [];
 }
 // 从websocket取数据
-const getsockechart = (data) => {;
-    curvedata.value = data;
-    series.value = [];
-    let rows = curvedata.value;
-    for (let i = 0; i < rows.length; i++) {
+// const getsockechart = (data) => {
+//     curvedata.value = data;
+//     series.value = [];
+//     let rows = curvedata.value;
+//     for (let i = 0; i < rows.length; i++) {
+
+//         vars.value = (rows[i].vars).split(",");
+//         vals.value = (rows[i].vals).split(" ");
+//         let data = vals.value.map((str) => Number(str));
+//         convergeDate.value.push(data);
+//         xdata.value.push(rows[i].step);
+//     }
+//     for (let j = 0; j < vars.value.length; j++) {
+//         let firstColumn = (convergeDate.value.map((row) => row[j]));
+//         let item = {
+//               name: vars.value[j],
+//             type: 'bar',
+//             data: firstColumn
+//         }
+//         series.value.push(item)
+//     }
+//     myChart.setOption({
+//         legend: {
+//             data: vars.value
+//         },
+//         xAxis: {
+//             data: xdata.value,
+//         },
+//         series: series.value
+//     });
+// }
+// const getsockechart=(data)=>{
+//   curvedata.value=data;
+//   convergeDate.value=[];
+//   series.value=[];
+//   xdata.value=[];
+//     let rows=JSON.parse(curvedata.value);
+//   let num=0;
+//     for(let i=0;i<rows.length;i++){
+//       num+=1;
+//        vars.value=(rows[i].vars).split(",");
+//        vals.value=(rows[i].vals).split(" ");
+//        let data= vals.value.map((str) => Number(str));
+//        convergeDate.value.push(data);
+//        xdata.value.push(num);
+//     }
+//     console.log(convergeDate.value);
+//    // console.log( convergeDate.value);
+//     for(let j=0;j<vars.value.length;j++){
+//      let firstColumn=  convergeDate.value.map(row => row[j]);
+//            let item = {
+//               name: vars.value[j],
+//             type: 'bar',
+//             data: firstColumn
+//         }
+//     series.value.push(item)
+//     }
+//     myChart.setOption({
+//       legend: {
+//             data:vars.value
+//         },
+//       xAxis:{
+//         data:  xdata.value,
+//       },
+//       series: series.value
+//     });
 
-        vars.value = (rows[i].vars).split(",");
-        vals.value = (rows[i].vals).split(" ");
-        let data = vals.value.map((str) => Number(str));
-        convergeDate.value.push(data);
-        xdata.value.push(rows[i].step);
+//   }
+ const getsockechart=(data)=>{
+  curvedata.value=data;
+  convergeDate.value=[];
+  series.value=[];
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
+       vars.value=(rows[i].vars).split(",");
+       vals.value=(rows[i].vals).split(" ");
+       let data= vals.value.map((str) => Number(str));
+       convergeDate.value.push(data);
+       xdata.value.push(num);
     }
-    for (let j = 0; j < vars.value.length; j++) {
-        let firstColumn = (convergeDate.value.map((row) => row[j]));
-        let item = {
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
+    for(let j=0;j<vars.value.length;j++){
+     let firstColumn=  convergeDate.value.map(row => row[j]);
+     let item = {
               name: vars.value[j],
             type: 'bar',
             data: firstColumn
         }
-        series.value.push(item)
+    series.value.push(item)
     }
     myChart.setOption({
-        legend: {
-            data: vars.value
+      legend: {
+            data:vars.value
         },
-        xAxis: {
-            data: xdata.value,
-        },
-        series: series.value
+      xAxis:{
+        data:  xdata.value,
+      },
+      series: series.value
     });
-}
+
+  }
 const setOptionfun = () => {
     option.value = {
         title: {

src/views/echart/echartLine.vue

@@ -51,40 +51,79 @@
       xdata.value=[];
     }
     // 从websocket取数据
-    const getsockechart=(data)=>{
-      curvedata.value=data;
-      series.value=[];
-      let rows=curvedata.value;
-      for(let i=0;i<rows.length;i++){
+    // const getsockechart=(data)=>{
+    //   curvedata.value=data;
+    //   series.value=[];
+    //   let rows=curvedata.value;
+    //   for(let i=0;i<rows.length;i++){
         
-           vars.value=(rows[i].vars).split(",");
-           vals.value=(rows[i].vals).split(" ");
-           let data= vals.value.map((str) => Number(str));
-           convergeDate.value.push(data);
-           xdata.value.push(rows[i].step);
-        }
-        for(let j=0;j<vars.value.length;j++){
-      let firstColumn=(convergeDate.value.map((row) => row[j]));
-             let item= {
-          name:vars.value[j] ,
-          type: 'line',
-          stack: 'Total',
-          data: firstColumn
-        }
-        series.value.push(item)
-        }
-        myChart.setOption({
-          legend: {
-                data:vars.value
-            },
-          xAxis:{
-            data:  xdata.value,
-          },
-          series: series.value
-        });
+    //        vars.value=(rows[i].vars).split(",");
+    //        vals.value=(rows[i].vals).split(" ");
+    //        let data= vals.value.map((str) => Number(str));
+    //        convergeDate.value.push(data);
+    //        xdata.value.push(rows[i].step);
+    //     }
+    //     for(let j=0;j<vars.value.length;j++){
+    //   let firstColumn=(convergeDate.value.map((row) => row[j]));
+    //          let item= {
+    //       name:vars.value[j] ,
+    //       type: 'line',
+    //       stack: 'Total',
+    //       data: firstColumn
+    //     }
+    //     series.value.push(item)
+    //     }
+    //     myChart.setOption({
+    //       legend: {
+    //             data:vars.value
+    //         },
+    //       xAxis:{
+    //         data:  xdata.value,
+    //       },
+    //       series: series.value
+    //     });
 
      
-    } 
+    // } 
+    
+    const getsockechart=(data)=>{
+  curvedata.value=data;
+  convergeDate.value=[];
+  series.value=[];
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
+       vars.value=(rows[i].vars).split(",");
+       vals.value=(rows[i].vals).split(" ");
+       let data= vals.value.map((str) => Number(str));
+       convergeDate.value.push(data);
+       xdata.value.push(num);
+    }
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
+    for(let j=0;j<vars.value.length;j++){
+     let firstColumn=  convergeDate.value.map(row => row[j]);
+            let item= {
+      name:vars.value[j] ,
+      type: 'line',
+      stack: 'Total',
+      data: firstColumn
+    }
+    series.value.push(item)
+    }
+    myChart.setOption({
+      legend: {
+            data:vars.value
+        },
+      xAxis:{
+        data:  xdata.value,
+      },
+      series: series.value
+    });
+
+  }
       const linechart= ()=>{
     option.value = {
       title: {

src/views/echart/pie.vue

@@ -40,38 +40,76 @@ const echatinit = () => {
     xdata.value = [];
 }
 // 从websocket取数据
-const getsockechart = (data) => {
-    console.log(data);
-    curvedata.value = data;
-    series.value = [];
-    let rows = curvedata.value;
-    for (let i = 0; i < rows.length; i++) {
+// const getsockechart = (data) => {
+//     console.log(data);
+//     curvedata.value = data;
+//     series.value = [];
+//     let rows = curvedata.value;
+//     for (let i = 0; i < rows.length; i++) {
 
-        vars.value = (rows[i].vars).split(",");
-        vals.value = (rows[i].vals).split(" ");
-        let data = vals.value.map((str) => Number(str));
-        convergeDate.value.push(data);
-        xdata.value.push(rows[i].step);
+//         vars.value = (rows[i].vars).split(",");
+//         vals.value = (rows[i].vals).split(" ");
+//         let data = vals.value.map((str) => Number(str));
+//         convergeDate.value.push(data);
+//         xdata.value.push(rows[i].step);
+//     }
+//     for (let j = 0; j < vars.value.length; j++) {
+//         let firstColumn = (convergeDate.value.map((row) => row[j]));
+//         let item = {
+//               name: vars.value[j],
+//             type: 'bar',
+//             data: firstColumn
+//         }
+//         series.value.push(item)
+//     }
+//     myChart.setOption({
+//         legend: {
+//             data: vars.value
+//         },
+//         xAxis: {
+//             data: xdata.value,
+//         },
+//         series: series.value
+//     });
+// }
+ // 数据 从接口处取
+ const getsockechart=(data)=>{
+  curvedata.value=data;
+  convergeDate.value=[];
+  series.value=[];
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
+       vars.value=(rows[i].vars).split(",");
+       vals.value=(rows[i].vals).split(" ");
+       let data= vals.value.map((str) => Number(str));
+       convergeDate.value.push(data);
+       xdata.value.push(num);
     }
-    for (let j = 0; j < vars.value.length; j++) {
-        let firstColumn = (convergeDate.value.map((row) => row[j]));
-        let item = {
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
+    for(let j=0;j<vars.value.length;j++){
+     let firstColumn=  convergeDate.value.map(row => row[j]);
+           let item = {
               name: vars.value[j],
             type: 'bar',
             data: firstColumn
         }
-        series.value.push(item)
+    series.value.push(item)
     }
     myChart.setOption({
-        legend: {
-            data: vars.value
-        },
-        xAxis: {
-            data: xdata.value,
+      legend: {
+            data:vars.value
         },
-        series: series.value
+      xAxis:{
+        data:  xdata.value,
+      },
+      series: series.value
     });
-}
+
+  }
 const setOptionfun = () => {
     option.value = {
         title: {

src/views/echart/radar.vue

@@ -45,25 +45,78 @@ const echatinit = () => {
     datain.value=[];
 }
 // 从websocket取数据
-const getsockechart = (data) => {
-    curvedata.value = data;
-    series.value = [];
-   datain.value=[];
-   maxarr.value=[];
-    let rows = curvedata.value;
-    for (let i = 0; i < rows.length; i++) {
+// const getsockechart = (data) => {
+//     curvedata.value = data;
+//     series.value = [];
+//    datain.value=[];
+//    maxarr.value=[];
+//     let rows = curvedata.value;
+//     for (let i = 0; i < rows.length; i++) {
 
-        vars.value = (rows[i].vars).split(",");
-        vals.value = (rows[i].vals).split(" ");
-        let data = vals.value.map((str) => Number(str));
-        convergeDate.value.push(vals.value);
-        xdata.value.push(rows[i].step);
+//         vars.value = (rows[i].vars).split(",");
+//         vals.value = (rows[i].vals).split(" ");
+//         let data = vals.value.map((str) => Number(str));
+//         convergeDate.value.push(vals.value);
+//         xdata.value.push(rows[i].step);
 
+//     }
+//     for (let j = 0; j < vars.value.length; j++) {
+//         let firstColumn = (convergeDate.value.map((row) => row[j]));
+//         let item={
+//             name:  vars.value[j],
+//             type: 'radar',
+//             areaStyle: {},
+//             data: [
+//                 {
+//                 value:firstColumn,
+//                 name:vars.value[j]
+//                 },
+//     ]
+ 
+//             }
+//         series.value.push(item)
+//     }
+        
+//    // console.log( maxarr.value);
+   
+//     for (let k = 0; k < xdata.value.length; k++) { 
+//         let indicatorobj={
+//         name:k, max:max1,
+//     }
+//      datain.value.push(indicatorobj);
+//     }
+//     myChart.setOption({
+//         legend: {
+//             left: 'center',
+//             data: vars.value
+//         },
+//         radar: {
+//         indicator: datain.value
+//     },
+//         series: series.value
+//     });
+// }
+// 数据 从接口处取
+const getsockechart=(data)=>{
+  curvedata.value=data;
+  convergeDate.value=[];
+  series.value=[];
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
+       vars.value=(rows[i].vars).split(",");
+       vals.value=(rows[i].vals).split(" ");
+       let data= vals.value.map((str) => Number(str));
+       convergeDate.value.push(data);
+       xdata.value.push(num);
     }
-   // console.log(xdata.value);
-    for (let j = 0; j < vars.value.length; j++) {
-        let firstColumn = (convergeDate.value.map((row) => row[j]));
-        let item={
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
+    for(let j=0;j<vars.value.length;j++){
+     let firstColumn=  convergeDate.value.map(row => row[j]);
+           let item={
             name:  vars.value[j],
             type: 'radar',
             areaStyle: {},
@@ -75,21 +128,14 @@ const getsockechart = (data) => {
     ]
  
             }
-          //  maxarr.value.push(firstColumn);
-            //max1= Math.max(firstColumn[0])
-        series.value.push(item)
+    series.value.push(item)
     }
-        
-   // console.log( maxarr.value);
-   
-    for (let k = 0; k < xdata.value.length; k++) { 
+        for (let k = 0; k < xdata.value.length; k++) { 
         let indicatorobj={
         name:k, max:max1,
     }
      datain.value.push(indicatorobj);
     }
-    // console.log(vars.value);
-    // console.log(series.value);
     myChart.setOption({
         legend: {
             left: 'center',
@@ -100,7 +146,8 @@ const getsockechart = (data) => {
     },
         series: series.value
     });
-}
+
+  }
 const setOptionfun = () => {
     option.value = {
   title: {

src/views/echart/scatter.vue

@@ -42,30 +42,70 @@ onMounted(() => {
   xdata.value=[];
 }
 //数据组装
+// const getsockechart=(data)=>{
+//   curvedata.value=data;
+//   series.value=[];
+//   let rows=curvedata.value;
+//   for(let i=0;i<rows.length;i++){
+//        vars.value=(rows[i].vars).split(",");
+//        vals.value=(rows[i].vals).split(" ");
+//        let data= vals.value.map((str) => Number(str));
+//        convergeDate.value.push(data);
+//        xdata.value.push(Number(rows[i].step));
+//     }
+//     //console.log(convergeDate.value)
+//     //console.log( xdata.value)
+//     for(let j=0;j<vars.value.length;j++){
+//      let firstColumn=(convergeDate.value.map((row) => row[j]));
+//      const zippedArray = xdata.value.map((x, index) => [x, firstColumn[index]]);
+//     let item={
+//             name:vars.value[j],
+//             type: 'scatter',
+//             data:zippedArray,
+//             itemStyle: {}
+         
+//     }
+//    series.value.push(item)
+//     }
+//     myChart.setOption({
+//       legend: {
+//             data:vars.value
+//         },
+//       xAxis:{
+//         data:  xdata.value,
+//       },
+//       series: series.value
+//     });
+// }
+// 数据 从接口处取
 const getsockechart=(data)=>{
   curvedata.value=data;
+  convergeDate.value=[];
   series.value=[];
-  let rows=curvedata.value;
-  for(let i=0;i<rows.length;i++){
+  xdata.value=[];
+    let rows=JSON.parse(curvedata.value);
+  let num=0;
+    for(let i=0;i<rows.length;i++){
+      num+=1;
        vars.value=(rows[i].vars).split(",");
        vals.value=(rows[i].vals).split(" ");
        let data= vals.value.map((str) => Number(str));
        convergeDate.value.push(data);
-       xdata.value.push(Number(rows[i].step));
+       xdata.value.push(num);
     }
-    //console.log(convergeDate.value)
-    //console.log( xdata.value)
+    console.log(convergeDate.value);
+   // console.log( convergeDate.value);
     for(let j=0;j<vars.value.length;j++){
-     let firstColumn=(convergeDate.value.map((row) => row[j]));
+     let firstColumn=  convergeDate.value.map(row => row[j]);
      const zippedArray = xdata.value.map((x, index) => [x, firstColumn[index]]);
-    let item={
+         let item={
             name:vars.value[j],
             type: 'scatter',
             data:zippedArray,
             itemStyle: {}
          
     }
-   series.value.push(item)
+    series.value.push(item)
     }
     myChart.setOption({
       legend: {
@@ -76,7 +116,8 @@ const getsockechart=(data)=>{
       },
       series: series.value
     });
-}
+
+  }
 const setOptionfunc =async () => {
    
  option.value = {

src/views/home.vue

@@ -874,6 +874,37 @@
               </div>
             </template>
           </el-dialog>
+          <!-- 查看报告 -->
+          <el-dialog v-model="dialog.lookover" align-center :modal="false" :close-on-click-modal="false"
+            :append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
+            :before-close="handleClose" width="500" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
+
+            <template #header="{ titleId, titleClass }">
+              <div class="my-header ">
+                <el-image :src="getImgPath('k8.png')" fit="contain"></el-image>
+                <h4 :id="titleId" :class="titleClass">查看报告：</h4>
+              </div>
+            </template>
+            <div class="numberinput lefttext">
+              <el-form>
+                <!-- <el-input
+                  v-model="looktext"
+                  style="width: 460px"
+                  :rows="2"
+                  type="textarea"
+                /> -->
+                <el-image :src="getImgPath('baog.png')" fit="contain"></el-image>
+              </el-form>
+            </div>
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="dialog.lookover = false">取消</el-button>
+                <el-button type="primary" @click="dialog.lookover = false">
+                  确定
+                </el-button>
+              </div>
+            </template>
+          </el-dialog>
           <!-- 内容区 -->
           <div class="main  mianflex">
             <!--left菜单栏  -->
@@ -976,11 +1007,6 @@
                                   <el-input v-model="row.name" @change="handleEdit(row)" />
                                 </template>
                               </el-table-column>
-                              <!-- <el-table-column prop="date" label="变量类型">
-                    <template #default="{ row }">
-                    <el-input v-model="row.date" @change="handleEdit(row)" />
-                  </template>
-                </el-table-column> -->
                               <el-table-column prop="upper" label="上限值">
                                 <template #default="{ row }">
                                   <el-input type="text" v-model="row.upper" oninput="value=value.replace(/^|[^0-9]/g,'')"
@@ -993,11 +1019,6 @@
                                     @change="handleEdit(row)" />
                                 </template>
                               </el-table-column>
-                              <!-- <el-table-column prop="q" label="权重系数">
-                    <template #default="{ row }">
-                    <el-input v-model="row.q" @change="handleEdit(row)" />
-                  </template>
-                </el-table-column> -->
                               <el-table-column prop="reference" label="基准值" width="100">
                                 <template #default="{ row }">
                                   <el-input v-model.Number="row.reference" oninput="value=value.replace(/^|[^0-9]/g,'')"
@@ -1021,19 +1042,6 @@
                           <div class="elconstraint classtable" v-if="activeIndex2 == 1">
                             <el-table :data="tableData" stripe style="width: 100%" height="100">
                               <el-table-column type="index" label="编号" width="100" />
-                              <!-- <el-table-column prop="data" label="约束类型" >
-                  <template v-slot="scope">
-                    <el-select v-model="scope.row.device"  class="no-border " :suffix-icon="CaretBottom"  placeholder="请选择">
-                          <el-option
-                            v-for="item in options2"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                          </el-option>
-                        </el-select>
-
-                  </template>
-                </el-table-column> -->
                               <el-table-column prop="name" label="约束名称">
                                 <template #default="{ row }">
                                   <el-input v-model="row.name" @change="handleEdit(row)" />
@@ -1340,6 +1348,7 @@ const defaultProps = {
 let svarlist = ref('');
 let conlist = ref('');
 let funlist = ref('');
+let looktext=ref('');
 
 // treeData.value.forEach((item) => {
 //   defaultExpandedArr.value.push(item.id);
@@ -1485,6 +1494,7 @@ let dialog = ref({
   agency: false,
   optimizer: false,
   jboptimizer: false,
+  lookover:false,
   Xfiol: false,
   enddialog: false,
   addfun: false,
@@ -1540,22 +1550,22 @@ const eloptimize = ref([])
 let tableData = ref([])
 const designtable = ref([])
 const tasktable = ref([
-  {
-    id: "01",
-    time: '2016-05-03',
-    name: '升阻比',
-    state: '增大',
+  // {
+  //   id: "01",
+  //   time: '2016-05-03',
+  //   name: '升阻比',
+  //   state: '增大',
 
 
-  },
-  {
-    id: "02",
-    time: '2016-05-03',
-    name: '升阻比',
-    state: '增大',
+  // },
+  // {
+  //   id: "02",
+  //   time: '2016-05-03',
+  //   name: '升阻比',
+  //   state: '增大',
 
 
-  },
+  // },
 ])
 const customColors = [
   { color: '#f56c6c', percentage: 20 },
@@ -1621,6 +1631,7 @@ const handleClick = (tab, event) => {
   dialogcolse()
   if (tabactive.value == 'Config') {
     echartzongshow.value = true;
+    curveLine();
   } else {
     echartzongshow.value = false;
   }
@@ -1667,6 +1678,7 @@ const optimizerfalse = (val) => {
     dialog.value.optimizer = false;
     dialog.value.jboptimizer = false;
     dialog.value.Xfiol = false;
+    dialog.value.lookover = false;
   }
 
 }
@@ -1728,8 +1740,6 @@ const dialogbolen = () => {
       case "模块组合":
       vuefval.value.bgcolorfunc(colortier.value);
       vuefval.value.onSelection();
-   
-
       break;
     case "开始":
       optmonitor1.value.echatinit();
@@ -1761,6 +1771,10 @@ const dialogbolen = () => {
       //logsget();
       echatsfunc();
       break;
+      case "查看报告":
+      echatsfunc();
+      dialog.value.lookover = true;
+      break;
     default:
   }
 }
@@ -1835,6 +1849,13 @@ const echatsfunc = () => {
       scattershow.value = false;
       break
     default:
+    areashow.value = false;
+      bargraphshow.value = false;
+      echartLineshow.value = false;
+      BarChartshow.value = false;
+      radarshow.value = false;
+      scattershow.value = false;
+      break
 
   }
 
@@ -1890,7 +1911,12 @@ const curveLine = () => {
       // console.log(curvedata.value);
       // optmonitor1.value.getshuju(curvedata.value);
       //  optmonitor1.value.getsockechart();
-
+      arearef.value.getsockechart(curvedata.value);
+      bargraphref.value.getsockechart(curvedata.value);
+      echartLineref.value.getsockechart(curvedata.value);
+      BarChartref.value.getsockechart(curvedata.value);
+       radarref.value.getsockechart(curvedata.value);
+       scatterref.value.getsockechart(curvedata.value);
 
       // optmonitor1.value.getecharts();
 
@@ -2542,12 +2568,12 @@ const logsget = () => {
         let echarr = [];
         echarr.push(results[i])
         optmonitor1.value.getsockechart(echarr);
-        arearef.value.getsockechart(echarr);
-        bargraphref.value.getsockechart(echarr);
-        echartLineref.value.getsockechart(echarr);
-        BarChartref.value.getsockechart(echarr);
-        radarref.value.getsockechart(echarr);
-        scatterref.value.getsockechart(echarr);
+        // arearef.value.getsockechart(echarr);
+        // bargraphref.value.getsockechart(echarr);
+        // echartLineref.value.getsockechart(echarr);
+        // BarChartref.value.getsockechart(echarr);
+        // radarref.value.getsockechart(echarr);
+        // scatterref.value.getsockechart(echarr);
       }
     })
     .catch((err) => {
@@ -2614,6 +2640,12 @@ const websocketonmessage = (res) => {
     let vals = (JSON.parse(res.data).vals).split(" ");
     tablefun(vals);
     optmonitor1.value.getsockechart(arrobj.value);
+        arearef.value.getsockechart(arrobj.value);
+        bargraphref.value.getsockechart(arrobj.value);
+        echartLineref.value.getsockechart(arrobj.value);
+        BarChartref.value.getsockechart(arrobj.value);
+        radarref.value.getsockechart(arrobj.value);
+        scatterref.value.getsockechart(arrobj.value);
   } else {
     if (res.data.indexOf('——成功') !== -1) {
 

src/views/home/newfile.vue

@@ -12,13 +12,12 @@
       </el-collapse-item>
       <el-collapse-item title="工程模板" name="2">
         <div class="collapse-list">
-         
-            <div class="list"  v-for="(item, index) in collapselist" :key="index"  @click="clickimg(item,'2',index)" >
-              <!-- <router-link :to="{ path: '/home', query: { id: index } }"> -->
+         <div v-for="(item, index) in collapselist" :key="index"  @click="clickimg(item,'2',index)">
+            <div class="list"   >
                 <el-image :src="item.image" fit="contain"  ></el-image>  
-                   <!-- </router-link> -->
             </div>
-   
+            <p style="text-align: center;">{{item.name}}</p>
+          </div>
         </div>
       </el-collapse-item>
     </el-collapse>