fix: 监测曲线功能优化。

src/types/components.d.ts

@@ -19,14 +19,10 @@ declare module 'vue' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -37,7 +33,6 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
@@ -45,9 +40,6 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
@@ -58,18 +50,13 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FlowChart: typeof import('./../components/Process/flowChart.vue')['default']
     FlowChartImg: typeof import('./../components/Process/flowChartImg.vue')['default']
     Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/fishery/monitorHistory/index.vue

@@ -404,7 +404,8 @@ const updateChart = () => {
     const day = String(date.getDate()).padStart(2, '0');
     const hours = String(date.getHours()).padStart(2, '0');
     const minutes = String(date.getMinutes()).padStart(2, '0');
-    return `${month}-${day} ${hours}:${minutes}`;
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${month}-${day} ${hours}:${minutes}:${seconds}`;
   });
   
   const yData = historyData.value.map(item => {
@@ -437,7 +438,8 @@ const updateChart = () => {
       data: xData,
       axisLabel: {
         interval: Math.floor(xData.length / 20), // 控制显示密度
-        rotate: 0
+        rotate: 20, // 倾斜45度
+        fontSize: 11
       }
     },
     yAxis: {
@@ -453,6 +455,8 @@ const updateChart = () => {
         type: chartType.value,
         data: yData,
         smooth: chartType.value === 'line',
+        symbol: 'circle', // 使用圆形标记
+        symbolSize: chartType.value === 'line' ? 0 : 6, // 折线图默认不显示点,柱状图不受影响
         itemStyle: {
           color: config.color
         },
@@ -461,6 +465,17 @@ const updateChart = () => {
         } : undefined,
         areaStyle: chartType.value === 'line' ? {
           opacity: 0.1
+        } : undefined,
+        emphasis: chartType.value === 'line' ? {
+          symbol: 'circle',
+          symbolSize: 12,
+          itemStyle: {
+            color: config.color,
+            borderColor: '#fff',
+            borderWidth: 3,
+            shadowBlur: 8,
+            shadowColor: config.color
+          }
         } : undefined
       }
     ]
@@ -527,6 +542,8 @@ const handleDeviceSelect = (device: DeviceVO) => {
   selectedDevice.value = device;
   queryParams.value.serialNum = device.serialNum;
   deviceSelectVisible.value = false;
+  // 选择设备后自动查询
+  getHistoryList();
 };
 
 /** 取消设备选择 */

src/views/login.vue

@@ -6,10 +6,10 @@
         <lang-select />
       </div> -->
       <el-form-item v-if="tenantEnabled" prop="tenantId">
-<!--        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">-->
+        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
-<!--          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>-->
+          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
-<!--          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
+          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-<!--        </el-select>-->
+        </el-select>
       </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
@@ -87,8 +87,8 @@ const { t } = useI18n();
 
 const loginForm = ref<LoginData>({
   tenantId: '111111',
-  username: 'fishery',
+  username: 'admin',
-  password: 'fishery@123',
+  password: 'admin123',
   rememberMe: false,
   code: '',
   uuid: ''
@@ -216,7 +216,7 @@ const doSocialLogin = (type: string) => {
 
 onMounted(() => {
   getCode();
-  // initTenantList();
+  initTenantList();
   getLoginData();
 });
 </script>
@@ -301,7 +301,7 @@ onMounted(() => {
   backdrop-filter: blur(2px);
   text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8);
   z-index: 2;
-
+  
   span {
     padding: 5px 15px;
     border-radius: 15px;
@@ -309,12 +309,12 @@ onMounted(() => {
     backdrop-filter: blur(5px);
     border: 1px solid rgba(255, 255, 255, 0.1);
   }
-
+  
   a {
     color:rgb(255, 255, 255) !important;
     text-decoration: none;
     transition: color 0.3s ease;
-
+    
     &:hover {
       color: #66b1ff !important;
       text-shadow: 0 0 5px rgba(64, 158, 255, 0.5);

vite.config.ts

@@ -24,8 +24,8 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://localhost:8080',
+          // target: 'http://localhost:8080',
-            // target: 'https://www.qdintc.com/fishery-api/',
+          target: 'https://www.qdintc.com/fishery-api/',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')