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

Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

Browse Source
This commit is contained in:
sjl
2024-12-11 19:39:16 +08:00
parent 5dbd6eb8be 167716e61b
commit cbc11f636a
12 changed files with 340 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
frontend/src/views/home/components/table.vue
View File

@@ -21,7 +21,7 @@
<el-form-item label="关键字">
<el-input v-model="form.search" placeholder="请输入设备名称、类型"></el-input>
</el-form-item>
<el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 5">
<el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 4 && form.activeTabs != 5">
<el-select v-model="form.checkStatus" clearable>
<el-option
v-for="(item, index) in checkStatusList"
@@ -45,7 +45,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="报告状态" v-if="form.activeTabs != 0 && form.activeTabs != 4">
<el-form-item label="报告状态" v-if="form.activeTabs != 0">
<el-select v-model="form.checkReportStatus" clearable>
<el-option
v-for="(item, index) in checkReportStatusList"
@@ -110,12 +110,10 @@
>
<!-- :disabled="!scope.isSelected || scope.selectedList.filter((item) => item.check_State === '检测完成').length === 0" -->
<el-button type="primary" :icon="Notebook" @click="handleTest('批量归档')" v-if="form.activeTabs === 0"
>归档</el-button
>
<el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
>设备新增</el-button
>
<el-button type="primary" :icon="Notebook" @click="handleTest('批量归档')" v-if="form.activeTabs === 4"
>归档</el-button>
<!-- <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
>设备新增</el-button> -->
</el-form-item>
</el-form>
@@ -130,7 +128,17 @@
v-if="form.activeTabs === 3 && form.activeChildTabs === 1"
>查看</el-button
>
<div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
<el-button
type="primary"
link
:icon="Download"
@click="openDrawer('报告下载', scope.row)"
v-if="form.activeTabs === 3 && form.activeChildTabs === 0"
>报告下载</el-button
>
<!-- <div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
<el-dropdown trigger='click'>
<el-button link type='primary' :icon="Download" class='table-operate'>
<div class='table-operate-text'>报告下载</div>
@@ -143,7 +151,7 @@
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
</div> -->
<el-button
type="primary"
@@ -166,7 +174,7 @@
link
:icon="Notebook"
@click="openDrawer('归档', scope.row)"
v-if="form.activeTabs === 0"
v-if="form.activeTabs === 4"
:disabled = "scope.row.check_State != '检测完成'"
>归档</el-button
>
@@ -183,9 +191,24 @@
link
:icon="Switch"
@click="openDrawer('误差体系更换', scope.row)"
v-if="form.activeTabs === 5"
v-if="form.activeTabs === 5 && scope.row.document_State === '已归档'"
>误差体系更换</el-button
>
<div class='cn-render-buttons' v-if="form.activeTabs === 5 && scope.row.document_State === '已归档'">
<el-dropdown trigger='click'>
<el-button link type='primary' :icon="Download" class='table-operate'>
<div class='table-operate-text'>报告下载</div>
</el-button>
<template #dropdown>
<el-dropdown-menu>
<!-- <el-dropdown-item>Q/GDW 10650.2-2021 报告</el-dropdown-item> -->
<el-dropdown-item>Q/GDW 1650.2-2016 报告</el-dropdown-item>
<el-dropdown-item>GBT 19862-2016 报告</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
<!-- <el-button
dictType="primary"
link
@@ -286,7 +309,7 @@ const selectionShow = ref(true);
//检测状态数据
let checkStatusList = reactive([
{
label: "未检测",
label: "未检",
value: 0,
disabled: false,
},
@@ -309,7 +332,7 @@ let checkStatusList = reactive([
//检测报告状态数据
let checkReportStatusList = reactive([
{
label: "未检测",
label: "未检",
value: 0,
disabled: false,
},
@@ -327,17 +350,17 @@ let checkReportStatusList = reactive([
//检测结果数组
let checkResultList = reactive([
{
label: "未检测",
label: "未检",
value: 0,
disabled: false,
},
{
label: "不合格",
label: "不符合",
value: 1,
disabled: false,
},
{
label: "合格",
label: "符合",
value: 2,
disabled: false,
},
@@ -434,7 +457,7 @@ const columns = reactive([
minWidth: 100,
sortable:true,
render: (scope) => {
if(scope.row.check_Result === '不合格')
if(scope.row.check_Result === '不符合')
{
return (
<el-tag type='danger'>{ scope.row.check_Result }</el-tag>
@@ -553,7 +576,7 @@ const columns = reactive([
// width: 120,
// render: (scope) => {
// return scope.row.checkStatus == 1
// ? "未检测"
// ? "未检"
// : scope.row.checkStatus == 2
// ? "检测中"
// : scope.row.checkStatus == 3
@@ -636,7 +659,7 @@ const handleSelectionChange = (selection: any[]) => {
}
devTestedNum = selection.filter((item) => item.check_State === '检测完成').length;
const result = selection.filter((item) => item.check_Result != "不合格")
const result = selection.filter((item) => item.check_Result != "不符合")
if(result.length > 0)
{
testType= "test";
@@ -650,10 +673,14 @@ const handleSelectionChange = (selection: any[]) => {
//查询
const handleSearch = () => {
if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档
if(form.value.activeTabs === 0)//设备检测、设备归档
{
deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.document_State === "未归档")
}
else if(form.value.activeTabs === 4)
{
deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档");
}
else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
{
deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成");
@@ -668,11 +695,14 @@ const handleRefresh = () => {
form.value.checkResult = null;
form.value.checkReportStatus = null;
if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档
if(form.value.activeTabs === 0)//设备检测、设备归档
{
deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.document_State === "未归档")
}
else if(form.value.activeTabs === 4)
{
deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档");
}
else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
{
deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成");
@@ -691,42 +721,7 @@ const sortTable = ({
ElMessage.success("修改列表排序成功");
};
// 删除用户信息
const deleteAccount = async (params: User.ResUserList) => {
await useHandleData(
deleteUser,
{ id: [params.id] },
`删除【${params.username}】`
);
proTable.value?.getTableList();
};
// 批量删除用户信息
const batchDelete = async (id: string[]) => {
await useHandleData(deleteUser, { id }, "删除所选用户信息");
proTable.value?.clearSelection();
proTable.value?.getTableList();
};
// 重置用户密码
const resetPass = async (params: User.ResUserList) => {
await useHandleData(
resetUserPassWord,
{ id: params.id },
`重置【${params.username}】用户密码`
);
proTable.value?.getTableList();
};
// 切换用户状态
const changeStatus = async (row: User.ResUserList) => {
await useHandleData(
changeUserStatus,
{ id: row.id, status: row.status == 1 ? 0 : 1 },
`切换【${row.username}】用户状态`
);
proTable.value?.getTableList();
};
//顶部功能切换时修改activeTabs
const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
form.value.activeTabs = val;
@@ -745,9 +740,9 @@ function tableHeaderInit(val: number) {
//disableCheckStatus("检测中")
disableCheckStatus("归档")
// operationShow.value = false;
columns[columns.length - 1].minWidth = 100;
// columns[columns.length - 1].minWidth = 100;
tableKey.value ++;
operationShow.value = true;
operationShow.value = false;
documentStateShow.value = false;
checkStateShow.value = true;
selectionShow.value = true;
@@ -756,7 +751,7 @@ function tableHeaderInit(val: number) {
// form.value.checkStatus = 2;//检测状态默认为检测完成
// form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
// form.value.checkResult = 1;//检测结果默认为不合格
// disableCheckStatus("未检测")
// disableCheckStatus("未检")
// disableCheckStatus("检测中")
// disableCheckStatus("归档")
// disablecheckResultList("未出结果")
@@ -766,11 +761,11 @@ function tableHeaderInit(val: number) {
// form.value.checkStatus = 2;//检测状态默认为检测完成
// form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
// form.value.checkResult = 2;//检测结果默认为合格
// disableCheckStatus("未检测")
// disableCheckStatus("未检")
// disableCheckStatus("检测中")
// disableCheckStatus("归档")
disablecheckResultList("未检测")
disableCheckReportStatus("未检测")
disablecheckResultList("未检")
disableCheckReportStatus("未检")
columns[columns.length - 1].minWidth = 180;
tableKey.value += 1;
operationShow.value = true;
@@ -782,22 +777,22 @@ function tableHeaderInit(val: number) {
// form.value.checkStatus = 2;//检测状态默认为检测完成
// form.value.checkReportStatus = 1;//检测报告状态默认为已生成报告
// form.value.checkResult = 2;//检测结果默认为合格
// disableCheckStatus("未检测")
// disableCheckStatus("未检")
// disableCheckStatus("检测中")
// disableCheckStatus("归档")
disableCheckReportStatus("未生成报告")
disablecheckResultList("未出结果")
disablecheckResultList("未检")
disableCheckReportStatus("未检")
columns[columns.length - 1].minWidth = 100;
tableKey.value ++;
tableKey.value += 1;
operationShow.value = true;
documentStateShow.value = true;
documentStateShow.value = false;
checkStateShow.value = false;
selectionShow.value = true;
break;
case 5://数据查询
disablecheckResultList("未检测")
disableCheckReportStatus("未检测")
columns[columns.length - 1].minWidth = 250;
disablecheckResultList("未检")
disableCheckReportStatus("未检")
columns[columns.length - 1].minWidth = 290;
operationShow.value = true;
documentStateShow.value = true;
checkStateShow.value = false;