+ ![刻度]()
![液位图]()
-
+
+
{
@confirm="handleConfirm"
@cancel="handleCancel"
/>
-
+
diff --git a/src/components/liquid/LiquidLevel.vue b/src/components/liquid/LiquidLevel.vue
index 1a90874..c460da8 100644
--- a/src/components/liquid/LiquidLevel.vue
+++ b/src/components/liquid/LiquidLevel.vue
@@ -16,7 +16,7 @@ const liquidHeight = ref((currentLevel.value / totalCapacity) * 200)
-
-
- 确定
- 返回
-
-
+
当前液位
diff --git a/src/components/seal/DashboardChart.vue b/src/components/seal/DashboardChart.vue
index 3741220..97a8e46 100644
--- a/src/components/seal/DashboardChart.vue
+++ b/src/components/seal/DashboardChart.vue
@@ -3,7 +3,7 @@ import * as echarts from 'echarts'
import { onMounted, ref } from 'vue'
const option = ref()
-const pressure = ref(50)
+const pressure = ref(4.5)
onMounted(() => {
const chartDom = document.getElementById('main')!
const myChart = echarts.init(chartDom)
@@ -14,7 +14,7 @@ onMounted(() => {
{
data: [
{
- value: +(Math.random() * 100).toFixed(1),
+ value: +(Math.random() * 6).toFixed(1),
},
],
},
@@ -26,50 +26,26 @@ onMounted(() => {
const init = () => {
option.value = {
+ tooltip: {
+ formatter: '{a}
{b} : {c}%', + }, series: [ { + name: 'Pressure', type: 'gauge', - axisLine: { - lineStyle: { - width: 15, - color: [ - [0.3, '#67e0e3'], - [0.7, '#37a2da'], - [1, '#fd666d'], - ], - }, - }, - pointer: { // 指针 - itemStyle: { - color: 'auto', - }, + max: 6, + progress: { + show: true, + width: 5, }, - axisTick: { // 中间刻度值 - distance: -15, - length: 8, // 刻度线长度 - lineStyle: { - color: '#fff', - width: 1, // 刻度线宽度 - }, - }, - splitLine: { - distance: -30, // 与圆盘之间的距离 - length: 30, + axisLine: { lineStyle: { - color: '#fff', - width: 4, + width: 5, }, }, - axisLabel: { - color: 'inherit', - distance: 25, - fontSize: 14, - }, detail: { valueAnimation: true, - formatter: '{value} KPa', - color: 'inherit', - fontSize: 14, + formatter: '{value}Kp', }, data: [ { diff --git a/src/components/setting/AddUser.vue b/src/components/setting/AddUser.vue index d2051b2..874209c 100644 --- a/src/components/setting/AddUser.vue +++ b/src/components/setting/AddUser.vue @@ -2,33 +2,39 @@ import type { FormInstance } from 'element-plus' import { useSettingStore } from '@/stores/settingStore' import SoftKeyboard from 'components/common/SoftKeyboard/index.vue' -import { onMounted, ref, watch } from 'vue' +import { onMounted, ref, watchEffect } from 'vue' const settingStore = useSettingStore() const visible = ref(settingStore.addUserVisible) +const modalType = ref(settingStore.userModalState) const inputValue = ref('')
const keyboardVisible = ref(false)
const keyboardType = ref<'text' | 'number'>('text')
const softKeyboardRef = ref()
const userFormRef = ref()
const focusedInput = ref(null)
+const modalTitle = ref('新增用户')
const userForm = ref({
uid: '',
id: '',
passwd: '',
confirmPassword: '',
- is_admin: '',
+ is_admin: false,
})
-watch(() => settingStore.addUserVisible, (newVal) => {
- console.log('newVal---', newVal)
- visible.value = newVal
-})
-
-// 监听软键盘输入
-watch(inputValue, (newVal) => {
- console.log('focusedInput.value--', focusedInput.value)
+watchEffect(() => {
+ modalType.value = settingStore.userModalState
+ if (settingStore.userModalState === 'edit') {
+ modalTitle.value = '修改密码'
+ }
+ if (settingStore.currentEditUser) {
+ userForm.value = settingStore.currentEditUser
+ }
+ else {
+ modalTitle.value = '新增用户'
+ }
+ visible.value = settingStore.addUserVisible
if (focusedInput.value) {
- userForm.value[focusedInput.value as keyof typeof userForm.value] = newVal
+ userForm.value[focusedInput.value as keyof typeof userForm.value] = inputValue.value
}
})
@@ -64,9 +70,7 @@ const openKeyboard = (e: any) => {
setTimeout(() => {
keyboardVisible.value = true
const labelName = e.target.name
- console.log('labelName---', labelName)
const formValue = userForm.value[labelName as keyof typeof userForm.value]
- console.log('formValue---', formValue)
inputValue.value = formValue ? formValue.toString() : ''
focusedInput.value = e.target.name
}, 100)
@@ -84,7 +88,7 @@ const handleConfirm = (value: string) => {
-
+
{
console.log('userItem===', userItem)
+ settingStore.updateCurrentEditUser(userItem)
+ settingStore.updateUserModalState('edit')
+ settingStore.updateVisible(true)
}
const onAddUser = () => {
+ settingStore.updateUserModalState('add')
settingStore.updateVisible(true)
}
const onDelUser = () => {
@@ -44,7 +47,7 @@ const onDelUser = () => {
修改密码
@@ -53,7 +56,7 @@ const onDelUser = () => {
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 50a4377..6ed654f 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -1,5 +1,6 @@
@@ -28,22 +32,22 @@ onUnmounted(() => {
-
{b} : {c}%', + }, series: [ { + name: 'Pressure', type: 'gauge', - axisLine: { - lineStyle: { - width: 15, - color: [ - [0.3, '#67e0e3'], - [0.7, '#37a2da'], - [1, '#fd666d'], - ], - }, - }, - pointer: { // 指针 - itemStyle: { - color: 'auto', - }, + max: 6, + progress: { + show: true, + width: 5, }, - axisTick: { // 中间刻度值 - distance: -15, - length: 8, // 刻度线长度 - lineStyle: { - color: '#fff', - width: 1, // 刻度线宽度 - }, - }, - splitLine: { - distance: -30, // 与圆盘之间的距离 - length: 30, + axisLine: { lineStyle: { - color: '#fff', - width: 4, + width: 5, }, }, - axisLabel: { - color: 'inherit', - distance: 25, - fontSize: 14, - }, detail: { valueAnimation: true, - formatter: '{value} KPa', - color: 'inherit', - fontSize: 14, + formatter: '{value}Kp', }, data: [ { diff --git a/src/components/setting/AddUser.vue b/src/components/setting/AddUser.vue index d2051b2..874209c 100644 --- a/src/components/setting/AddUser.vue +++ b/src/components/setting/AddUser.vue @@ -2,33 +2,39 @@ import type { FormInstance } from 'element-plus' import { useSettingStore } from '@/stores/settingStore' import SoftKeyboard from 'components/common/SoftKeyboard/index.vue' -import { onMounted, ref, watch } from 'vue' +import { onMounted, ref, watchEffect } from 'vue' const settingStore = useSettingStore() const visible = ref(settingStore.addUserVisible) +const modalType = ref(settingStore.userModalState) const inputValue = ref
-
-
- ![]()
- {{ item.meta!.title }}
-
+
+
+ ![]()
+ {{ item.meta!.title }}
+
+
+
注销
@@ -62,7 +66,7 @@ onUnmounted(() => {