2022-12-14 update 无需同步蓝色版

1. 调整tableHeight, excelHeight, treeHeight在组件中的默认值与mounted中默认值一致
2. 调整config.js 中api地址

src/api/config.js

@@ -1,6 +1,6 @@
 const config = {
-    baseURL: 'http://192.168.1.5:9002',
-    socketURL: 'ws://192.168.1.5:9002'
+    baseURL: 'http://192.168.1.82:9002',
+    socketURL: 'ws://192.168.1.82:9002'
 }
 
 export default config;

src/pages/dataAnalysis/combine/index.vue

@@ -13,9 +13,9 @@ import CurrentScatterChart from './components/current-scatter-chart.vue'
 // import tableRes from '@/data/table.json'
 // import areaDataRes from '@/data/areaData.json'
 /**配置参数 */
-const treeHeight = ref((window.innerHeight - 210) / 2 + 'px') //tree高度
-const excelHeight = ref((window.innerHeight - 210) / 2 + 'px') //excel高度
-const tableHeight = ref(window.innerHeight - 254 + 'px')
+const tableHeight = ref(window.innerHeight - 314 + 'px')
+const excelHeight = ref((window.innerHeight - 270) / 2 + 'px')
+const treeHeight = ref((window.innerHeight - 270) / 2 + 'px')
 /**excel 开始 */
 const excelCheckboxShow = ref(false)
 const excelType = ref('')

src/pages/dataAnalysis/lineAnalysis/index.vue

@@ -12,9 +12,9 @@ import CurrentScatterChart from './components/current-scatter-chart.vue'
 // import tableRes from '@/data/table.json'
 // import areaDataRes from '@/data/areaData.json'
 /**配置参数 */
-const treeHeight = ref(window.innerHeight - 120 + 'px') //tree高度
-const excelHeight = ref(window.innerHeight - 120 + 'px') //excel高度
-const tableHeight = ref(window.innerHeight - 120 + 'px')
+const treeHeight = ref(window.innerHeight - 160 + 'px') //tree高度
+const excelHeight = ref(window.innerHeight - 160 + 'px') //excel高度
+const tableHeight = ref(window.innerHeight - 160 + 'px')
 /**excel 开始 */
 const excelCheckboxShow = ref(false)
 const excelCheckIds = ref([])

src/pages/dataAnalysis/rateAnalysis/index.vue

@@ -12,9 +12,9 @@ import tools from '@tools/htmlToPdf.js'
 // import flowerRes from '@/data/flower.json'
 // import lineChartRes from '@/data/lineNew.json'
 /**配置参数 */
-const treeHeight = ref(window.innerHeight - 140 + 'px') //tree高度
-const excelHeight = ref(window.innerHeight - 140 + 'px') //excel高度
-const tableHeight = ref(window.innerHeight - 140 + 'px')
+const treeHeight = ref(window.innerHeight - 150 + 'px') //tree高度
+const excelHeight = ref(window.innerHeight - 150 + 'px') //excel高度
+const tableHeight = ref(window.innerHeight - 150 + 'px')
 /**excel 开始 */
 const excelCheckIds = ref([])
 const excelList = ref([])
@@ -194,15 +194,19 @@ const funSubmit = async () => {
 					xAxis: {
 						type: 'category',
 						boundaryGap: false,
-						data: ['N','', 'N-E','', 'E','', 'S-E','', 'S','', 'S-W','', 'W','', 'W-N',''],
+						data: ['N','','','', 'N-E','','','', 'E','','','', 'S-E','','','', 'S','','','', 'S-W','','','', 'W','','','', 'W-N','','',''],
 						splitLine: {
 							show: true
 						}
 					},
 					series: chart.count?.length? [...chart.count.map((o,index) => {
+								const dataArr = new Array(32).fill(0)
+								for(let i=0;i<o.length;i++){
+									dataArr[i*2] = o[i]
+								}
 								return {
 									type: 'bar',
-									data: o,
+									data: dataArr,
 									coordinateSystem: 'polar',
 									name: funText(index),
 									stack: 'a',

src/pages/dataFilter/prepare/index.vue

@@ -8,9 +8,9 @@ import { onMounted, ref, onActivated } from 'vue'
 import request from '@/api/axios.js'
 import {baseURL, socketURL} from '@/api/axios.js'
 /**配置参数 */
-const treeHeight = ref(window.innerHeight - 200 + 'px') //tree高度
-const excelHeight = ref(window.innerHeight - 200 + 'px') //excel高度
-const tableHeight = ref(window.innerHeight - 200 + 'px')
+const treeHeight = ref(window.innerHeight - 260 + 'px') //tree高度
+const excelHeight = ref(window.innerHeight - 260 + 'px') //excel高度
+const tableHeight = ref(window.innerHeight - 260 + 'px')
 /**excel 开始 */
 const excelList = ref([])
 const funExcelChange = async (obj) => { //点击excel项时

src/pages/dataFilter/process/index.vue

@@ -8,9 +8,9 @@ import request from '@/api/axios.js'
 import {baseURL} from '@/api/axios.js'
 import { ElMessage } from 'element-plus'
 /**配置参数 */
-const treeHeight = ref((window.innerHeight - 210) / 2  + 'px') //tree高度
-const excelHeight = ref(window.innerHeight - 200 + 'px') //excel高度
-const tableHeight = ref(window.innerHeight - 200 + 'px')
+const treeHeight = ref((window.innerHeight - 270) / 2  + 'px') //tree高度
+const excelHeight = ref(window.innerHeight - 260 + 'px') //excel高度
+const tableHeight = ref(window.innerHeight - 260 + 'px')
 /**excel 开始 */
 const excelCheckboxShow = ref(false)
 const excelCheckIds = ref([])