Merge remote-tracking branch 'origin/master'

server/index.js

@@ -3,7 +3,7 @@ import express from 'express'
 
 const app = express()
 
-const PORT = 8080 // 可根据需要更改端口号
+const PORT = 8088 // 可根据需要更改端口号
 app.listen(PORT, () => {
   console.log(`服务器已启动，正在监听端口 ${PORT}`)
 })

src/assets/styles/element.scss

@@ -35,4 +35,11 @@
 }
 .el-card__body{
   padding: 0;
+}
+
+.el-table__header {
+  th {
+    background-color: rgba(0,0,0,0.02 ) !important;
+    color: rgba(0, 0, 0, 0.85)
+  }
 }

src/components/formula/FormulaConfig.vue

@@ -472,7 +472,7 @@ const openKeyboardType = (labelName: string) => {
     font-size: 20px !important;
     padding: 5px;
     padding-left: 15px;
-    height: 81vh;
+    //height: 81vh;
     overflow: auto;
     .formulaFormItem{
       display: grid;
@@ -508,7 +508,7 @@ const openKeyboardType = (labelName: string) => {
     margin-right: 0;
   }
   ::v-deep .el-input__inner{
-    height: 45px;
+    height: 40px;
   }
   ::v-deep .el-form-item{
     align-items: center;

src/components/home/HomeSetting.vue

@@ -1,15 +1,13 @@
 <script lang="ts" setup>
-import { sendCmd, syncSendCmd } from 'apis/system'
+import { syncSendCmd } from 'apis/system'
 // import homeChart from 'assets/images/home/home-chart.svg'
 import BtButton from 'components/common/BTButton/index.vue'
 import CascadingSelectModal from 'components/common/CascadingSelectModal/index.vue'
 import Config from 'components/home/Config.vue'
-import { compareJSON } from 'libs/utils'
 import { cloneDeep } from 'lodash'
 import { computed, onMounted, provide, ref, watchEffect } from 'vue'
 import { useRouter } from 'vue-router'
 
-import { FtMessage } from '@/libs/message'
 import { useDeviceStore } from '@/stores/deviceStore'
 import { useFormulaStore } from '@/stores/formulaStore'
 import { useHomeStore } from '@/stores/homeStore'
@@ -272,8 +270,8 @@ const settingWidth = computed(() => {
       </div>
     </div>
   </div>
-  <ft-dialog v-model="disinfectFormulaVisible" width="80vw" style="height: 95vh">
-    <div>
+  <ft-dialog v-model="disinfectFormulaVisible" title="消毒设置" width="80vw">
+    <div style="height: 80vh;overflow: auto">
       <Config ref="configRef" />
     </div>
     <template #footer>
@@ -328,6 +326,6 @@ const settingWidth = computed(() => {
   }
 }
  .config-btn{
-   margin-top: -3rem
+   //margin-top: -3rem
  }
 </style>

src/components/home/config.vue

@@ -151,7 +151,7 @@ const onDefaultFormula = () => {
 <style lang="scss" scoped>
   .main-content{
     overflow: hidden;
-    height: $main-container-height;
+    height: auto;
     //background: $gradient-color;
     padding: 15px;
     .formula-config{

src/components/seal/DashboardChart.vue

@@ -27,7 +27,7 @@ const initChart = () => {
   if (!chartRef.value) {
     return
   }
-  myChart = echarts.init(chartRef.value)
+  myChart = echarts.init(chartRef.value, null, { renderer: 'svg' })
   const option = {
     silent: true,
     tooltip: {
@@ -71,7 +71,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div ref="chartRef" style="width: 40vw; height: 30vw" />
+  <div ref="chartRef" style="width: 100%; height: 100%" />
 </template>
 
 <style>

src/components/setting/AddUser.vue

@@ -188,7 +188,7 @@ const rules = reactive<FormRules<UserForm>>({
             label="确认密码："
             prop="confirmPasswd"
           >
-            <el-input v-model="userForm.confirmPasswd" v-prevent-keyboard name="confirmPasswd" placeholder="确认密码" @focus="openKeyboard" />
+            <el-input v-model="userForm.confirmPasswd" v-prevent-keyboard name="confirmPasswd" type="password" placeholder="确认密码" @focus="openKeyboard" />
           </el-form-item>
         </div>
         <el-form-item

src/components/setting/History.vue

@@ -114,7 +114,7 @@ const onClose = () => {
       />
     </div>
     <div class="history-table">
-      <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table :data="tableData"  style="width: 100%;" height="100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="name" label="消毒日期" />
         <el-table-column prop="detail" label="操作" width="100">
@@ -140,10 +140,10 @@ const onClose = () => {
   padding: 10px;
   background: $gradient-color;
   .history-export{
-    margin: 2vw;
+    margin: 10px;
   }
   .history-table{
-    max-height: 73vh;
+    height: 73vh;
     overflow: auto;
   }
 }

src/components/setting/HistoryDetail.vue

@@ -48,7 +48,7 @@ const tableColumns = computed(() => {
 
 <template>
   <div class="data-table-container">
-    <el-table :data="tableData" stripe style="width: 100%">
+    <el-table :data="tableData"  style="width: 100%">
       <el-table-column
         v-for="column in tableColumns"
         :key="column.prop"

src/components/setting/User.vue

@@ -94,7 +94,7 @@ const handleSelectionChange = (users: User.UserItem[]) => {
       />
     </div>
     <div class="user-table">
-      <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
         <el-table-column prop="name" label="用户名" />
         <el-table-column prop="detail" label="操作" width="250" align="center">
           <template #default="scoped">

src/views/audit/index.vue

@@ -105,7 +105,7 @@ const handleSelectionChange = (users: Audit.AuditItem[]) => {
         />
       </div>
       <div class="audit-table">
-        <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
           <el-table-column prop="usrName" label="操作人" width="250" />
           <el-table-column prop="behaviorinfo" label="操作内容" />