admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
kun 2024-07-08 14:38:01 +08:00
commit ccf85d8e9b
4 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/styles/element.scss
View File

@ -371,4 +371,8 @@
.el-pagination.is-background .el-pager li:not(.is-disabled).is-active {
background-color: #262d47 !important;
color: #fff;
}
.el-popper.is-dark {
max-width: 500px;
}

5
src/views/commandScreen/commandCenter/leftBottom.vue
View File

@ -152,7 +152,7 @@ s
</template>
<script setup lang="ts">
import { onMounted, ref, reactive } from "vue";
import { onMounted, ref, reactive, nextTick } from "vue";
import * as echarts from "echarts";
// import ECharts from "vue-echarts";
import { selectQualityStatisticsApi } from "@/api/modules/projectOverview";
@ -327,7 +327,6 @@ const handleTab = (val: number) => {
activeIfo.activeIndex = val;
queryAttendanceOfEachCompany(false);
} else if (activeIfo.activeIndex == 0) {
activeIfo.activeIndex = val;
getWorkerRiskByProject(false, 1);
}
};
@ -547,7 +546,7 @@ const getWorkerRiskByProject = async (showLoading: boolean, val: number) => {
];
randerInfo.titleInfo.percentage = res.result.area;
}
// activeIfo.activeIndex = val;
activeIfo.activeIndex = val;
};
const setIntervalFn = (showLoading: boolean) => {

24
src/views/commandScreen/dialogCompnnents/major-hidder.vue
View File

@ -981,18 +981,18 @@ onMounted(async () => {
// drawEchart3();
// await getCompanyList();
// await getMemberCountList("search");
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// 向上加载更多
if (scrollTop >= scrollHeight - clientHeight - 1) {
if (moreScroll.value) {
// getMemberCountList("more");
getXzSecurityQualitylnspectionRecordlist("more");
}
}
});
// refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// const scrollTop = e.target.scrollTop;
// const scrollHeight = e.target.scrollHeight;
// const clientHeight = e.target.clientHeight;
// // 向上加载更多
// if (scrollTop >= scrollHeight - clientHeight - 1) {
// if (moreScroll.value) {
// // getMemberCountList("more");
// getXzSecurityQualitylnspectionRecordlist("more");
// }
// }
// });
});
</script>

32
src/views/commandScreen/dialogCompnnents/risk-count.vue
View File

@ -53,17 +53,11 @@
<div>{{ index + 1 }}</div>
<div>{{ item.problemDescription }}</div>
<div>
<el-tooltip class="box-item" effect="dark" :content="item.remark" placement="top-start">
<span>{{item.remark}}</span>
<el-tooltip :hide-after="500" class="box-item" effect="dark" :content="item.remark" placement="top-start">
<span>{{ item.remark }}</span>
</el-tooltip>
</div>
<div>{{ item.level == 1
? "重大"
: item.level == 2
? "较大"
: item.level == 3
? "一般"
: "低" }}</div>
<div>{{ item.level == 1 ? "重大" : item.level == 2 ? "较大" : item.level == 3 ? "一般" : "低" }}</div>
<div>{{ item.inspectTime }}</div>
</div>
<div class="notoDta" v-if="partyMemberList.length == 0">
@ -72,14 +66,14 @@
</div>
</el-scrollbar>
<el-pagination
v-if="partyMemberList.length != 0"
background
:page-size="10"
style="justify-content: center"
@current-change="onCurrentChange"
layout="prev, pager, next"
:total="total"
/>
v-if="partyMemberList.length != 0"
background
:page-size="10"
style="justify-content: center"
@current-change="onCurrentChange"
layout="prev, pager, next"
:total="total"
/>
</div>
</div>
</div>
@ -107,7 +101,7 @@ const searchForm = ref({
});
const checked = ref(1);
const partyMemberList = ref({} as any);
const statisticsData = ref({} as any)
const statisticsData = ref({} as any);
const changeSelect = (index: any) => {
checked.value = index;
};
@ -288,7 +282,7 @@ onMounted(async () => {
}
}
}
.radio-content{
.radio-content {
margin-top: 2%;
:deep(.el-radio) {
.el-radio__label {