From 32250f9a1db456b706e52ffb2664d738a2650678 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期三, 06 十一月 2024 16:18:04 +0800
Subject: [PATCH] U 测试修改
---
src/views/datas/dataHis.vue | 2
src/layout/components/Navbar.vue | 2
src/views/test/devCard.vue | 8 ++--
src/views/alarm/alarmHis.vue | 4 +-
src/views/dev/normal.vue | 4 +-
src/views/login/userName.vue | 34 ++++++++++++-----
src/components/echarts/bar2.vue | 4 +
src/views/dev/addEdit.vue | 2
src/components/echarts/bar1.vue | 9 ++--
src/views/home/index.vue | 10 ++--
src/views/test/testBatch.vue | 12 +++---
src/views/test/index.vue | 4 +-
src/stores/user.js | 3 +
src/views/dev/list.vue | 2
src/views/test/jhyTestDetails.vue | 2
src/views/alarm/alarmRt.vue | 4 +-
16 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/src/components/echarts/bar1.vue b/src/components/echarts/bar1.vue
index 5d818ce..dbd7d54 100644
--- a/src/components/echarts/bar1.vue
+++ b/src/components/echarts/bar1.vue
@@ -44,9 +44,9 @@
// let barColor = getLinearColor("#7bda59", "#059789");
// let maxColor = getLinearColor("#e3352b", "#f09f2e");
// let minColor = getLinearColor("#f09f2e", "#d3c209");
- let barColor = '#0ff';
- let maxColor = '#f8456b';
- let minColor = '#4aea80';
+ let barColor = '#02a7f0';
+ let maxColor = '#438D29';
+ let minColor = '#DBD608';
let legends = [];
return {
animation: false,
@@ -123,7 +123,8 @@
show: true,
position: "top",
color: "#fff",
- fontSize: 20,
+ fontSize: 16,
+ rotate: 30,
},
showBackground: true,
backgroundStyle: {
diff --git a/src/components/echarts/bar2.vue b/src/components/echarts/bar2.vue
index a3eb637..60bc961 100644
--- a/src/components/echarts/bar2.vue
+++ b/src/components/echarts/bar2.vue
@@ -96,8 +96,10 @@
color: (params) => {
// console.log('params', params, data, '=============');
let max = Math.max(...data);
- let min = Math.min(...data);
+ let min = Math.min(...(data.filter((item) => item != 0)));
let val = params.value;
+ console.log('min, max, val', min, max, val, '=============');
+
if (val == min) {
return minColor;
} else if (val == max) {
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 12ce768..cd6c4b7 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -96,7 +96,7 @@
nList = data2.map((v) => ({
...v,
devIdcode: v.devInf.devIdcode,
- devTypeStr: ["", "鍏呮斁鐢典竴浣撴満", "鍧囪 娴嬭瘯浠�"][v.devInf.devType],
+ devTypeStr: ["", "鍏呮斁鐢垫祴璇曚华", "鍧囪 娴嬭瘯浠�"][v.devInf.devType],
}));
}
if (o) {
diff --git a/src/stores/user.js b/src/stores/user.js
index 61a7f61..9019621 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -5,6 +5,7 @@
return {
uid: localStorage.getItem("uid"),
uname: localStorage.getItem("uname"),
+ lastUname: localStorage.getItem("lastuname"),
rememberList: localStorage.getItem("rememberList") || "[]",
};
},
@@ -12,6 +13,8 @@
setName(value) {
this.uname = value;
localStorage.setItem("uname", value);
+ this.lastUname = value;
+ localStorage.setItem("lastuname", value);
},
setId(value) {
this.uid = value;
diff --git a/src/views/alarm/alarmHis.vue b/src/views/alarm/alarmHis.vue
index 909753f..0aae26b 100644
--- a/src/views/alarm/alarmHis.vue
+++ b/src/views/alarm/alarmHis.vue
@@ -88,7 +88,7 @@
_total = total0;
_list = list.map((v) => {
v.devIdcode = v.devInf.devIdcode;
- v.devTypeStr = ["", "鍏呮斁鐢典竴浣撴満", "鍧囪 娴嬭瘯浠�"][v.devInf.devType];
+ v.devTypeStr = ["", "鍏呮斁鐢垫祴璇曚华", "鍧囪 娴嬭瘯浠�"][v.devInf.devType];
return v;
});
}
@@ -151,7 +151,7 @@
<div class="content select-wrap">
<el-select v-model="devType" class="yc-select" placeholder="Select">
<el-option label="鍏ㄩ儴" :value="0" />
- <el-option label="鍏呮斁鐢典竴浣撴満" :value="1" />
+ <el-option label="鍏呮斁鐢垫祴璇曚华" :value="1" />
<el-option label="鍧囪 娴嬭瘯浠�" :value="2" />
</el-select>
</div>
diff --git a/src/views/alarm/alarmRt.vue b/src/views/alarm/alarmRt.vue
index 31aa498..c750670 100644
--- a/src/views/alarm/alarmRt.vue
+++ b/src/views/alarm/alarmRt.vue
@@ -109,7 +109,7 @@
_list = list.map((v) => {
v.devIdcode = v.devInf.devIdcode;
v.isConfirm = !v.almIsConfirmed ? "鏈‘璁�" : "宸茬‘璁�";
- v.devTypeStr = ["", "鍏呮斁鐢典竴浣撴満", "鍧囪 娴嬭瘯浠�"][v.devInf.devType];
+ v.devTypeStr = ["", "鍏呮斁鐢垫祴璇曚华", "鍧囪 娴嬭瘯浠�"][v.devInf.devType];
return v;
});
}
@@ -192,7 +192,7 @@
placeholder="Select"
>
<el-option label="鍏ㄩ儴" :value="0" />
- <el-option label="鍏呮斁鐢典竴浣撴満" :value="1" />
+ <el-option label="鍏呮斁鐢垫祴璇曚华" :value="1" />
<el-option label="鍧囪 娴嬭瘯浠�" :value="2" />
</el-select>
</div>
diff --git a/src/views/datas/dataHis.vue b/src/views/datas/dataHis.vue
index 0d12503..99ae02b 100644
--- a/src/views/datas/dataHis.vue
+++ b/src/views/datas/dataHis.vue
@@ -280,7 +280,7 @@
size="default"
is-button
>
- <el-radio-button :value="1">鍏呮斁鐢典竴浣撴満</el-radio-button>
+ <el-radio-button :value="1">鍏呮斁鐢垫祴璇曚华</el-radio-button>
<el-radio-button :value="2">鍧囪 娴嬭瘯浠�</el-radio-button>
</el-radio-group>
</div>
diff --git a/src/views/dev/addEdit.vue b/src/views/dev/addEdit.vue
index bed7001..8b7f022 100644
--- a/src/views/dev/addEdit.vue
+++ b/src/views/dev/addEdit.vue
@@ -182,7 +182,7 @@
class=""
placeholder="Select"
>
- <el-option label="鍏呮斁鐢典竴浣撴満" :value="1" />
+ <el-option label="鍏呮斁鐢垫祴璇曚华" :value="1" />
<el-option label="閿傜數鍧囪 浠�" :value="2" />
</el-select>
</el-form-item>
diff --git a/src/views/dev/list.vue b/src/views/dev/list.vue
index c84047d..18235d1 100644
--- a/src/views/dev/list.vue
+++ b/src/views/dev/list.vue
@@ -193,7 +193,7 @@
placeholder="Select"
>
<!-- <el-option label="鍏ㄩ儴" value="" /> -->
- <el-option label="鍏呮斁鐢典竴浣撴満" :value="1" />
+ <el-option label="鍏呮斁鐢垫祴璇曚华" :value="1" />
<el-option label="閿傜數鍧囪 浠�" :value="2" />
</el-select>
</div>
diff --git a/src/views/dev/normal.vue b/src/views/dev/normal.vue
index 6f1cbf8..ff578a3 100644
--- a/src/views/dev/normal.vue
+++ b/src/views/dev/normal.vue
@@ -115,7 +115,7 @@
<div class="value">{{ rtdata.devSum }}</div>
</div>
<div class="item">
- <div class="label">鍏呮斁鐢典竴浣撴満</div>
+ <div class="label">鍏呮斁鐢垫祴璇曚华</div>
<div class="value">{{ rtdata.type[1] }}</div>
</div>
<div class="item">
@@ -142,7 +142,7 @@
size="default"
is-button
>
- <el-radio-button :value="1">鍏呮斁鐢典竴浣撴満</el-radio-button>
+ <el-radio-button :value="1">鍏呮斁鐢垫祴璇曚华</el-radio-button>
<el-radio-button :value="2">鍧囪 娴嬭瘯浠�</el-radio-button>
</el-radio-group>
</div>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index eb17e81..c8b141e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -24,7 +24,7 @@
const map = ref();
const devDatas = computed(() => {
- let labels = ["鍏呮斁鐢典竴浣撴満", "閿傜數姹犲潎琛′华"],
+ let labels = ["鍏呮斁鐢垫祴璇曚华", "閿傜數姹犲潎琛′华"],
datas = [
{ name: "鍦ㄧ嚎", data: [] },
{ name: "绂荤嚎", data: [] },
@@ -177,7 +177,7 @@
// setTimeout(() => {
// alarmPie.value.updateChart([
// {
- // name: "鍏呮斁鐢典竴浣撴満",
+ // name: "鍏呮斁鐢垫祴璇曚华",
// value: 0,
// },
// {
@@ -198,7 +198,7 @@
<div class="card-content">
<div class="info">
<div class="info-item">
- <div class="label">鍏呮斁鐢典竴浣撴満</div>
+ <div class="label">鍏呮斁鐢垫祴璇曚华</div>
<div class="value">
<led-num :bits="4" :num="devDatas.ytjCount"></led-num>
</div>
@@ -239,7 +239,7 @@
</template>
<pie ref="alarmPie"></pie>
</yc-card> -->
- <yc-card class="item" title="鍏呮斁鐢典竴浣撴満娴嬭瘯缁熻">
+ <yc-card class="item" title="鍏呮斁鐢垫祴璇曚华娴嬭瘯缁熻">
<template #tools>
<el-radio-group
v-model="ytjTestType"
@@ -261,7 +261,7 @@
size="small"
is-button
>
- <el-radio-button :value="0">鍏呮斁鐢典竴浣撴満</el-radio-button>
+ <el-radio-button :value="0">鍏呮斁鐢垫祴璇曚华</el-radio-button>
<el-radio-button :value="1">閿傜數鍧囪 浠�</el-radio-button>
</el-radio-group>
</template>
diff --git a/src/views/login/userName.vue b/src/views/login/userName.vue
index fb0e32e..16cc83a 100644
--- a/src/views/login/userName.vue
+++ b/src/views/login/userName.vue
@@ -1,13 +1,12 @@
<script setup>
-import { ref, computed, nextTick } from "vue";
+import { ref, computed, nextTick, onMounted } from "vue";
import { storeToRefs } from "pinia";
import { useUserStore } from "@/stores/user.js";
const userStore = useUserStore();
-const { list } = storeToRefs(userStore);
+const { list, lastUname } = storeToRefs(userStore);
// console.log("list", list.value, "=============");
-const $emit = defineEmits(['set-snid', 'ok', 'cancel-remember']);
-
+const $emit = defineEmits(["set-snid", "ok", "cancel-remember"]);
// 缁戝畾鐨勭敤鎴峰悕
const username = ref("");
@@ -23,7 +22,7 @@
// 閫夋嫨鐢ㄦ埛鍚嶅苟鍥炲啓鍒拌緭鍏ユ
function selectUser(user) {
username.value = user.name;
- $emit('set-snid', user.snId);
+ $emit("set-snid", user.snId);
showDropdown.value = false; // 鍏抽棴涓嬫媺鍒楄〃
}
@@ -35,16 +34,27 @@
}
function test(params) {
- $emit('ok');
+ $emit("ok");
}
function filterUsers() {
// 濡傛灉涓嶆槸璁颁綇瀵嗙爜鍒楄〃涓殑鐢ㄦ埛鍚� 鍒欏彇娑堣浣忓瘑鐮�
- if(!list.value.some(v=>v.name == username.value)) {
- $emit('cancel-remember');
+ if (!list.value.some((v) => v.name == username.value)) {
+ $emit("cancel-remember");
}
}
-defineExpose({username});
+function initUser() {
+ let _name = lastUname.value;
+ username.value = _name;
+ // 濡傛灉鏄浣忓瘑鐮佸垪琛ㄤ腑鐨勭敤鎴峰悕 鍒欏洖鍐欏瘑鐮�
+ if (list.value.some((v) => v.name == _name)) {
+ $emit("set-snid", list.value.find((v) => v.name == _name).snId);
+ }
+}
+onMounted(() => {
+ initUser();
+});
+defineExpose({ username });
</script>
<template>
@@ -64,7 +74,11 @@
</el-input>
<div v-if="showDropdown && filteredUsers.length > 0" class="dropdown">
<ul>
- <li v-for="user in filteredUsers" :key="user.name" @click="selectUser(user)">
+ <li
+ v-for="user in filteredUsers"
+ :key="user.name"
+ @click="selectUser(user)"
+ >
{{ user.name }}
</li>
</ul>
diff --git a/src/views/test/devCard.vue b/src/views/test/devCard.vue
index a8f59c8..a86dc3a 100644
--- a/src/views/test/devCard.vue
+++ b/src/views/test/devCard.vue
@@ -21,13 +21,13 @@
});
const testStates = computed(() => {
- if (1 == props.devType.value) {
- return ["--", "鏀剧數娴嬭瘯", "鍏呯數娴嬭瘯"][currentDev.value.state?.testType];
+ if (1 == props.devType) {
+ return ["--", "鏀剧數娴嬭瘯", "鍏呯數娴嬭瘯"][props.info.state?.testType];
} else {
let states = ["鍏呯數", "鏀剧數", "鍧囪 "];
let [res1, res2] = [0, 1].map((v) =>
- currentDev.value.state
- ? states[currentDev.value.state[v].workMode] || "--"
+ props.info.state
+ ? states[props.info.state[v].workMode] || "--"
: "--"
);
return `缁�1:${res1}, 缁�2: ${res2}`;
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 3e64c04..9a9ab1f 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -202,7 +202,7 @@
size="default"
is-button
>
- <el-radio-button :value="1">鍏呮斁鐢典竴浣撴満</el-radio-button>
+ <el-radio-button :value="1">鍏呮斁鐢垫祴璇曚华</el-radio-button>
<el-radio-button :value="2">鍧囪 娴嬭瘯浠�</el-radio-button>
</el-radio-group>
</div>
@@ -367,7 +367,7 @@
<div class="value">{{ currentDev.devModel }}</div>
<div class="label">璁惧绫诲瀷</div>
<div class="value">
- {{ { 1: "鍏呮斁鐢典竴浣撴満", 2: "鍧囪 娴嬭瘯浠�" }[currentDev.devType] }}
+ {{ { 1: "鍏呮斁鐢垫祴璇曚华", 2: "鍧囪 娴嬭瘯浠�" }[currentDev.devType] }}
</div>
<div class="label">璁惧缂栧彿</div>
<div class="value">{{ currentDev.devIdcode }}</div>
diff --git a/src/views/test/jhyTestDetails.vue b/src/views/test/jhyTestDetails.vue
index 66769a1..0d9613c 100644
--- a/src/views/test/jhyTestDetails.vue
+++ b/src/views/test/jhyTestDetails.vue
@@ -234,7 +234,7 @@
<div class="value">{{ devInfo.devModel }}</div>
<div class="label">璁惧绫诲瀷</div>
<div class="value">
- {{ { 1: "鍏呮斁鐢典竴浣撴満", 2: "鍧囪 娴嬭瘯浠�" }[devInfo.devType] }}
+ {{ { 1: "鍏呮斁鐢垫祴璇曚华", 2: "鍧囪 娴嬭瘯浠�" }[devInfo.devType] }}
</div>
<div class="label">璁惧缂栧彿</div>
<div class="value">{{ devInfo.devIdcode }}</div>
diff --git a/src/views/test/testBatch.vue b/src/views/test/testBatch.vue
index 0202013..923d9ef 100644
--- a/src/views/test/testBatch.vue
+++ b/src/views/test/testBatch.vue
@@ -191,7 +191,7 @@
if (code && data && successList.length) {
$message.success("鎿嶄綔鎴愬姛");
if (failList.length) {
- let failNames = props.devs
+ let failNames = devs.value
.filter((v) => failList.some((vv) => vv == v.devId))
.map((v) => v.devIdcode);
@@ -253,7 +253,7 @@
if (code && data && successList.length) {
$message.success("鎿嶄綔鎴愬姛");
if (failList.length) {
- let failNames = props.devs
+ let failNames = devs.value
.filter((v) => failList.some((vv) => vv == v.devId))
.map((v) => v.devIdcode);
@@ -303,7 +303,7 @@
size="default"
is-button
>
- <el-radio-button :value="1">鍏呮斁鐢典竴浣撴満</el-radio-button>
+ <el-radio-button :value="1">鍏呮斁鐢垫祴璇曚华</el-radio-button>
<el-radio-button :value="2">鍧囪 娴嬭瘯浠�</el-radio-button>
</el-radio-group>
</div>
@@ -462,12 +462,12 @@
<div class="card-content">
<div class="label">璁惧绫诲瀷</div>
<div class="value">
- {{ { 1: "鍏呮斁鐢典竴浣撴満", 2: "鍧囪 娴嬭瘯浠�" }[devType] }}
+ {{ { 1: "鍏呮斁鐢垫祴璇曚华", 2: "鍧囪 娴嬭瘯浠�" }[devType] }}
</div>
<div class="label">宸查�夋嫨璁惧鎬绘暟閲�</div>
<div class="value">{{ selectData[devType].length }}</div>
- <div class="label">鎵归噺娴嬭瘯鐘舵��</div>
- <div class="value">鏈紑濮�</div>
+ <!-- <div class="label">鎵归噺娴嬭瘯鐘舵��</div>
+ <div class="value">鏈紑濮�</div> -->
</div>
</yc-card>
<yc-card class="p-content">
--
Gitblit v1.9.1