|  | @@ -1028,25 +1028,6 @@
 | 
	
		
			
				|  |  |                  <div  class="maxh221">
 | 
	
		
			
				|  |  |               <!-- 中间部分 -->
 | 
	
		
			
				|  |  |               <div  class="conter_mian classtable " v-show="jiankong">
 | 
	
		
			
				|  |  | -               <!-- <el-table :data="tableDatalieb" border  style="display: flex; flex: 1; overflow: auto;"  max-height="600">
 | 
	
		
			
				|  |  | -                <el-table-column  type="index" width="30" />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x1" label="x1"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x2" label="x2"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x3" label="x3" />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x4" label="x4"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x5" label="x5"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x6" label="x6" />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x7" label="x7"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x8" label="x8"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x9" label="x9" />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x10" label="x10"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x11" label="x11"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x12" label="x12" />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x13" label="x13"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x14" label="x14"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="x15" label="x15"  />
 | 
	
		
			
				|  |  | -                <el-table-column prop="cd" label="cd/cl"  />
 | 
	
		
			
				|  |  | -                </el-table>  -->
 | 
	
		
			
				|  |  |                  <el-table :data="tableDatalieb" border  style="display: flex; flex: 1; overflow: auto;" height="500">
 | 
	
		
			
				|  |  |                    <el-table-column type="index"  width="50"></el-table-column>
 | 
	
		
			
				|  |  |                    <el-table-column
 | 
	
	
		
			
				|  | @@ -1056,7 +1037,6 @@
 | 
	
		
			
				|  |  |                      :label="header.label">
 | 
	
		
			
				|  |  |                    </el-table-column>
 | 
	
		
			
				|  |  |                  </el-table>
 | 
	
		
			
				|  |  | -                <!-- <div @click="tablefun()">点击</div> -->
 | 
	
		
			
				|  |  |               </div>
 | 
	
		
			
				|  |  |               <!--   曲线监控 -->
 | 
	
		
			
				|  |  |               <div  class="conter_mian classtable "  v-show="echartshow">
 | 
	
	
		
			
				|  | @@ -1073,6 +1053,15 @@
 | 
	
		
			
				|  |  |                <!-- <div class="echart_left  ech">left</div>
 | 
	
		
			
				|  |  |                <div class="echart_right ech">right</div> -->
 | 
	
		
			
				|  |  |              </div>
 | 
	
		
			
				|  |  | +            <!-- 可视化开始 -->
 | 
	
		
			
				|  |  | +            <div  class="conter_mian classtable" v-show="echartzongshow">
 | 
	
		
			
				|  |  | +            <echartarea ref="arearef" v-show="areashow"/>
 | 
	
		
			
				|  |  | +            <bargraph ref="bargraphref" v-show="bargraphshow"/>
 | 
	
		
			
				|  |  | +            <echartLine ref="echartLineref" v-show="echartLineshow"/>
 | 
	
		
			
				|  |  | +            <BarChart ref="BarChartref" v-show="BarChartshow"/>
 | 
	
		
			
				|  |  | +            <radar ref="radarref" v-show="radarshow"/>
 | 
	
		
			
				|  |  | +          </div>
 | 
	
		
			
				|  |  | +            <!-- 可视化结束 -->
 | 
	
		
			
				|  |  |                  <!-- 右侧边栏开始 -->
 | 
	
		
			
				|  |  |                  <!-- 结束 -->
 | 
	
		
			
				|  |  |                </div>
 | 
	
	
		
			
				|  | @@ -1349,9 +1338,25 @@
 | 
	
		
			
				|  |  |    import sixchine from './demo/chine.vue'
 | 
	
		
			
				|  |  |    import vuefindex from './vuetree/index.vue'
 | 
	
		
			
				|  |  |    import Sidebar from './vuetree/Sidebar.vue'
 | 
	
		
			
				|  |  | +  // 可视化echart
 | 
	
		
			
				|  |  | +  import echartarea from './echart/area.vue'
 | 
	
		
			
				|  |  | +  import bargraph from './echart/bargraph.vue'
 | 
	
		
			
				|  |  | +  import echartLine from './echart/echartLine.vue'
 | 
	
		
			
				|  |  | +  import BarChart from './echart/BarChart.vue'
 | 
	
		
			
				|  |  | +  import radar from './echart/radar.vue'
 | 
	
		
			
				|  |  |    let flowshow=ref(true);
 | 
	
		
			
				|  |  |    let jiankong=ref(false);
 | 
	
		
			
				|  |  |    let echartshow=ref(false);
 | 
	
		
			
				|  |  | +  let areashow=ref(false);
 | 
	
		
			
				|  |  | +  let echartLineshow=ref(false);
 | 
	
		
			
				|  |  | +  let BarChartshow=ref(false);
 | 
	
		
			
				|  |  | +  let bargraphshow=ref(false);
 | 
	
		
			
				|  |  | +  let  radarshow=ref(false);
 | 
	
		
			
				|  |  | +  let bargraphref=ref();
 | 
	
		
			
				|  |  | +  let echartLineref=ref();
 | 
	
		
			
				|  |  | +  let BarChartref=ref();
 | 
	
		
			
				|  |  | +  let  radarref=ref();
 | 
	
		
			
				|  |  | +  let echartzongshow=ref(false);
 | 
	
		
			
				|  |  |    const router = useRouter();
 | 
	
		
			
				|  |  |    const route = useRoute();
 | 
	
		
			
				|  |  |    let youhua=ref({
 | 
	
	
		
			
				|  | @@ -1368,6 +1373,7 @@
 | 
	
		
			
				|  |  |    })
 | 
	
		
			
				|  |  |    let echartdata=ref(null);
 | 
	
		
			
				|  |  |    let optmonitor1=ref();
 | 
	
		
			
				|  |  | +  let  arearef=ref();
 | 
	
		
			
				|  |  |    let tableHeaders=ref([
 | 
	
		
			
				|  |  |          // { label: '日期', prop: 'date' },
 | 
	
		
			
				|  |  |          // { label: '姓名', prop: 'name' },
 | 
	
	
		
			
				|  | @@ -1401,7 +1407,7 @@
 | 
	
		
			
				|  |  |    let zhixing=ref('Rosenbrock');
 | 
	
		
			
				|  |  |    let tabName=ref("one")
 | 
	
		
			
				|  |  |    const tabs = ['信息栏', '优化问题'];
 | 
	
		
			
				|  |  | -  const listli = ['设计变量', '约束条件', '目标函数'];
 | 
	
		
			
				|  |  | +  const listli = ['设计变量', '约束条件', '优化目标'];
 | 
	
		
			
				|  |  |    const xfoil = ['输入', '执行', '输出'];
 | 
	
		
			
				|  |  |    let srtable=ref([]);
 | 
	
		
			
				|  |  |    let sctable=ref([]);
 | 
	
	
		
			
				|  | @@ -1763,8 +1769,7 @@ console.log(route.query.pid);
 | 
	
		
			
				|  |  |      tabactive.value=tab.props.name;
 | 
	
		
			
				|  |  |      if(tabactive.value=='User'){
 | 
	
		
			
				|  |  |          router.replace({ path: '/' })
 | 
	
		
			
				|  |  | -    }else if(tabactive.value=='Three'){
 | 
	
		
			
				|  |  | -      // logsget();
 | 
	
		
			
				|  |  | +    }else {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |      if(tabactive.value=='Role'){
 | 
	
	
		
			
				|  | @@ -1777,6 +1782,11 @@ console.log(route.query.pid);
 | 
	
		
			
				|  |  |      ifjiankong();
 | 
	
		
			
				|  |  |     
 | 
	
		
			
				|  |  |      dialogcolse()
 | 
	
		
			
				|  |  | +    if(tabactive.value=='Config'){
 | 
	
		
			
				|  |  | +      echartzongshow.value=true;
 | 
	
		
			
				|  |  | +    }else{
 | 
	
		
			
				|  |  | +      echartzongshow.value=false;
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |    //表格点击事件
 | 
	
		
			
				|  |  |    const handleEdit = (row) => {
 | 
	
	
		
			
				|  | @@ -1889,12 +1899,91 @@ console.log(route.query.pid);
 | 
	
		
			
				|  |  |          case "曲线监控":
 | 
	
		
			
				|  |  |          ifjiankong()
 | 
	
		
			
				|  |  |          curveLine();
 | 
	
		
			
				|  |  | -      
 | 
	
		
			
				|  |  | +        case "面积图":
 | 
	
		
			
				|  |  | +        echatsfunc();
 | 
	
		
			
				|  |  | +       break;
 | 
	
		
			
				|  |  | +       case "柱状图":
 | 
	
		
			
				|  |  | +        echatsfunc();
 | 
	
		
			
				|  |  | +       break;
 | 
	
		
			
				|  |  | +       case "折线图":
 | 
	
		
			
				|  |  | +        echatsfunc();
 | 
	
		
			
				|  |  | +       break;
 | 
	
		
			
				|  |  | +       case "散点图":
 | 
	
		
			
				|  |  | +        //echatsfunc();
 | 
	
		
			
				|  |  | +       break;
 | 
	
		
			
				|  |  | +       case "横条图":
 | 
	
		
			
				|  |  | +        echatsfunc();
 | 
	
		
			
				|  |  | +       break;
 | 
	
		
			
				|  |  | +       case "雷达图":
 | 
	
		
			
				|  |  | +        //logsget();
 | 
	
		
			
				|  |  | +        echatsfunc();
 | 
	
		
			
				|  |  | +       break;
 | 
	
		
			
				|  |  |        default: 
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | +   
 | 
	
		
			
				|  |  | +  //  可视化清空
 | 
	
		
			
				|  |  | +  const echartclear=()=>{
 | 
	
		
			
				|  |  | +    arearef.value.echatinit();
 | 
	
		
			
				|  |  | +    bargraphref.value.echatinit();
 | 
	
		
			
				|  |  | +    echartLineref.value.echatinit();
 | 
	
		
			
				|  |  | +    BarChartref.value.echatinit();
 | 
	
		
			
				|  |  | +    radarref.value.echatinit();
 | 
	
		
			
				|  |  | +  }
 | 
	
		
			
				|  |  | +  const echatsfunc=()=>{
 | 
	
		
			
				|  |  | +      //echartzongshow.value=true;
 | 
	
		
			
				|  |  | +      echartclear();
 | 
	
		
			
				|  |  | +      switch (tabactive.value){
 | 
	
		
			
				|  |  | +      case "面积图":
 | 
	
		
			
				|  |  | +      areashow.value=true;
 | 
	
		
			
				|  |  | +      bargraphshow.value=false;
 | 
	
		
			
				|  |  | +      echartLineshow.value=false;
 | 
	
		
			
				|  |  | +     BarChartshow.value=false;
 | 
	
		
			
				|  |  | +     radarshow.value=false;
 | 
	
		
			
				|  |  | +     break;
 | 
	
		
			
				|  |  | +     case "柱状图":
 | 
	
		
			
				|  |  | +     areashow.value=false;
 | 
	
		
			
				|  |  | +     bargraphshow.value=true;
 | 
	
		
			
				|  |  | +     echartLineshow.value=false;
 | 
	
		
			
				|  |  | +     BarChartshow.value=false;
 | 
	
		
			
				|  |  | +     radarshow.value=false;
 | 
	
		
			
				|  |  | +     break;
 | 
	
		
			
				|  |  | +     case "饼状图":
 | 
	
		
			
				|  |  | +     areashow.value=false;
 | 
	
		
			
				|  |  | +     bargraphshow.value=false;
 | 
	
		
			
				|  |  | +     echartLineshow.value=false;
 | 
	
		
			
				|  |  | +     BarChartshow.value=false;
 | 
	
		
			
				|  |  | +     radarshow.value=false;
 | 
	
		
			
				|  |  | +     break;
 | 
	
		
			
				|  |  | +     case "折线图":
 | 
	
		
			
				|  |  | +     areashow.value=false;
 | 
	
		
			
				|  |  | +     bargraphshow.value=false;
 | 
	
		
			
				|  |  | +     echartLineshow.value=true;
 | 
	
		
			
				|  |  | +     BarChartshow.value=false;
 | 
	
		
			
				|  |  | +     radarshow.value=false;
 | 
	
		
			
				|  |  | +     break;
 | 
	
		
			
				|  |  | +     case "横条图":
 | 
	
		
			
				|  |  | +     areashow.value=false;
 | 
	
		
			
				|  |  | +     bargraphshow.value=false;
 | 
	
		
			
				|  |  | +     echartLineshow.value=false;
 | 
	
		
			
				|  |  | +     BarChartshow.value=true;
 | 
	
		
			
				|  |  | +     radarshow.value=false;
 | 
	
		
			
				|  |  | +     break
 | 
	
		
			
				|  |  | +     case "雷达图":
 | 
	
		
			
				|  |  | +     areashow.value=false;
 | 
	
		
			
				|  |  | +     bargraphshow.value=false;
 | 
	
		
			
				|  |  | +     echartLineshow.value=false;
 | 
	
		
			
				|  |  | +     BarChartshow.value=false;
 | 
	
		
			
				|  |  | +     radarshow.value=true;
 | 
	
		
			
				|  |  | +     break
 | 
	
		
			
				|  |  | +     default:
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  
 | 
	
		
			
				|  |  | +  }
 | 
	
		
			
				|  |  | +  // 可视化结束
 | 
	
		
			
				|  |  |    //  ||activeName.value=='Three'&&tabactive.value=='开始'
 | 
	
		
			
				|  |  | -  const ifjiankong=()=>{;
 | 
	
		
			
				|  |  | +  const ifjiankong=()=>{
 | 
	
		
			
				|  |  |      if(activeName.value=='Three'&&tabactive.value=='列表监控'||activeName.value=='Three'&&tabactive.value=='开始'){
 | 
	
		
			
				|  |  |        jiankong.value=true;
 | 
	
		
			
				|  |  |      
 | 
	
	
		
			
				|  | @@ -2478,6 +2567,7 @@ function tablefun(vals){
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  //获取日志
 | 
	
		
			
				|  |  |  const logsget= ()=>{
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      const params = {
 | 
	
		
			
				|  |  |          transCode: 'MDO0025',
 | 
	
		
			
				|  |  |          pid:pid.value,
 | 
	
	
		
			
				|  | @@ -2493,7 +2583,11 @@ 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);
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  |          .catch((err) => {
 | 
	
	
		
			
				|  | @@ -2521,7 +2615,7 @@ function initWebSocket() {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        //初始化weosocket
 | 
	
		
			
				|  |  |        // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid; ws://192.168.0.131/diswebsocket?projectId=5
 | 
	
		
			
				|  |  | -       const wsurl = "ws://192.168.106:8188//websocket?projectId="+pid.value;
 | 
	
		
			
				|  |  | +       const wsurl = "ws://192.168.104:8188//websocket?projectId="+pid.value;
 | 
	
		
			
				|  |  |        // const wsurl =
 | 
	
		
			
				|  |  |        //   "ws://" +
 | 
	
		
			
				|  |  |        //   process.env.VUE_APP_BASE_websokt +
 |