fix: 监测曲线功能优化。

src/types/components.d.ts

@@ -23,8 +23,6 @@ declare module 'vue' {
     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']
@@ -36,6 +34,7 @@ declare module 'vue' {
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']

src/views/fishery/monitorHistory/index.vue

@@ -455,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
         },
@@ -463,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
       }
     ]

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-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>-->
-<!--        </el-select>-->
+        <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>
+          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+        </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',
-  password: 'fishery@123',
+  username: 'admin',
+  password: 'admin123',
   rememberMe: false,
   code: '',
   uuid: ''
@@ -216,7 +216,7 @@ const doSocialLogin = (type: string) => {
 
 onMounted(() => {
   getCode();
-  // initTenantList();
+  initTenantList();
   getLoginData();
 });
 </script>