合并分支 'wx' 到 'dev/z'

src/pages/all/components/cdf/cdfCurve.vue

@@ -202,7 +202,7 @@ function initChart() {
         rotate: 45,
         margin: 20,
         fontSize: 10,
-        // interval: 'auto', // 或直接不写
+        interval: 'auto', // 或直接不写
         // interval: function (index) {
         //   return index % 10 === 0 // 每10个显示一个
         // },

src/pages/all/components/cdf/index.vue

@@ -59,6 +59,8 @@ const props = defineProps({
     default: null
   }
 });
+
+console.log("actualAvailabilityData", props.data[1])
 onBeforeUnmount(() => {
   //console.log("中，zhelixieza");
 

src/pages/all/components/loadingComponent1/index.js

@@ -12,7 +12,7 @@ const SubLoading = (function() {
 
   function createLoading(options = {}) {
     const {
-      text = 'Loading...',
+      text = '正在加载中',
       background = 'rgba(0, 0, 0, 0.57)',
       color = '#fff',
       zIndex = 9999999,

src/pages/all/index.vue

@@ -182,6 +182,13 @@ const handleSwitchChange = (item) => {
       break;
 
     case '展开一级':
+      if (item.enabled) {
+        subControls.value[1].enabled = false
+        window.ue5("callBackControlExpendFn", String(JSON.stringify({
+          type: "SatelliteExpend2",
+          status: "close"
+        })));
+      }
       if (window.ue5) {
         window.ue5("callBackControlExpendFn", String(JSON.stringify({
           type: "SatelliteExpend1",
@@ -195,6 +202,14 @@ const handleSwitchChange = (item) => {
       break;
 
     case '展开二级':
+      if (item.enabled) {
+        subControls.value[0].enabled = false
+        window.ue5("callBackControlExpendFn", String(JSON.stringify({
+          type: "SatelliteExpend1",
+          status: "close"
+        })));
+      }
+      // siteExpand1.value = true
       if (window.ue5) {
         window.ue5("callBackControlExpendFn", String(JSON.stringify({
           type: "SatelliteExpend2",

src/pages/footer/component/timers.vue

@@ -1240,7 +1240,7 @@ const changeSpeed = () => {
 
 const startDrag = (handle, e) => {
   //console.log("开始拖动");
-  if (is_flag_isRealtime) {
+  if (is_flag_isRealtime.value) {
     ElMessage({
       type: 'warning',
       message: '实时模式下无法进行拖拽',

src/pages/header/component/screenConfigeDialog.vue

@@ -492,6 +492,7 @@ const handleConfigApplay = async () => {
       _delayData: delayData.value,
       _availabilityData: availabilityData.value,
       _lossRateData: lossRateData.value,
+      _actualAvailabilityData: actualAvailabilityData.value,
       component1: currentComponent1.value,
       component2: currentComponent2.value,
       component3: currentComponent3.value,

src/pages/rights/index.vue

@@ -9,8 +9,8 @@
     <!-- 卫星列表 -->
     <div class="satellite-section">
       <!-- <cdf></cdf> -->
-      <component :is="component2" :data="[availabilityData]" zoomHeight="14" :title="titles[1]" slogan="可用性"
-        :legendName="['规划可用性', '实际可用性']"></component>
+      <component :is="component2" :data="[availabilityData, actualAvailabilityData]" zoomHeight="14" :title="titles[1]"
+        slogan="可用性" :legendName="['规划可用性', '实际可用性']"></component>
 
     </div>
 
@@ -43,6 +43,7 @@ let trafficData = ref([])
 let delayData = ref([])
 let lossRateData = ref([])
 let availabilityData = ref([])
+let actualAvailabilityData = ref([])
 const titles = ref(['', '', '']);
 
 const appStore = useAppStore();
@@ -55,7 +56,7 @@ watch(() => appStore.chartConfig, (newVal) => {
   // console.log('appStore.chartConfig', appStore.chartConfig)
   // console.log('newVal', newVal)
   if (appStore.chartConfig) {
-    const { _capacityData, _trafficData, _delayData, _availabilityData, _lossRateData, _titles } = appStore.chartConfig
+    const { _capacityData, _trafficData, _delayData, _availabilityData, _lossRateData, _titles, _actualAvailabilityData } = appStore.chartConfig
     component1.value = markRaw(appStore.chartConfig.component1)
     component2.value = markRaw(appStore.chartConfig.component2)
     component3.value = markRaw(appStore.chartConfig.component3)
@@ -65,6 +66,7 @@ watch(() => appStore.chartConfig, (newVal) => {
     delayData.value = _delayData
     availabilityData.value = _availabilityData
     lossRateData.value = _lossRateData
+    actualAvailabilityData.value = _actualAvailabilityData
 
     titles.value = _titles
 
@@ -87,6 +89,7 @@ const getPanelCurveData = async (data) => {
     delayData.value = res.data.delay
     lossRateData.value = res.data.lossRate
     availabilityData.value = res.data.availability
+    actualAvailabilityData.value = res.data.actualAvailability
   }
 }