Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
<el-collapse-item title="检测进度展示" name="1"> -->
|
||||
<div class="container_pieShow">
|
||||
<el-collapse model-value="1" accordion @change="handleCollapseChange">
|
||||
<el-collapse-item title="    检测计划统计" name="1">
|
||||
<el-collapse-item title="     检测计划统计" name="1">
|
||||
<!-- 饼图 -->
|
||||
<div class="container_charts">
|
||||
<div class="charts_info" ref="chartsInfoRef">
|
||||
@@ -183,17 +183,17 @@ const tabsList = ref([
|
||||
checked: false,
|
||||
},
|
||||
{
|
||||
label: "数据查询",
|
||||
label: "设备归档",
|
||||
value: 4,
|
||||
img: "/src/assets/images/plan/static/4.svg",
|
||||
checked: false,
|
||||
},
|
||||
{
|
||||
label: "数据操作",
|
||||
value: 5,
|
||||
img: "/src/assets/images/plan/static/5.svg",
|
||||
checked: false,
|
||||
},
|
||||
// {
|
||||
// label: "设备归档",
|
||||
// value: 4,
|
||||
// img: "/src/assets/images/plan/static/4.svg",
|
||||
// checked: false,
|
||||
// },
|
||||
]);
|
||||
|
||||
form.value.activeTabs = tabsList.value[0].value;
|
||||
@@ -208,11 +208,16 @@ watch(
|
||||
|
||||
console.log(form.value.activeTabs,111);
|
||||
|
||||
if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档
|
||||
if(form.value.activeTabs === 0 )//设备检测
|
||||
{
|
||||
const tabledata = deviceData.filter((item) => item.document_State === "未归档")
|
||||
tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs,tabledata);
|
||||
}
|
||||
else if(form.value.activeTabs === 4)//设备归档
|
||||
{
|
||||
const tabledata = deviceData.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档")
|
||||
tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs,tabledata);
|
||||
}
|
||||
else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
|
||||
{
|
||||
const tabledata = deviceData.filter((item) => item.check_State === "检测完成");
|
||||
@@ -251,15 +256,15 @@ const chartsData1: any = ref([]),
|
||||
const getPieData = () => {
|
||||
|
||||
chartsData1.value = [
|
||||
{ value: 12, name: "未检测", itemStyle: { color: '#fac858' } },
|
||||
{ value: 12, name: "未检", itemStyle: { color: '#fac858' } },
|
||||
{ value: 0, name: "检测中", itemStyle: { color: '#ee6666' } },
|
||||
{ value: 6, name: "检测完成", itemStyle: { color: '#91cc75' } },
|
||||
{ value: 2, name: "归档", itemStyle: { color: '#5470c6' } },
|
||||
];
|
||||
chartsData2.value = [
|
||||
{ value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
|
||||
{ value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } },
|
||||
{ value: 5, name: "合格", itemStyle: { color: '#91cc75' } },
|
||||
{ value: 12, name: "未检" , itemStyle: { color: '#fac858' } },
|
||||
{ value: 3, name: "不符合" , itemStyle: { color: '#ee6666' } },
|
||||
{ value: 5, name: "符合", itemStyle: { color: '#91cc75' } },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "全部合格", itemStyle: { color: '#91cc75' } },
|
||||
];
|
||||
@@ -268,12 +273,12 @@ const getPieData = () => {
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "已生成报告" },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "未生成报告" },
|
||||
|
||||
{ value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
|
||||
{ value: 12, name: "未检" , itemStyle: { color: '#fac858' } },
|
||||
{ value: 4, name: "未生成" , itemStyle: { color: '#ee6666' } },
|
||||
{ value: 4, name: "已生成", itemStyle: { color: '#91cc75' } },
|
||||
|
||||
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "未检" , itemStyle: { color: '#fac858' } },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项未生成报告" },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "全部合格未生成报告" },
|
||||
// { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项已生成报告" },
|
||||
@@ -631,6 +636,11 @@ onUnmounted(() => {
|
||||
}
|
||||
}
|
||||
}
|
||||
:deep(.el-collapse-item__header){
|
||||
color: var(--el-color-primary);
|
||||
font-size: 14px;
|
||||
font-family: "Microsoft YaHei", "微软雅黑", "Arial", sans-serif;
|
||||
}
|
||||
:deep(.el-collapse-item__conten){
|
||||
// background-color:#f6f6f6;
|
||||
padding-bottom: 0px !important;
|
||||
|
||||
Reference in New Issue
Block a user