ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source
This commit is contained in:
caozehui
2025-03-08 16:02:09 +08:00
parent 537f5e2f4c 6cf5da5d48
commit 59a24c9ea2
5 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/config/index.ts
View File

@@ -1,9 +1,9 @@
// ? 全局默认配置项
// 首页地址（默认）
// export const HOME_URL: string = "/home/index";
export const HOME_URL: string = "/home/index";
export const HOME_URL: string = "/machine/controlSource";
// export const HOME_URL: string = "/machine/controlSource";
// 登录页地址（默认）
export const LOGIN_URL: string = "/login";

66
frontend/src/layouts/components/Header/components/Avatar.vue
View File

@@ -1,38 +1,38 @@
<template>
<div class="userInfo">
<div class="icon">
<Avatar/>
</div>
<div class="username">
{{ username }}
</div>
</div>
<!-- <el-dropdown trigger="click">-->
<!-- <div class="userInfo"> -->
<!-- <div class="icon">-->
<!-- <Avatar />-->
<!-- </div>-->
<!-- <div class="username">-->
<!-- {{ username }}-->
<!-- </div>-->
<!-- <div class="userInfo">-->
<!-- <div class="icon">-->
<!-- <Avatar/>-->
<!-- </div>-->
<!-- <template #dropdown>-->
<!-- <el-dropdown-menu>-->
<!-- <el-dropdown-item @click="openDialog('infoRef')">-->
<!-- <el-icon><User /></el-icon>{{ $t("header.personalData") }}-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item @click="openDialog('passwordRef')">-->
<!-- <el-icon><Edit /></el-icon>{{ $t("header.changePassword") }}-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item @click="changeMode">-->
<!-- <el-icon><Edit /></el-icon>{{ $t("header.changeMode") }}-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item @click="openDialog('versionRegisterRef')">-->
<!-- <el-icon><SetUp /></el-icon>{{ $t("header.versionRegister") }}-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </template>-->
<!-- </el-dropdown>-->
<!-- <div class="username">-->
<!-- {{ username }}-->
<!-- </div>-->
<!-- </div>-->
<el-dropdown trigger="click">
<div class="userInfo">
<div class="icon">
<Avatar />
</div>
<div class="username">
{{ username }}
</div>
</div>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="openDialog('infoRef')">
<el-icon><User /></el-icon>{{ $t("header.personalData") }}
</el-dropdown-item>
<el-dropdown-item @click="openDialog('passwordRef')">
<el-icon><Edit /></el-icon>{{ $t("header.changePassword") }}
</el-dropdown-item>
<el-dropdown-item @click="changeMode">
<el-icon><Edit /></el-icon>{{ $t("header.changeMode") }}
</el-dropdown-item>
<el-dropdown-item @click="openDialog('versionRegisterRef')">
<el-icon><SetUp /></el-icon>{{ $t("header.versionRegister") }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<div class="avatar">
<img src="@/assets/icons/out_login.svg" alt="avatar" @click="logout" />
</div>

7
frontend/src/views/login/components/LoginForm.vue
View File

@@ -6,7 +6,7 @@
size='large'
>
<el-form-item prop='username'>
<el-input v-model='loginForm.username' placeholder='用户名' disabled>
<el-input v-model='loginForm.username' placeholder='用户名'>
<template #prefix>
<el-icon class='el-input__icon'>
<user />
@@ -21,7 +21,6 @@
placeholder='密码'
show-password
autocomplete='new-password'
disabled
>
<template #prefix>
<el-icon class='el-input__icon'>
@@ -88,8 +87,8 @@ const loginRules = reactive({
const loading = ref(false)
const loginForm = reactive<Login.ReqLoginForm>({
username: 'user',
password: 'user12345.',
username: '',
password: '',
})
// login

6
frontend/src/views/machine/controlSource/index.vue
View File

@@ -75,7 +75,7 @@ const formContent = ref<TestScript.ResTestScript>({
state: 1
})
const connectDisabeld = ref(false)
const startDisabeld = ref(false)
const startDisabeld = ref(true)
const pauseDisabled = ref(true)
const controlContent = ref<controlSource.ResControl>({
@@ -179,9 +179,13 @@ watch(webMsgSend, function (newValue, oldValue) {
case 'INIT_GATHER':
if (newValue.code == 10200) {
ElMessage.success('源连接成功!')
startDisabeld.value = false
pauseDisabled.value = false
} else if(newValue.code !== 10201) {
ElMessage.error('源连接失败!')
console.log('错误信息:',webMsgSend)
startDisabeld.value = true
pauseDisabled.value = true
}
break;

26
frontend/src/views/machine/testSource/components/parameterTable.vue
View File

@@ -6,9 +6,9 @@
:pagination="false"
:toolButton="false"
:data="tableData"
:row-key="id"
row-key="id"
:style="{ height: '250px',maxHeight: '400px',overflow:'hidden'}"
:expand-row-keys="['0']"
>
<!-- 表格 header 按钮 -->
<template #tableHeader='scope'>
@@ -70,6 +70,28 @@ watch(() => props.parameterStr, (newData) => {
}
})
const defaultExpandRowKeys =computed(() => {
return '548c00d2e4744c38aee938cb08e2ff3b'
})
const getDefaultKey = (data: any[]) => {
if (!data || data.length === 0) {
return [];
}
const firstElement = data[0];
return findFirstLeafNode(firstElement);
}
const findFirstLeafNode = (node: any): any => {
if (!node.children || node.children.length === 0) {
return node.id;
}
return findFirstLeafNode(node.children[0]);
}
const getTableList = () => {
if (props.parameterStr) {
originalParameterArr = JSON.parse(props.parameterStr)