2点多余代码

Author: guohaomeng

src/App.vue

@@ -31,19 +31,8 @@
     </el-row>
   </div>
 </template>
-<style>
-.LeftMain {
-  width: 100%;
-  height: auto;
-}
-
-.el-row {
-  margin-bottom: 0px;
-}
-</style>
 
 <script lang="ts">
-
 export default {
   name: 'App',
   components: {
@@ -53,23 +42,14 @@ export default {
     OSChart,
   }
 }
-
 </script>
-
 <script setup lang="ts">
 import { ref } from 'vue'
 import { onMounted } from 'vue'
 import WaveGen from './components/WaveGen.vue'
 import WaveGenChart from './components/WaveGenChart.vue'
 import OSChart from './components/OSChart.vue'
 import socket from './script/websocket'
-// import {
-//   ElNotification,
-//   ElRow,
-//   ElCol,
-//   ElSwitch,
-//   ElFormItem
-// } from 'element-plus'
 
 // 自动切换暗黑模式
 import { useDark, useToggle } from '@vueuse/core'
@@ -96,7 +76,7 @@ function receiveMessage(message: any) {
   if (message.data[0] == '{' && message.data[2] == 'a') {
     var data = JSON.parse(message.data);
     OSChart.refreshData(data);
-  } else if(message.data[0] == '{' && message.data[2] == 'p'){
+  } else if (message.data[0] == '{' && message.data[2] == 'p') {
     var data = JSON.parse(message.data);
     console.log(data.param);
     WaveGen.changeParam(data.param);
@@ -111,5 +91,15 @@ onMounted(() => {
   UseDarkMode();
   switchVal.value = isDark.value;
 });
-
 </script>
+
+<style>
+.LeftMain {
+  width: 100%;
+  height: auto;
+}
+
+.el-row {
+  margin-bottom: 0px;
+}
+</style>

src/components/OSChart.vue

@@ -41,7 +41,6 @@ function OSCStop() {
   isRun = false;
   sendData("CF");
 };
-
 function generateData() {
   let data = [];
   if (OSCData.length < 10) {
@@ -56,7 +55,6 @@ function generateData() {
   }
   return data;
 }
-
 option = {
   backgroundColor: '',
   animation: false,
@@ -154,7 +152,6 @@ function darkMode(isDark: boolean) {
     ]
   });
 }
-
 const sendData = (data: string) => {
   if (socket.socket_open) {
     socket.send(data);
@@ -195,10 +192,7 @@ export default {
     option: Object
   }
 }
-
 </script>
-
-
 <script lang="ts" setup>
 import * as echarts from 'echarts/core';
 import {
@@ -218,7 +212,6 @@ import { onMounted } from 'vue';
 import { EChartsType } from 'echarts/core';
 import socket from '../script/websocket'
 
-
 import {
   // ElFormItem,
   // ElInputNumber,
@@ -236,7 +229,6 @@ echarts.use([
   UniversalTransition
 ]);
 
-
 // 2.定义传入的参数
 const props = defineProps({
   width: {
@@ -259,8 +251,6 @@ const props = defineProps({
   },
 });
 
-
-
 onMounted(() => {
   chartDom = document.getElementById(props.container) as HTMLElement
   myChart = echarts.init(chartDom);
@@ -269,7 +259,6 @@ onMounted(() => {
 
 </script>
 
-
 <style>
 .OSChart {
   margin: 0 auto;

src/components/WaveGen.vue

@@ -39,7 +39,6 @@
 import { ref } from "vue";
 const formSize = ref('large')
 const labelPosition = ref('right')
-
 const waveType = ref("1")
 const freq = ref(100)
 const duty = ref(50)
@@ -97,15 +96,16 @@ const freqChange = (value: number) => {
 const dutyChange = (value: number) => {
   console.log(value);
   form.duty = value;
-  sendData("D"+value);
+  sendData("D" + value);
 }
 const uMaxValueChange = (value: number) => {
   console.log(value);
-  sendData("U"+value);
+  form.uMaxValue = value;
+  sendData("U" + value);
 }
 const biasChange = (value: number) => {
   console.log(value);
-  sendData("B"+value);
+  sendData("B" + value);
 }
 export default {
   name: "WaveGen",
@@ -121,18 +121,7 @@ export default {
 }
 </script>
 <script setup lang="ts">
-import {
-  // ElForm,
-  // ElFormItem,
-  // ElButton,
-  // ElOption,
-  // ElInputNumber,
-  ElMessage,
-  // ElSelect,
-  // ElSlider,
-  // ElSwitch,
-} from 'element-plus'
-
+import { ElMessage } from 'element-plus'
 import { reactive } from 'vue'
 import WaveGenChart from './WaveGenChart.vue'
 import socket from '../script/websocket'
@@ -141,8 +130,6 @@ defineProps<{ msg: string }>();
 
 </script>
 
-
-
 <style>
 .waveGen {
   width: 55%;

src/components/WaveGenChart.vue

@@ -26,16 +26,14 @@ type EChartsOption = echarts.ComposeOption<
 var option: EChartsOption;
 var myChart: EChartsType;
 var chartDom: HTMLElement;
-
-
 // 绘制预览波形相关变量及函数
 var start = true;
 let uMaxValue = 3.3;         //峰峰值
 let offSetValue = 1.65       //偏置电压
 let duty = 50;               //占空比%(方波)
 let wave = 1;                //波形种类
 let samplePerCycle = 256;
-//定义板载8位DAC输出的对应值
+// 定义波形预览数组
 var waveTab1 = new Array();
 var waveTab = new Array();
 
@@ -205,7 +203,6 @@ option = {
 export default {
   name: "WaveGenChart",
   option,
-  //myChart,
   uMaxValue,
   offSetValue,
   duty,
@@ -260,7 +257,6 @@ onMounted(() => {
   wave_gen(1);
   chartDom = document.getElementById(props.container) as HTMLElement
   myChart = echarts.init(chartDom);
-  //option.series[0].data = generateData(); // 搞不明白为啥报错，但能用
   option && myChart.setOption(option);
 });
 </script>