Inicio Explorar Axuda
Rexistro Iniciar sesión
user_zyx
/
B20_UV_LogPC
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

完成axisData图表调整

user_zyx hai 11 meses
pai
3b52e18905
achega
0677434a57
Modificáronse 29 ficheiros con 531 adicións e 31 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 13 1
      B20UVLog/B20UVLog.csproj
  2. 1 5
      B20UVLog/Charts/CSS/Main.css
  3. 25 19
      B20UVLog/Charts/Htmls/AxisData.html
  4. 118 0
      B20UVLog/Charts/Htmls/AxisData1.html
  5. 110 0
      B20UVLog/Charts/Htmls/AxisData2.html
  6. 109 0
      B20UVLog/Charts/Htmls/AxisData3.html
  7. 100 0
      B20UVLog/Charts/Htmls/AxisData4.html
  8. BIN=BIN
      B20UVLog/LogPcTask_Biz.cs
  9. 38 6
      B20UVLog/Pages/AxisData.xaml
  10. BIN=BIN
      B20UVLog/Pages/AxisData.xaml.cs
  11. BIN=BIN
      B20UVLog/ViewModels/ANALogDataViewModel.cs
  12. BIN=BIN
      B20UVLog/ViewModels/AlarmViewModel.cs
  13. BIN=BIN
      B20UVLog/ViewModels/AxisDataViewModel.cs
  14. BIN=BIN
      B20UVLog/ViewModels/EQPStatusViewModel.cs
  15. BIN=BIN
      B20UVLog/ViewModels/GlassInformationViewModel.cs
  16. BIN=BIN
      B20UVLog/ViewModels/IOViewModel.cs
  17. BIN=BIN
      B20UVLog/ViewModels/LampDataViewModel.cs
  18. BIN=BIN
      B20UVLog/ViewModels/LampUseTimeViewModel.cs
  19. BIN=BIN
      B20UVLog/ViewModels/PLCSetViewModel.cs
  20. BIN=BIN
      B20UVLog/ViewModels/RecipeBodyViewModel.cs
  21. BIN=BIN
      B20UVLog/ViewModels/RecipeCountViewModel.cs
  22. BIN=BIN
      B20UVLog/ViewModels/RobotInterfaceInViewModel.cs
  23. BIN=BIN
      B20UVLog/ViewModels/RobotInterfaceOutViewModel.cs
  24. BIN=BIN
      B20UVLog/ViewModels/ServoAxisStatusViewModel.cs
  25. BIN=BIN
      B20UVLog/ViewModels/SysParaViewModel.cs
  26. BIN=BIN
      B20UVLog/ViewModels/YMeasureDataViewModel.cs
  27. 17 0
      B20UVLog/Windows/Chart.xaml
  28. BIN=BIN
      B20UVLog/Windows/Chart.xaml.cs
  29. BIN=BIN
      dll/MyWPFControl.dll

+ 13 - 1
B20UVLog/B20UVLog.csproj
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 
   <PropertyGroup>
 
     <OutputType>WinExe</OutputType>
 
-    <TargetFramework>net8.0-windows</TargetFramework>
 
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
 
     <Nullable>enable</Nullable>
 
     <ImplicitUsings>enable</ImplicitUsings>
 
     <UseWPF>true</UseWPF>
 
@@ -37,6 +37,18 @@
 
     <None Update="Charts\Htmls\AxisData.html">
 
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
     </None>
 
+    <None Update="Charts\Htmls\AxisData1.html">
 
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
+    </None>
 
+    <None Update="Charts\Htmls\AxisData2.html">
 
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
+    </None>
 
+    <None Update="Charts\Htmls\AxisData3.html">
 
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
+    </None>
 
+    <None Update="Charts\Htmls\AxisData4.html">
 
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
+    </None>
 
     <None Update="Charts\JS\echarts.min.js">
 
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 
     </None>

+ 1 - 5
B20UVLog/Charts/CSS/Main.css
Ver ficheiro 

@@ -23,13 +23,9 @@ input{
 
 }
 
 .echartsDiv{
 
 	width: 100%;
 
-	height: 230px;
 
+	height: 400px;
 
 	/*position: absolute;*/
 
 }
 
