合并分支 '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
   }
 }
 

src/utils/request.js

-import axios from 'axios'
-import { ElNotification, ElMessageBox, ElMessage, ElLoading } from 'element-plus'
-import { getToken, removeToken } from '@/utils/auth.js'
-import { tansParams } from '@/utils/function.js'
-import local from '@/utils/local.js'
-import { saveAs } from 'file-saver'
+import axios from "axios";
+import {
+  ElNotification,
+  ElMessageBox,
+  ElMessage,
+  ElLoading,
+} from "element-plus";
+import { getToken, removeToken } from "@/utils/auth.js";
+import { tansParams } from "@/utils/function.js";
+import local from "@/utils/local.js";
+import { saveAs } from "file-saver";
+import Loading from "@/pages/all/components/loadingComponent/index.js";
+import Loading2 from "@/pages/all/components/loadingComponent1/index.js";
 // import useUserStore from '@/store/modules/user'
 
 let downloadLoadingInstance;
 // 是否显示重新登录
 export let isRelogin = { show: false };
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 
-
 // console.log("import.meta.env.VITE_API_URL",import.meta.env.VITE_API_URL);
 
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: import.meta.env.VITE_API_URL,
   // 超时
-  timeout: 60000
-})
-
+  timeout: 60000,
+});
 
 // request拦截器
-service.interceptors.request.use(config => {
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
+service.interceptors.request.use(
+  (config) => {
+    if (config.method === "get" && config.params) {
+      let url = config.url + "?" + tansParams(config.params);
       url = url.slice(0, -1);
       config.params = {};
       config.url = url;
     }
-  if ( (config.method === 'post' || config.method === 'put')) {
-
+    if (config.method === "post" || config.method === "put") {
       const requestObj = {
         url: config.url,
-      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-      time: new Date().getTime()
-    }
+        data:
+          typeof config.data === "object"
+            ? JSON.stringify(config.data)
+            : config.data,
+        time: new Date().getTime(),
+      };
       const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
       const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
       if (requestSize >= limitSize) {
-      console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')
+        console.warn(
+          `[${config.url}]: ` +
+            "请求数据大小超出允许的5M限制，无法进行防重复提交验证。",
+        );
         return config;
       }
-    const sessionObj = local.session.getJSON('sessionObj')
-    local.session.setJSON('sessionObj', requestObj)
+      const sessionObj = local.session.getJSON("sessionObj");
+      local.session.setJSON("sessionObj", requestObj);
 
       // if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
       //   local.session.setJSON('sessionObj', requestObj)
@@ -65,52 +76,68 @@ service.interceptors.request.use(config => {
       //   }
       // }
     }
-  return config
-}, 
-  error => {
+    return config;
+  },
+  (error) => {
     //console.log(error)
-    Promise.reject(error)
-})
+    Promise.reject(error);
+  },
+);
 
 // 响应拦截器
 service.interceptors.response.use(
-  res => {
+  (res) => {
+    Loading.hide();
+    Loading2.hide();
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
-  const msg = res.data.msg || '未知错误';
+    const msg = res.data.msg || "未知错误";
     // 二进制数据则直接返回
-  if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-    return res.data
+    if (
+      res.request.responseType === "blob" ||
+      res.request.responseType === "arraybuffer"
+    ) {
+      return res.data;
     }
     if (code === 401) {
       if (!isRelogin.show) {
         isRelogin.show = true;
-      removeToken()//删除token
-      ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+        removeToken(); //删除token
+        ElMessageBox.confirm(
+          "登录状态已过期，您可以继续留在该页面，或者重新登录",
+          "系统提示",
+          {
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning",
+          },
+        )
+          .then(() => {
             isRelogin.show = false;
             // useUserStore().logOut().then(() => {
-        location.href = '/';
+            location.href = "/";
             // })
-      }).catch(() => {
+          })
+          .catch(() => {
             isRelogin.show = false;
           });
       }
-    return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
     } else if (code === 500) {
-    ElMessage({ message: msg, type: 'error' })
-    return Promise.reject(new Error(msg))
+      ElMessage({ message: msg, type: "error" });
+      return Promise.reject(new Error(msg));
     } else if (code === 601) {
-    ElMessage({ message: msg, type: 'warning' })
-    return Promise.reject(new Error(msg))
+      ElMessage({ message: msg, type: "warning" });
+      return Promise.reject(new Error(msg));
     } else if (code !== 200) {
-    ElNotification.error({ title: msg })
-    return Promise.reject('error')
+      ElNotification.error({ title: msg });
+      return Promise.reject("error");
     } else {
-    return Promise.resolve(res.data)
+      return Promise.resolve(res.data);
     }
-},
-  error => {
+  },
+  (error) => {
     //console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
@@ -120,35 +147,45 @@ service.interceptors.response.use(
     } else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
-    ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
-    return Promise.reject(error)
-  }
-)
+    ElMessage({ message: message, type: "error", duration: 5 * 1000 });
+    return Promise.reject(error);
+  },
+);
 
 // 通用下载方法
 export function download(url, params, filename, config) {
-  downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", background: "rgba(0, 0, 0, 0.7)", })
-  return service.post(url, params, {
-    transformRequest: [(params) => { return tansParams(params) }],
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    responseType: 'blob',
-    ...config
-  }).then(async (data) => {
-    if (data.type !== 'application/json') {
-      const blob = new Blob([data])
-      saveAs(blob, filename)
+  downloadLoadingInstance = ElLoading.service({
+    text: "正在下载数据，请稍候",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+  return service
+    .post(url, params, {
+      transformRequest: [
+        (params) => {
+          return tansParams(params);
+        },
+      ],
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      responseType: "blob",
+      ...config,
+    })
+    .then(async (data) => {
+      if (data.type !== "application/json") {
+        const blob = new Blob([data]);
+        saveAs(blob, filename);
       } else {
         const resText = await data.text();
         const rspObj = JSON.parse(resText);
-      const errMsg = rspObj.msg || '下载文件失败，请联系管理员！';
+        const errMsg = rspObj.msg || "下载文件失败，请联系管理员！";
         ElMessage.error(errMsg);
       }
       downloadLoadingInstance.close();
-  }).catch((r) => {
-    console.error(r)
-    ElMessage.error('下载文件出现错误，请联系管理员！')
-    downloadLoadingInstance.close();
     })
+    .catch((r) => {
+      console.error(r);
+      ElMessage.error("下载文件出现错误，请联系管理员！");
+      downloadLoadingInstance.close();
+    });
 }
 
-export default service
+export default service;