-.AllechartsDiv{
 
-	width: 100%;
 
-	height: 690px;
 
-}
 
 .div-cover{
 
 	display:none;
 
 	position: absolute;

+ 25 - 19
B20UVLog/Charts/Htmls/AxisData.html
Ver ficheiro 

@@ -3,7 +3,7 @@
 
 <!-- saved from url=(0013)about:internet -->
 
 
 <head>
 
-    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=5,6,7,8,9,10,11, chrome=1" />
 
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=5,6,7,8,9,10,11,edge chrome=1" />
 
     <link href="../CSS/Main.css" type="text/css" rel="stylesheet" />
 
     <script src="../JS/jquery.min.js" type="text/javascript"></script>
 
     <title>Test</title>
 
@@ -25,28 +25,29 @@
 
         var myData2 = [];
 
         var myData3 = [];
 
         var myData4 = [];
 
-        ///初始化chart数据。 
+        ///初始化chart数据。
 
         function Init(titleText, jsonX, jsonY) {
 
-            console.log(jsonX)
 
-            console.log(jsonY)
 
+            //console.log(jsonX)
 
+            //console.log(jsonY)
 
             //处理json数据
 
             var DataX = eval('(' + jsonX + ')');
 
             var DataY = eval('(' + jsonY + ')');
 
-            console.log(DataX)
 
-            console.log(DataY)
 
+            //console.log(DataX)
 
+            //console.log(DataY)
 
             var myData1 = DataY["WSZ1"];
 
             var myData2 = DataY["WSZ2"];
 
             var myData3 = DataY["WSZ3"];
 
             var myData4 = DataY["WSZ4"];
 
-            console.log(myData1)
 
-            console.log(myData2)
 
-            console.log(myData3)
 
-            console.log(myData4)
 
+            //console.log(myData1)
 
+            //console.log(myData2)
 
+            //console.log(myData3)
 
+            //console.log(myData4)
 
             // 指定图表的配置项和数据
 
             option = {
 
                 title: {
 
                     text: titleText
 
                 },
 
+                legend: {},
 
                 toolbox: {
 
                     right: 10,
 
                     feature: {
 
@@ -67,9 +68,9 @@
 
                     data: DataX
 
                 },
 
                 yAxis: {
 
-                    type:'value',
 
-                    axisLable:{
 
-                        formatter:'{value}mm'
 
+                    type: 'value',
 
+                    axisLable: {
 
+                        formatter: '{value}mm'
 
                     },
 
                     boundaryGap: [0, '50%'],
 
                     scale: true,
 
@@ -83,17 +84,20 @@
 
                         type: 'line',
 
                         showSymbol: false,
 
                         data: myData1
 
-                    }, {
 
+                    },
 
+                    {
 
                         name: 'WSZ2',
 
                         type: 'line',
 
                         showSymbol: false,
 
                         data: myData2
 
-                    }, {
 
+                    },
 
+                    {
 
                         name: 'WSZ3',
 
                         type: 'line',
 
                         showSymbol: false,
 
                         data: myData3
 
-                    }, {
 
+                    },
 
+                    {
 
                         name: 'WSZ4',
 
                         type: 'line',
 
                         showSymbol: false,
 
@@ -101,11 +105,13 @@
 
                     }
 
                 ]
 
             };
 
-            // 使用刚指定的配置项和数据显示图表。
 
+            // 使用刚指定的配置项和数据显示图表。 没明白为啥需要配置两次，不然没曲线图，奇怪。
 
+            myChart.setOption(option);
 
             myChart.setOption(option);
 
         }
 
-
 
-        Init("测试", "['2024-07-09 17:24:35','2024-07-09 17:27:08']", "{'WSZ1':[1,2],'WSZ2':[2,3],'WSZ3':[3,4],'WSZ4':[4,5]}");
 
+        //var xdata = "['1', '2', '3', '4', '5',]";
 
+        //var ydata = "{ 'WSZ1': [1, 3, 3, 5, 6], 'WSZ2': [12, 13, 11, 15, 17], 'WSZ3': [23, 22, 24, 22, 21], 'WSZ4': [34, 36, 35, 33, 39] }";
 
+        //Init("测试", xdata, ydata);
 
     </script>
 
 </body>

+ 118 - 0
B20UVLog/Charts/Htmls/AxisData1.html
Ver ficheiro 

@@ -0,0 +1,118 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-cn" xmlns="http://www.w3.org/1999/xhtml">
 
+<!-- saved from url=(0013)about:internet -->
 
+
 
+<head>
 
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=5,6,7,8,9,10,11, chrome=1" />
 
+    <link href="../CSS/Main.css" type="text/css" rel="stylesheet" />
 
+    <script src="../JS/jquery.min.js" type="text/javascript"></script>
 
+    <title>Test</title>
 
+</head>
 
+
 
+<body>
 
+    <div class="Container_right_echartsDiv">
 
+        <div id="Div_Main" class="echartsDiv"></div>
 
+    </div>
 
+    <script src="../JS/echarts.min.js" type="text/javascript"></script>
 
+    <script src="../JS/walden.js" type="text/javascript"></script>
 
+    <!-- 按照习惯应该将Script放到指定的js文件中并引用，但是测试发现WPF不便调用js文件中的function，却可以直接调用html中的。-->
 
+    <script>
 
+        console.log("Echarts Version:" + echarts.version);
 
+        // 基于准备好的dom，初始化echarts实例
 
+        var myChart = echarts.init(document.getElementById('Div_Main'), 'walden');
 
+
 
+        var myData1 = [];
 
+        var myData2 = [];
 
+        var myData3 = [];
 
+        var myData4 = [];
 
+        ///初始化chart数据。
 
+        function Init(titleText, jsonX, jsonY) {
 
+            //console.log(jsonX)
 
+            //console.log(jsonY)
 
+            //处理json数据
 
+            var DataX = eval('(' + jsonX + ')');
 
+            var DataY = eval('(' + jsonY + ')');
 
+            //console.log(DataX)
 
+            //console.log(DataY)
 
+            var myData1 = DataY["WSX1"];
 
+            var myData2 = DataY["WSX2"];
 
+            var myData3 = DataY["WSY1"];
 
+            var myData4 = DataY["WSY2"];
 
+            //console.log(myData1)
 
+            //console.log(myData2)
 
+            //console.log(myData3)
 
+            //console.log(myData4)
 
+            // 指定图表的配置项和数据
 
+            option = {
 
+                title: {
 
+                    text: titleText
 
+                },
 
+                legend: {},
 
+                toolbox: {
 
+                    right: 10,
 
+                    feature: {
 
+                        dataZoom: {
 
+                            yAxisIndex: 'none'
 
+                        },
 
+                        restore: {}
 
+                    }
 
+                },
 
+                tooltip: {
 
+                    trigger: 'axis'
 
+                },
 
+                xAxis: {
 
+                    type: 'category',
 
+                    splitLine: {
 
+                        show: false
 
+                    },
 
+                    data: DataX
 
+                },
 
+                yAxis: {
 
+                    type: 'value',
 
+                    axisLable: {
 
+                        formatter: '{value}mm'
 
+                    },
 
+                    boundaryGap: [0, '50%'],
 
+                    scale: true,
 
+                    splitLine: {
 
+                        show: false
 
+                    }
 
+                },
 
+                series: [
 
+                    {
 
+                        name: 'WSX1',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData1
 
+                    },
 
+                    {
 
+                        name: 'WSX2',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData2
 
+                    },
 
+                    {
 
+                        name: 'WSY1',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData3
 
+                    },
 
+                    {
 
+                        name: 'WSY2',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData4
 
+                    }
 
+                ]
 
+            };
 
+            // 使用刚指定的配置项和数据显示图表。 没明白为啥需要配置两次，不然没曲线图，奇怪。
 
+            myChart.setOption(option);
 
+            myChart.setOption(option);
 
+        }
 
+        //var xdata = "['1', '2', '3', '4', '5']";
 
+        //var ydata = "{ 'WSZ1': [1, 3, 3, 5, 6], 'WSZ2': [12, 13, 11, 15, 17], 'WSZ3': [23, 22, 24, 22, 21], 'WSZ4': [34, 36, 35, 33, 39] }";
 
+        //Init("测试数据", xdata, ydata);
 
+    </script>
 
+</body>
 
+
 
+</html>

+ 110 - 0
B20UVLog/Charts/Htmls/AxisData2.html
Ver ficheiro 

@@ -0,0 +1,110 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-cn" xmlns="http://www.w3.org/1999/xhtml">
 
+<!-- saved from url=(0013)about:internet -->
 
+
 
+<head>
 
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=5,6,7,8,9,10,11, chrome=1" />
 
+    <link href="../CSS/Main.css" type="text/css" rel="stylesheet" />
 
+    <script src="../JS/jquery.min.js" type="text/javascript"></script>
 
+    <title>Test</title>
 
+</head>
 
+
 
+<body>
 
+    <div class="Container_right_echartsDiv">
 
+        <div id="Div_Main" class="echartsDiv"></div>
 
+    </div>
 
+    <script src="../JS/echarts.min.js" type="text/javascript"></script>
 
+    <script src="../JS/walden.js" type="text/javascript"></script>
 
+    <!-- 按照习惯应该将Script放到指定的js文件中并引用，但是测试发现WPF不便调用js文件中的function，却可以直接调用html中的。-->
 
+    <script>
 
+        console.log("Echarts Version:" + echarts.version);
 
+        // 基于准备好的dom，初始化echarts实例
 
+        var myChart = echarts.init(document.getElementById('Div_Main'), 'walden');
 
+
 
+        var myData1 = [];
 
+        var myData2 = [];
 
+        var myData3 = [];
 
+        ///初始化chart数据。
 
+        function Init(titleText, jsonX, jsonY) {
 
+            //console.log(jsonX)
 
+            //console.log(jsonY)
 
+            //处理json数据
 
+            var DataX = eval('(' + jsonX + ')');
 
+            var DataY = eval('(' + jsonY + ')');
 
+            //console.log(DataX)
 
+            //console.log(DataY)
 
+            var myData1 = DataY["CSXL"];
 
+            var myData2 = DataY["CSYL"];
 
+            var myData3 = DataY["CSZL"];
 
+            //console.log(myData1)
 
+            //console.log(myData2)
 
+            //console.log(myData3)
 
+            //console.log(myData4)
 
+            // 指定图表的配置项和数据
 
+            option = {
 
+                title: {
 
+                    text: titleText
 
+                },
 
+                legend: {},
 
+                toolbox: {
 
+                    right: 10,
 
+                    feature: {
 
+                        dataZoom: {
 
+                            yAxisIndex: 'none'
 
+                        },
 
+                        restore: {}
 
+                    }
 
+                },
 
+                tooltip: {
 
+                    trigger: 'axis'
 
+                },
 
+                xAxis: {
 
+                    type: 'category',
 
+                    splitLine: {
 
+                        show: false
 
+                    },
 
+                    data: DataX
 
+                },
 
+                yAxis: {
 
+                    type: 'value',
 
+                    axisLable: {
 
+                        formatter: '{value}mm'
 
+                    },
 
+                    boundaryGap: [0, '50%'],
 
+                    scale: true,
 
+                    splitLine: {
 
+                        show: false
 
+                    }
 
+                },
 
+                series: [
 
+                    {
 
+                        name: 'CSXL',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData1
 
+                    },
 
+                    {
 
+                        name: 'CSYL',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData2
 
+                    },
 
+                    {
 
+                        name: 'CSZL',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData3
 
+                    }
 
+                ]
 
+            };
 
+            // 使用刚指定的配置项和数据显示图表。 没明白为啥需要配置两次，不然没曲线图，奇怪。
 
+            myChart.setOption(option);
 
+            myChart.setOption(option);
 
+        }
 
+        //var xdata = "['1', '2', '3', '4', '5']";
 
+        //var ydata = "{ 'WSZ1': [1, 3, 3, 5, 6], 'WSZ2': [12, 13, 11, 15, 17], 'WSZ3': [23, 22, 24, 22, 21], 'WSZ4': [34, 36, 35, 33, 39] }";
 
+        //Init("测试数据", xdata, ydata);
 
+    </script>
 
+</body>
 
+
 
+</html>

+ 109 - 0
B20UVLog/Charts/Htmls/AxisData3.html
Ver ficheiro 

@@ -0,0 +1,109 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-cn" xmlns="http://www.w3.org/1999/xhtml">
 
+<!-- saved from url=(0013)about:internet -->
 
+
 
+<head>
 
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=5,6,7,8,9,10,11, chrome=1" />
 
+    <link href="../CSS/Main.css" type="text/css" rel="stylesheet" />
 
+    <script src="../JS/jquery.min.js" type="text/javascript"></script>
 
+    <title>Test</title>
 
+</head>
 
+
 
+<body>
 
+    <div class="Container_right_echartsDiv">
 
+        <div id="Div_Main" class="echartsDiv"></div>
 
+    </div>
 
+    <script src="../JS/echarts.min.js" type="text/javascript"></script>
 
+    <script src="../JS/walden.js" type="text/javascript"></script>
 
+    <!-- 按照习惯应该将Script放到指定的js文件中并引用，但是测试发现WPF不便调用js文件中的function，却可以直接调用html中的。-->
 
+    <script>
 
+        console.log("Echarts Version:" + echarts.version);
 
+        // 基于准备好的dom，初始化echarts实例
 
+        var myChart = echarts.init(document.getElementById('Div_Main'), 'walden');
 
+
 
+        var myData1 = [];
 
+        var myData2 = [];
 
+        var myData3 = [];
 
+        ///初始化chart数据。
 
+        function Init(titleText, jsonX, jsonY) {
 
+            //console.log(jsonX)
 
+            //console.log(jsonY)
 
+            //处理json数据
 
+            var DataX = eval('(' + jsonX + ')');
 
+            var DataY = eval('(' + jsonY + ')');
 
+            //console.log(DataX)
 
+            //console.log(DataY)
 
+            var myData1 = DataY["CSXR"];
 
+            var myData2 = DataY["CSYR"];
 
+            var myData3 = DataY["CSZR"];
 
+            //console.log(myData1)
 
+            //console.log(myData2)
 
+            //console.log(myData3)
 
+            // 指定图表的配置项和数据
 
+            option = {
 
+                title: {
 
+                    text: titleText
 
+                },
 
+                legend: {},
 
+                toolbox: {
 
+                    right: 10,
 
+                    feature: {
 
+                        dataZoom: {
 
+                            yAxisIndex: 'none'
 
+                        },
 
+                        restore: {}
 
+                    }
 
+                },
 
+                tooltip: {
 
+                    trigger: 'axis'
 
+                },
 
+                xAxis: {
 
+                    type: 'category',
 
+                    splitLine: {
 
+                        show: false
 
+                    },
 
+                    data: DataX
 
+                },
 
+                yAxis: {
 
+                    type: 'value',
 
+                    axisLable: {
 
+                        formatter: '{value}mm'
 
+                    },
 
+                    boundaryGap: [0, '50%'],
 
+                    scale: true,
 
+                    splitLine: {
 
+                        show: false
 
+                    }
 
+                },
 
+                series: [
 
+                    {
 
+                        name: 'CSXR',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData1
 
+                    },
 
+                    {
 
+                        name: 'CSYR',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData2
 
+                    },
 
+                    {
 
+                        name: 'CSZR',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData3
 
+                    }
 
+                ]
 
+            };
 
+            // 使用刚指定的配置项和数据显示图表。 没明白为啥需要配置两次，不然没曲线图，奇怪。
 
+            myChart.setOption(option);
 
+            myChart.setOption(option);
 
+        }
 
+        //var xdata = "['1', '2', '3', '4', '5']";
 
+        //var ydata = "{ 'CSXR': [1, 3, 3, 5, 6], 'CSYR': [12, 13, 11, 15, 17], 'CSZR': [23, 22, 24, 22, 21] }";
 
+        //Init("测试数据", xdata, ydata);
 
+    </script>
 
+</body>
 
+
 
+</html>

+ 100 - 0
B20UVLog/Charts/Htmls/AxisData4.html
Ver ficheiro 

@@ -0,0 +1,100 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-cn" xmlns="http://www.w3.org/1999/xhtml">
 
+<!-- saved from url=(0013)about:internet -->
 
+
 
+<head>
 
+    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=5,6,7,8,9,10,11, chrome=1" />
 
+    <link href="../CSS/Main.css" type="text/css" rel="stylesheet" />
 
+    <script src="../JS/jquery.min.js" type="text/javascript"></script>
 
+    <title>Test</title>
 
+</head>
 
+
 
+<body>
 
+    <div class="Container_right_echartsDiv">
 
+        <div id="Div_Main" class="echartsDiv"></div>
 
+    </div>
 
+    <script src="../JS/echarts.min.js" type="text/javascript"></script>
 
+    <script src="../JS/walden.js" type="text/javascript"></script>
 
+    <!-- 按照习惯应该将Script放到指定的js文件中并引用，但是测试发现WPF不便调用js文件中的function，却可以直接调用html中的。-->
 
+    <script>
 
+        console.log("Echarts Version:" + echarts.version);
 
+        // 基于准备好的dom，初始化echarts实例
 
+        var myChart = echarts.init(document.getElementById('Div_Main'), 'walden');
 
+
 
+        var myData1 = [];
 
+        var myData2 = [];
 
+        ///初始化chart数据。
 
+        function Init(titleText, jsonX, jsonY) {
 
+            //console.log(jsonX)
 
+            //console.log(jsonY)
 
+            //处理json数据
 
+            var DataX = eval('(' + jsonX + ')');
 
+            var DataY = eval('(' + jsonY + ')');
 
+            //console.log(DataX)
 
+            //console.log(DataY)
 
+            var myData1 = DataY["WSL"];
 
+            var myData2 = DataY["WSS"];
 
+            //console.log(myData1)
 
+            //console.log(myData2)
 
+            // 指定图表的配置项和数据
 
+            option = {
 
+                title: {
 
+                    text: titleText
 
+                },
 
+                legend: {},
 
+                toolbox: {
 
+                    right: 10,
 
+                    feature: {
 
+                        dataZoom: {
 
+                            yAxisIndex: 'none'
 
+                        },
 
+                        restore: {}
 
+                    }
 
+                },
 
+                tooltip: {
 
+                    trigger: 'axis'
 
+                },
 
+                xAxis: {
 
+                    type: 'category',
 
+                    splitLine: {
 
+                        show: false
 
+                    },
 
+                    data: DataX
 
+                },
 
+                yAxis: {
 
+                    type: 'value',
 
+                    axisLable: {
 
+                        formatter: '{value}mm'
 
+                    },
 
+                    boundaryGap: [0, '50%'],
 
+                    scale: true,
 
+                    splitLine: {
 
+                        show: false
 
+                    }
 
+                },
 
+                series: [
 
+                    {
 
+                        name: 'WSL',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData1
 
+                    },
 
+                    {
 
+                        name: 'WSS',
 
+                        type: 'line',
 
+                        showSymbol: false,
 
+                        data: myData2
 
+                    }
 
+                ]
 
+            };
 
+            // 使用刚指定的配置项和数据显示图表。 没明白为啥需要配置两次，不然没曲线图，奇怪。
 
+            myChart.setOption(option);
 
+            myChart.setOption(option);
 
+        }
 
+        //var xdata = "['1', '2']";
 
+        //var ydata = "{ 'WSL': [1, 3], 'WSS': [12, 13] }";
 
+        //Init("测试数据", xdata, ydata);
 
+    </script>
 
+</body>
 
+
 
+</html>

BIN=BIN
B20UVLog/LogPcTask_Biz.cs
Ver ficheiro


+ 38 - 6
B20UVLog/Pages/AxisData.xaml
Ver ficheiro 

@@ -20,7 +20,7 @@
 
         </Grid.RowDefinitions>
 
         <!--<TextBlock Grid.Row="0" Text="Axis Data" FontSize="25" Margin="10 5"/>-->
 
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
 
-            <My:MComboBox SelectedIndex="{Binding DataGroupIndex}" SelectionChanged="MComboBox_SelectionChanged">
 
+            <My:MComboBox SelectedIndex="{Binding DataGroupIndex}" Title="请选择数据组" SelectionChanged="MComboBox_SelectionChanged">
 
                 <ComboBoxItem>WSZ1,2,3,4</ComboBoxItem>
 
                 <ComboBoxItem>WSX1,2 WSY1,2</ComboBoxItem>
 
                 <ComboBoxItem>CSXL,CSYL,CSZL</ComboBoxItem>
 
@@ -40,6 +40,43 @@
 
                 <RowDefinition Height="*"/>
 
                 <RowDefinition Height="auto"/>
 
             </Grid.RowDefinitions>
 
+            <My:MDataGrid x:Name="DataGridAll" ItemsSource="{Binding GridDataAll}">
 
+                <DataGrid.Columns>
 
+                    <DataGridTextColumn Header="WSZ1(mm)" Binding="{Binding WSZ1,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSZ2(mm)" Binding="{Binding WSZ2,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSZ3(mm)" Binding="{Binding WSZ3,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSZ4(mm)" Binding="{Binding WSZ4,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSX1(mm)" Binding="{Binding WSX1,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSX2(mm)" Binding="{Binding WSX2,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSY1(mm)" Binding="{Binding WSY1,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSY2(mm)" Binding="{Binding WSY2,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="CSXL(mm)" Binding="{Binding CSXL,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="CSYL(mm)" Binding="{Binding CSYL,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="CSZL(mm)" Binding="{Binding CSZL,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="CSXR(mm)" Binding="{Binding CSXR,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.0001}"/>
 
+                    <DataGridTextColumn Header="CSYR(mm)" Binding="{Binding CSYR,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.0001}"/>
 
+                    <DataGridTextColumn Header="CSZR(度)" Binding="{Binding CSZR,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.00001}"/>
 
+                    <DataGridTextColumn Header="WSL(mm)" Binding="{Binding WSL,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="WSS(mm)" Binding="{Binding WSS,
 
+                        Converter={StaticResource ConverterMultipleDouble},ConverterParameter=0.001}"/>
 
+                    <DataGridTextColumn Header="记录时间" Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
 
+                </DataGrid.Columns>
 
+            </My:MDataGrid>
 
             <My:MDataGrid x:Name="DataGrid1" ItemsSource="{Binding GridData1}" Visibility="Collapsed">
 
                 <DataGrid.Columns>
 
                     <DataGridTextColumn Header="WSZ1(mm)" Binding="{Binding WSZ1,
 
@@ -101,11 +138,6 @@
 
         </Grid>
 
         <Popup x:Name="PopupChart" StaysOpen="False" PlacementRectangle="10,100,0,0">
 
             <Border Background="White" BorderThickness="1" BorderBrush="{StaticResource DefaultBorderBrush}" Padding="10">
 
-                <StackPanel>
 
-                    <StackPanel Orientation="Horizontal">
 
-                    </StackPanel>
 
-                    <WebBrowser x:Name="WBrowser" Margin="10 10 0 10" LoadCompleted="WBrowser_LoadCompleted"/>
 
-                </StackPanel>
 
             </Border>
 
         </Popup>
 
     </Grid>

BIN=BIN
B20UVLog/Pages/AxisData.xaml.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/ANALogDataViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/AlarmViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/AxisDataViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/EQPStatusViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/GlassInformationViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/IOViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/LampDataViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/LampUseTimeViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/PLCSetViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/RecipeBodyViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/RecipeCountViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/RobotInterfaceInViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/RobotInterfaceOutViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/ServoAxisStatusViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/SysParaViewModel.cs
Ver ficheiro


BIN=BIN
B20UVLog/ViewModels/YMeasureDataViewModel.cs
Ver ficheiro


+ 17 - 0
B20UVLog/Windows/Chart.xaml
Ver ficheiro 

@@ -0,0 +1,17 @@
 
+<My:MWindow  xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl"
 
+                 x:Class="B20UVLog.Windows.Chart"
 
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 
+        xmlns:local="clr-namespace:B20UVLog.Windows" xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
 
+             mc:Ignorable="d"
 
+        Title="Axis Data 图表" Height="600" Width="1000"
 
+        WindowStyle="ToolWindow">
 
+    <Window.DataContext>
 
+        <viewmodels:AxisDataViewModel/>
 
+    </Window.DataContext>
 
+    <Grid>
 
+        <WebBrowser x:Name="WBrowser" Height="480" Width="800" LoadCompleted="WBrowser_LoadCompleted"/>
 
+    </Grid>
 
+</My:MWindow>

BIN=BIN
B20UVLog/Windows/Chart.xaml.cs
Ver ficheiro


BIN=BIN
dll/MyWPFControl.dll
Ver ficheiro