shenzhen-dev #2

Merged
admin merged 614 commits from shenzhen-dev into master 2025-06-03 18:28:43 +08:00
24 changed files with 126 additions and 271 deletions
Showing only changes of commit 2736ef511c - Show all commits

View File

@ -92,8 +92,11 @@ export const getXzSecurityQualitylnspectionRecordSuperviseApi = (params: {}) =>
};
// 隐患智能分析
// export const getNoticeListApi = (params: {}, showLoading: boolean) => {
// return http.post(BASEURL + `/xmgl/notice/list`, params, { headers: { noLoading: showLoading } });
// };
export const getNoticeListApi = (params: {}, showLoading: boolean) => {
return http.post(BASEURL + `/xmgl/notice/list`, params, { headers: { noLoading: showLoading } });
return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/list`, params, { headers: { noLoading: showLoading } });
};
// 安全问题统计数据|列表

View File

@ -47,6 +47,7 @@
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4">未核验</div>
<div class="itemHeadInner6" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
<div class="itemHeadInner3" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 6">已撤回</div>
<div class="itemHeadInner2" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 7">超期未关闭</div>
</div>
<div v-if="JSON.parse(item.payload).level">
<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
@ -93,6 +94,7 @@
<div class="itemHeadInner5" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 4">未核验</div>
<div class="itemHeadInner6" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 5">合格</div>
<div class="itemHeadInner3" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 6">已撤回</div>
<div class="itemHeadInner2" style="margin-right: 10px" v-if="JSON.parse(item.payload).status === 7">超期未关闭</div>
</div>
<div v-if="JSON.parse(item.payload).level">
<div class="itemHeadInner1" v-if="JSON.parse(item.payload).level === 1">重大风险</div>
@ -140,33 +142,35 @@ import * as echarts from "echarts";
import { GlobalStore } from "@/stores";
const store = GlobalStore();
let listData = ref([
// { header: '', type: 1, content: '...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: '', type: 1, content: '...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: '', type: 1, content: '...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: '', type: 1, content: '...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: '', type: 1, content: '...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: '', type: 1, content: '...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
// { header: 'AI', type: 3, content: '1#60%...', startTime: '2024-04-01', endTime: "2024-04-20" },
]);
let listData = ref([]);
const getNoticeList = async (showLoading: boolean) => {
// const res: any = await getNoticeListApi({ projectSn: store.sn, type: 10, pageNo: 1, pageSize: 99999, });
// const res: any = await getNoticeListApi({ isBigScreen: 1, type: 32 }); //
const res: any = await getNoticeListApi({ isBigScreen: 1, type: 31 }, showLoading);
console.log("隐患智能分析", res);
listData.value = res.result.records;
const res: any = await getNoticeListApi({ orderBy: 2, projectSn: store.sn, status:60 }, showLoading);
// listData.value = res.result.records;
// listData.value = res.result.page.records;
listData.value = res.result.page.records.map((item: any) => {
let statusMsg1 = item.status == 2 ? "未整改":
item.status == 3 ? "未复查":
item.status == 4 ? "未核验":
// item.status == 5 ? "":
// item.status == 6 ? "":
item.status == 7 ? "超期未整改":""
let statusMsg2 = item.status == 2 ? "整改!":
item.status == 3 ? "复查!":
item.status == 4 ? "核验!":
// item.status == 5 ? "":
// item.status == 6 ? "":
item.status == 7 ? "整改!":""
let tempMsg = item.enterpriseName + "的" + item.regionName + "责任区域内有一条" + item.dangerItemContent + "的隐患"
+ statusMsg1 + ",请注意监督" + statusMsg2
return {
msg:tempMsg,
payload: JSON.stringify({status:item.status, level:item.level, time:item.createTime})
}
})
// listData.value.push({
// accountId:"1779721457571291137",
// id:"1789601398432559107",
@ -179,7 +183,6 @@ const getNoticeList = async (showLoading: boolean) => {
// type: "31",
// })
console.log("================center================", listData.value);
};
const dataListAlarm = ref([]);
const pageInfo = reactive({
@ -203,53 +206,7 @@ const onPageMess = () => {
};
//
function getMessEchart() {
console.log("我是应急处置11");
const echartsTest = echarts.init(document.getElementById("eacherMess"));
// pageInfo.dataListAlarmPage = spArr(
// [
// {
// name: "1",
// type: "line",
// stack: "Total",
// smooth: true,
// symbol: "none",
// data: [120, 132, 101, 134, 90, 230, 210]
// },
// {
// name: "2",
// type: "line",
// stack: "Total",
// smooth: true,
// symbol: "none",
// data: [120, 99, 101, 78, 90, 230, 210]
// },
// {
// name: "3",
// type: "line",
// stack: "Total",
// smooth: true,
// symbol: "none",
// data: [120, 57, 101, 134, 78, 230, 210]
// },
// {
// name: "4",
// type: "line",
// stack: "Total",
// smooth: true,
// symbol: "none",
// data: [120, 42, 42, 14, 90, 230, 210]
// },
// {
// name: "5",
// type: "line",
// stack: "Total",
// smooth: true,
// symbol: "none",
// data: [120, 42, 42, 14, 90, 230, 210]
// }
// ],
// 4
// );
const dataList = pageInfo.dataListAlarmPage[pageInfo.page];
let option = {
tooltip: {
@ -352,10 +309,8 @@ function getMessEchart() {
};
echartsTest.setOption(option, true);
window.addEventListener("resize", () => {
console.log(echartsTest);
echartsTest.resize();
});
console.log(echartsTest);
}
function Pie() {
@ -500,7 +455,6 @@ function getMessCountEchart() {
}
}),
formatter: function (params: any) {
console.log("333333", messCountType.value.data);
// let val = "";
// if (params.length > 4) {
// val = params.substr(0, 5) + "...";
@ -671,7 +625,6 @@ const getMessCountEchartType = async (showLoading: boolean) => {
projectSn: store.sn,
type: 1
},showLoading);
console.log("应急统计图", res);
messCountType.value.data = res.result.data.map((item: any) => {
return {
...item,
@ -696,7 +649,6 @@ const getCountAlarmNumByEnterprise = async (showLoading: boolean) => {
type: 1
},showLoading);
dataListAlarm.value = res.result.reduce((prev: any[], item: any) => {
console.log("1111", prev);
item.list.forEach((ele: any) => {
const findIndex = prev.findIndex((option: any) => option.enterpriseId == ele.enterpriseId);
if (findIndex == -1) {
@ -720,7 +672,6 @@ const getCountAlarmNumByEnterprise = async (showLoading: boolean) => {
});
pageInfo.dataListAlarmPage = spArr(dataList, 4);
pageInfo.dataListAlarm = res.result;
console.log("应急处置统计图", res);
getMessEchart();
};
const setIntervalFn = (showLoading: boolean) => {

View File

@ -141,7 +141,6 @@ const openDialogData = (obj: any) => {
watch(
() => props.projectData,
newVal => {
// console.log(newVal, "newVal");
if (newVal) {
// props.xData = newVal;
projectData.value = newVal;
@ -573,10 +572,8 @@ const getVideoList = async (showLoading: boolean) => {
},
showLoading
);
console.log(res, "445566");
if (res.result && res.result.extend1) {
videoList.value = JSON.parse(res.result.extend1).result.videoList;
console.log(videoList.value, "112233");
// 使
setTimeout(() => {
// video
@ -608,7 +605,6 @@ let statScore = ref({
//centerTop
const getStatScore = async (showLoading: boolean) => {
const res = await getStatScoreApi({ projectSn: store.sn }, showLoading);
console.log("获取项目信息6666666666666666666666666666666666", res);
statScore.value = res.result;
drawAqWater()
@ -638,7 +634,6 @@ function activeBtn(item: any) {
tabIndex.value = item.id;
}
showVideo.value = item.id;
console.log(showVideo.value);
}
const uploadFail = () => {
@ -673,7 +668,6 @@ function getQueryBySnData(showLoading: boolean) {
},
showLoading
).then((res: any) => {
console.log(res, "效果图");
if (res.result) {
picUrl.value = res.result.configValue;
}
@ -685,7 +679,6 @@ function saveOrDeleteVideo(url) {
projectSn: store.sn,
videoUrl: url
}).then(res => {
console.log("保存成功", res);
uploadSuccess(); //""
projectData.value.videoUrl = url;
});

View File

@ -16,7 +16,6 @@ export default {
};
},
mounted: function () {
console.log(this.videoUrls, this.deviceIp, this.autoPlay, this.name, 666);
this.player = document.getElementById("videoItem" + this.name);
//使srs.sdk.js
this.rtcPlayer = new Srs.SrsRtcWhipWhepAsync();
@ -32,7 +31,6 @@ export default {
watch: {
// watch
videoUrls(newVal,oldVal) {
console.log(newVal)
this.rtcPlayer = new Srs.SrsRtcWhipWhepAsync();
this.rtcPlayer.play(newVal);
this.player.srcObject = this.rtcPlayer.stream;

View File

@ -34,9 +34,7 @@ const store = GlobalStore();
//
const partyBuildRef = ref();
const openPeopleCountDialog = (index: any) => {
console.log("~~~~~~~~~~~~~~", index);
partyBuildRef.value.openDialog(index);
// console.log(partyBuildRef.value);
};
const options = {
connectTimeout: 40000,
@ -50,22 +48,17 @@ const mqttMSG = () => {
// this.userId = this.$store.state.userInfo.userId;
// this.topicName = this.$store.state.userInfo.scope;
const client = mqtt.connect("ws://jxj.zhgdyun.com:8083/mqtt", options);
console.log("11111111~~~~~~~~~~~", client);
// mqtt +"/#" +workerId
client.on("connect", () => {
// console.log(':', this.topicName + this.userId)
// this.topicName + this.userId
client.subscribe("zjsjTopic" + store.userId + "/bigScreen/emergency/alert", { qos: 0 }, (error: any) => {
if (!error) {
console.log("订阅成功123");
} else {
console.log("订阅失败");
}
});
});
//
client.on("message", (topic: any, message: any) => {
console.log("~~~~~~~", topic, JSON.parse(message));
const result = JSON.parse(message);
openPeopleCountDialog({
index: 10,
@ -78,11 +71,9 @@ const mqttMSG = () => {
});
//
// client.on("reconnect", (error) => {
// console.log(":", error);
// });
//
client.on("error", (error: any) => {
console.log("连接失败:", error);
});
};
onMounted(() => {

View File

@ -341,7 +341,6 @@ function drawEchart2() {
};
echartsTest.setOption(option, true);
// window.addEventListener("resize", () => {
// console.log(666)
// echartsTest.resize();
// })
}

View File

@ -153,7 +153,6 @@ const getPersonList = async () => {
if (res.result) {
dataList2.value[1].value = res.result.personType.toaltPerson.totalPerson;
dataList2.value[2].value = res.result.personType.toaltPerson.totalPerson;
console.log("安全教育智能分析666", res);
drawEchart2();
}
};
@ -169,7 +168,6 @@ const getMemberJobStatusFn = async () => {
requestData.inspectTime_end = dateRange.value[1];
}
const res: any = await getMemberJobStatusApi(requestData);
console.log("人员履职情况res--整改人", res);
if (res.result) {
tabList.value = res.result.records;
} else {
@ -188,7 +186,6 @@ const getInspectManStatusFn = async () => {
requestData.inspectTime_end = dateRange.value[1];
}
const res: any = await getInspectManStatusApi(requestData);
console.log("人员履职情况res--检查人", res);
if (res.result) {
tabList.value = res.result.records;
} else {
@ -207,7 +204,6 @@ const getEnterpriseStatusFn = async () => {
requestData.inspectTime_end = dateRange.value[1];
}
const res: any = await getEnterpriseStatusApi(requestData);
console.log("人员履职情况res--按分包单位分析", res);
if (res.result) {
tabList.value = res.result.records;
} else {
@ -216,7 +212,6 @@ const getEnterpriseStatusFn = async () => {
};
const handleClick = (tab: TabsPaneContext, event: Event) => {
activeIndex.value = tab.index;
console.log(tab);
if (tab.index == "0") {
getMemberJobStatusFn();
} else if (tab.index == "1") {
@ -224,7 +219,6 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
} else if (tab.index == "2") {
getEnterpriseStatusFn();
}
console.log("activeIndex", activeIndex.value);
};
function Pie() {
let dataArr = [];
@ -335,13 +329,11 @@ function drawEchart2() {
}
}),
formatter: function (data) {
console.log(data, 666777);
if (dataList2.value && dataList2.value.length) {
for (var i = 0; i < dataList2.value.length; i++) {
if (data === dataList2.value[i].name) {
var value = dataList2.value[i].value;
var percentage = value + "%";
console.log(value, 888);
if (data == "未教育人员") {
return "{name| " + data + "} {gap| }" + "{value1|" + value + " " + "}";
} else if (data == "完成人员") {
@ -498,7 +490,6 @@ function drawEchart2() {
};
echartsTest.setOption(option, true);
// window.addEventListener("resize", () => {
// console.log(666)
// echartsTest.resize();
// })
}

View File

@ -167,7 +167,6 @@ const getPersonTypeAndEduStatistics = async (showLoading: boolean) => {
showLoading
);
if (res.result) {
console.log("出勤人员数据/考勤日环比", res);
totalPerson.value = res.result.personType.attendancePerson.totalPerson;
// if(totalPerson.value.length < 4){
// let temp = 4-totalPerson.value.length
@ -194,7 +193,6 @@ const queryAttendanceOfEachCompany = async (showLoading: boolean) => {
showLoading
);
if (res.result) {
console.log("获取总包出勤情况分析数据", res);
projectCompanyWorkTotalList.value = res.result.projectCompanyWorkTotalList;
xData.value = projectCompanyWorkTotalList.value.map(item => item.enterpriseName.substring(0, 4));
yData.value = projectCompanyWorkTotalList.value.map(item => item.attendancePersonNum);
@ -214,7 +212,6 @@ const handleTab = (val: string) => {
//
function drawBar() {
console.log("---------------------bar--------");
type EChartsOption = echarts.EChartsOption;
var chartDom = document.getElementById("bar")!;
var myChart = echarts.init(chartDom);
@ -316,8 +313,6 @@ function drawBar() {
if(attendanceRhbRate == 0) attendanceRhbRate = "0%"
// attendanceRhbRate = attendanceRhbRate + "%";
}
console.log(params);
console.log(123123, projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate);
return (
'<div style="font-weight:bold">' +
params.name +
@ -381,7 +376,6 @@ const getCountTaskProgress = async (showLoading: boolean) => {
showLoading
);
if (res.result) {
console.log("项目总进度/项目剩余天数", res);
projectTotalProgress.value = res.result.projectTotalProgress + "";
projectSurplusDayNum.value = res.result.projectSurplusDayNum + "";
}
@ -398,7 +392,6 @@ const queryCountEnterprise = async (showLoading: boolean) => {
showLoading
);
if (res.result) {
console.log("总包进度列表", res);
processList.value = res.result;
}
};

View File

@ -92,7 +92,6 @@ let dateRange = ref([] as any);
const handleClick = (tab: TabsPaneContext, event: Event) => {
activeIndex.value = tab.index;
console.log("activeIndex", activeIndex.value);
};
const tabList = [
{ sortLine: "1", name: "谢明泉", count: "2", rate: "100%", immediateRate: "100%",company:'分包单位' },

View File

@ -128,8 +128,6 @@ const projectTypeEnum = async (showLoading: boolean) => {
//
const getProjectInfo = async (showLoading: boolean) => {
const res = await getProjectDetail({ projectSn: store.sn }, showLoading);
console.log("获取项目信息666", res);
// console.log("", projectTypeEnum);
projectData.value = res.result;
};
const setIntervalFn = (showLoading: boolean) => {

View File

@ -187,7 +187,6 @@ const emits = defineEmits(["openDialog"]);
//
const openDialogData = (obj: any) => {
console.log("111111111111");
emits("openDialog", obj);
};
@ -198,19 +197,7 @@ let majorDangerRate = ref(0 as any);
let overdueMajorDangerCount = ref(0 as any);
let overdueMajorDangerRate = ref(0 as any);
let listData2 = ref([
// { title: '', type: 1, msg: '...' },
// { title: '', type: 2, msg: '...' },
// { title: '', type: 1, msg: '...' },
// { title: '', type: 2, msg: '...' },
// { title: '', type: 1, msg: '...' },
// { title: '', type: 2, msg: '...' },
// { title: '', type: 1, msg: '...' },
// { title: '', type: 2, msg: '...' },
// { title: '', type: 1, msg: '...' },
// { title: '', type: 2, msg: '...' },
// { title: '', type: 1, msg: '...' },
]);
let listData2 = ref([]);
let dataList = ref([
{
@ -616,14 +603,11 @@ function drawEchart() {
};
echartsTest.value.setOption(option, true);
window.addEventListener("resize", () => {
console.log(echartsTest);
echartsTest.value.resize();
});
console.log(echartsTest.value);
//
// echartsTest.value.on("legendselectchanged", (params: any) => {
// console.log(emits);
// echartsTest.value.setOption({
// legend: { selected: { [params.name]: true } }
// });
@ -645,7 +629,6 @@ function drawEchart() {
const riskList = ref([]);
//
function getRiskEchart() {
console.log("我是风险走势图11");
const echartsTest = echarts.init(document.getElementById("eacherRisk"));
let option = {
tooltip: {
@ -774,14 +757,11 @@ function getRiskEchart() {
};
echartsTest.setOption(option, true);
window.addEventListener("resize", () => {
console.log(echartsTest);
echartsTest.resize();
});
console.log(echartsTest);
//
// echartsTest.value.on("legendselectchanged", (params: any) => {
// console.log(emits);
// echartsTest.value.setOption({
// legend: { selected: { [params.name]: true } }
// });
@ -802,7 +782,6 @@ function getRiskEchart() {
const specialList = ref([]);
//
function getSpecialEchart() {
console.log("我是特殊作业统计图11");
const echartsTest = echarts.init(document.getElementById("eacherSpecial"));
// const maxCount: any = specialList.value.sort((a: any, b: any) => b.totalNum - a.totalNum);
const safeList = specialList.value.map((item: any) => {
@ -825,13 +804,19 @@ function getSpecialEchart() {
// color: "#000000"
// },
// backgroundColor: "#F3F3F3",
extraCssText: "width:120px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);",
extraCssText: "width:150px;white-space:pre-wrap;box-shadow: 0px 4px 4px 0px rgba(0,0,0,0.25);",
formatter: function (params: any) {
console.log(params);
const obj = safeList[params.dataIndex];
console.log(obj, safeList, params, params.dataIndex);
//
return `动火安全作业:${obj.xzSpecialOperationFireSafetyNum}\n盲板抽堵作业${obj.xzBlindPlatePlugSafeNum}\n动土安全作业${obj.xzGroundSafetNum}\n高处作业作业${obj.xzHighJobSafeNum}\n吊装安全作业${obj.xzHoistSafetyWorkNum}\n受限空间作业${obj.xzLimitSpaceSafeNum}\n断路安全作业${obj.xzOpenCircuitSafeNum}\n用电安全作业${obj.xzTemporaryElectricitySafeNum}`;
return '<div>'+safeList[params.dataIndex].x+'</div><div><span style="color:#5470c6;line-height:10px;font-weight:bolder;">●</span>动土安全作业:'+obj.xzGroundSafetNum+'</div>'+
'<div><span style="color:#91cc75;line-height:10px;font-weight:bolder;">●</span>用电安全作业:'+obj.xzTemporaryElectricitySafeNum+'</div>'+
'<div><span style="color:#fac858;line-height:10px;font-weight:bolder;">●</span>高处作业作业:'+obj.xzHighJobSafeNum+'</div>'+
'<div><span style="color:#ee6666;line-height:10px;font-weight:bolder;">●</span>盲板抽堵作业:'+obj.xzBlindPlatePlugSafeNum+'</div>'+
'<div><span style="color:#73c0de;line-height:10px;font-weight:bolder;">●</span>动火安全作业:'+obj.xzSpecialOperationFireSafetyNum+'</div>'+
'<div><span style="color:#3ba272;line-height:10px;font-weight:bolder;">●</span>断路安全作业:'+obj.xzOpenCircuitSafeNum+'</div>'+
'<div><span style="color:#fc8452;line-height:10px;font-weight:bolder;">●</span>吊装安全作业:'+obj.xzHoistSafetyWorkNum+'</div>'+
'<div><span style="color:#9a60b4;line-height:10px;font-weight:bolder;">●</span>受限空间作业:'+obj.xzLimitSpaceSafeNum+'</div>';
// return `${obj.xzSpecialOperationFireSafetyNum}\n${obj.xzBlindPlatePlugSafeNum}\n${obj.xzGroundSafetNum}\n${obj.xzHighJobSafeNum}\n${obj.xzHoistSafetyWorkNum}\n${obj.xzLimitSpaceSafeNum}\n${obj.xzOpenCircuitSafeNum}\n${obj.xzTemporaryElectricitySafeNum}`;
}
},
grid: {
@ -924,25 +909,104 @@ function getSpecialEchart() {
}
],
series: [
//
{
data: safeList.map(item => item.y),
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzGroundSafetNum),
type: "bar",
barWidth: "35%",
color: "#268dff"
}
color: "#5470c6",
stack: 'total',
// label: { show: true},
// emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzTemporaryElectricitySafeNum),
type: "bar",
barWidth: "35%",
color: "#91cc75",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzHighJobSafeNum),
type: "bar",
barWidth: "35%",
color: "#fac858",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzBlindPlatePlugSafeNum),
type: "bar",
barWidth: "35%",
color: "#ee6666",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzSpecialOperationFireSafetyNum),
type: "bar",
barWidth: "35%",
color: "#73c0de",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzOpenCircuitSafeNum),
type: "bar",
barWidth: "35%",
color: "#3ba272",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzHoistSafetyWorkNum),
type: "bar",
barWidth: "35%",
color: "#fc8452",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
//
{
// data: safeList.map(item => item.y),
data: specialList.value.map((item: any) => item.xzLimitSpaceSafeNum),
type: "bar",
barWidth: "35%",
color: "#9a60b4",
stack: 'total',
// label: { show: true},
emphasis:{focus: 'series'}
},
]
};
echartsTest.setOption(option, true);
window.addEventListener("resize", () => {
console.log(echartsTest);
echartsTest.resize();
});
console.log(echartsTest);
}
const getSafeInfo = async (showLoading: boolean) => {
// const res: any = await getProjectInspectRecordCountApi({ projectSn: store.sn });
// console.log("", res);
// safeData.value = res.result;
// dataList.value[0].value = res.result.rectificationNum;
// dataList.value[1].value = res.result.totalNum - res.result.rectificationNum;
@ -955,7 +1019,6 @@ const getSafeInfo = async (showLoading: boolean) => {
showLoading
);
console.log("安全统计数据", result);
dataList.value = [];
for (let index = 0; index < 5; index++) {
let obj = {
@ -1018,7 +1081,6 @@ const getSafeInfo = async (showLoading: boolean) => {
// overdueMajorDangerRate.value = result.result.overdueRectificationNumRatio;
// majorDangerCount.value = result.result.notCloseNum;
// majorDangerRate.value = result.result.percent;
console.log("1111111111111", dataList.value);
const res: any = await getCountDangerLevelApi(
{
@ -1043,7 +1105,6 @@ const getSafeInfo = async (showLoading: boolean) => {
// };
// });
// questionTotal.value = res.result.count;
// console.log("", res);
const filterResult = res.result.data.find((item: any) => item.enumType == 1);
@ -1300,7 +1361,6 @@ let dataList2 = ref([
// });
// //
// echartsTest.on("legendselectchanged", (params: any) => {
// console.log(emits);
// echartsTest.setOption({
// legend: { selected: { [params.name]: true } }
// });
@ -1365,13 +1425,11 @@ const getSelectQualityStatisticsNum = async (showLoading: boolean) => {
},
showLoading
);
console.log(res);
};
const getNoticeList = async (showLoading: boolean) => {
// const res: any = await getNoticeListApi({ projectSn: store.sn, type: 10, pageNo: 1, pageSize: 99999, });
const res: any = await getNoticeListApi({ isBigScreen: 1, type: 31 }, showLoading);
console.log("隐患智能分析", res);
listData2.value = res.result.records;
// listData2.value.push({
// accountId:"1779721457571291137",
@ -1384,7 +1442,6 @@ const getNoticeList = async (showLoading: boolean) => {
// title: "",
// type: "31",
// })
console.log("================================", listData2.value);
};
watch(
@ -1408,7 +1465,6 @@ const getInspectionRiskChart = async (showLoading: boolean) => {
},
showLoading
);
console.log("风险走势图", res);
riskList.value = res.result;
getRiskEchart();
};
@ -1421,7 +1477,6 @@ const getCountAllSpecial = async (showLoading: boolean) => {
},
showLoading
);
console.log("特殊作业图", res);
specialList.value = res.result;
getSpecialEchart();
};

View File

@ -252,7 +252,6 @@ const getPersonList = async () => {
if (res.result) {
dataList2.value[1].value = res.result.personType.toaltPerson.totalPerson;
dataList2.value[2].value = res.result.personType.toaltPerson.totalPerson;
console.log("安全教育智能分析666", res);
drawEchart2();
}
};
@ -268,7 +267,6 @@ const getMemberJobStatusFn = async () => {
requestData.inspectTime_end = dateRange.value[1];
}
const res: any = await getMemberJobStatusApi(requestData);
console.log("人员履职情况res--整改人", res);
if (res.result) {
tabList.value = res.result.records;
} else {
@ -287,7 +285,6 @@ const getInspectManStatusFn = async () => {
requestData.inspectTime_end = dateRange.value[1];
}
const res: any = await getInspectManStatusApi(requestData);
console.log("人员履职情况res--检查人", res);
if (res.result) {
tabList.value = res.result.records;
} else {
@ -306,7 +303,6 @@ const getEnterpriseStatusFn = async () => {
requestData.inspectTime_end = dateRange.value[1];
}
const res: any = await getEnterpriseStatusApi(requestData);
console.log("人员履职情况res--按分包单位分析", res);
if (res.result) {
tabList.value = res.result.records;
} else {
@ -315,7 +311,6 @@ const getEnterpriseStatusFn = async () => {
};
const handleClick = (tab: TabsPaneContext, event: Event) => {
activeIndex.value = tab.index;
console.log(tab);
if (tab.index == "0") {
getEnterpriseStatusFn();
// getMemberJobStatusFn();
@ -326,11 +321,9 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
getInspectManStatusFn();
// getEnterpriseStatusFn();
}
console.log("activeIndex", activeIndex.value);
};
// const handleClick = (tab: TabsPaneContext, event: Event) => {
// activeIndex.value = tab.index;
// console.log(tab);
// if (tab.index == "0") {
// getMemberJobStatusFn();
// } else if (tab.index == "1") {
@ -338,7 +331,6 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
// } else if (tab.index == "2") {
// getEnterpriseStatusFn();
// }
// console.log("activeIndex", activeIndex.value);
// };
function Pie() {
let dataArr = [];
@ -449,13 +441,11 @@ function drawEchart2() {
}
}),
formatter: function (data) {
console.log(data, 666777);
if (dataList2.value && dataList2.value.length) {
for (var i = 0; i < dataList2.value.length; i++) {
if (data === dataList2.value[i].name) {
var value = dataList2.value[i].value;
var percentage = value + "%";
console.log(value, 888);
if (data == "未教育人员") {
return "{name| " + data + "} {gap| }" + "{value1|" + value + " " + "}";
} else if (data == "完成人员") {
@ -612,7 +602,6 @@ function drawEchart2() {
};
echartsTest.setOption(option, true);
// window.addEventListener("resize", () => {
// console.log(666)
// echartsTest.resize();
// })
}

View File

@ -146,7 +146,6 @@ const getQualityStatisticsNumDataFn = async (tip: any) => {
pageSize: 100
};
const res: any = await getAlarmTypeCountPageApi(requestData);
console.log("获取人员信息列表", res);
if (tip == "more") {
topDangerList.value = topDangerList.value.concat(res.result.alarmPage.records);
} else {
@ -161,7 +160,6 @@ const getQualityStatisticsNumDataFn = async (tip: any) => {
//
const getWarnTypeOption = async () => {
const res: any = await getAlarmTypeOption({ projectSn: store.sn });
// console.log("", res.result);
let warnType = res.result.map((item: any) => {
return {
id: Number(item.data),
@ -169,7 +167,6 @@ const getWarnTypeOption = async () => {
};
});
aiAlarmTypeEnum.value = warnType;
console.log("获取告警类型**", aiAlarmTypeEnum.value);
};
//
function getWarnName(warnType: any) {
@ -178,7 +175,6 @@ function getWarnName(warnType: any) {
}
//
function openDetailDialog(item: any) {
// console.log(item, "");
detailData.value = item;
showDialog.value = true;
}
@ -188,7 +184,6 @@ function closeDialog() {
detailData.value = {};
}
function handleDetailClick(event: any) {
// console.log("", event.target.className);
if (event.target.className == "list-detail") {
closeDialog();
}
@ -214,7 +209,6 @@ const getMemberCountList = async (tip: any) => {
isPushed: 1
};
const res: any = await getAlarmRecordApi(requestData);
console.log("获取人员信息列表", res);
if (tip == "more") {
partyMemberList.value = partyMemberList.value.concat(res.result.records);
} else {
@ -237,28 +231,22 @@ onMounted(async () => {
await getQualityStatisticsNumDataFn("search");
getWarnTypeOption();
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
console.log("滚动容器", moreScroll.value);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}
}
});
refAlarmScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
//
if (scrollTop >= scrollHeight - clientHeight) {
// console.log("");
if (moreAlarmScroll.value) {
getQualityStatisticsNumDataFn("more");
}

View File

@ -132,9 +132,7 @@ const closeDialog = () => {
postData.value = {};
};
const closeDialog1 = (id: string) => {
console.log(id, mapsDetail.value);
// const findIndex = mapsDetail.value.findIndex((item: any) => item.id == id);
// console.log(findIndex);
// if (findIndex > -1) {
// mapsDetail.value.splice(findIndex, 1);
// }
@ -149,7 +147,6 @@ const closeDialog1 = (id: string) => {
}
};
function openDialog(obj: any) {
console.log("obj", obj);
postData.value = obj;
showIndex.value = obj.index;
if (obj.index == 7) {
@ -167,7 +164,6 @@ function openDialog(obj: any) {
show: obj.show
});
}
console.log("111111111", majorInfo.value);
showDialog.value = true;
}
@ -197,7 +193,6 @@ defineExpose({
});
onMounted(async () => {
// console.log("Mount_type", postData.value.type);
});
</script>

View File

@ -213,14 +213,7 @@ const partyMemberList = ref([
}
] as any);
const handleClick = (tab: TabsPaneContext, event: Event) => {
// console.log(tab, event)
// console.log('tab',tab.index)
// console.log('activeName',activeName.value)
// if(activeName.value === 'first') console.log('1')
// if(activeName.value === 'second') console.log('2')
// if(activeName.value === 'third') console.log('3')
activeIndex.value = tab.index;
console.log("activeIndex", activeIndex.value);
};
//
const getCompanyList = async () => {
@ -254,7 +247,6 @@ const getMemberCountList = async (tip: any) => {
requestData.inserviceType = 1;
}
const res: any = await getMemberInfoList(requestData);
console.log("获取人员信息列表", res);
if (tip == "more") {
partyMemberList.value = partyMemberList.value.concat(res.result.records);
} else {
@ -399,10 +391,8 @@ function drawEchart1() {
};
echartsTest.setOption(option, true);
window.addEventListener("resize", () => {
console.log(echartsTest);
echartsTest.resize();
});
console.log(echartsTest);
}
function drawEchart2() {
@ -632,7 +622,6 @@ function drawEchart2() {
}
function drawEchart3() {
console.log(echarts3.value);
echartsTest.value = echarts.init(echarts3.value);
let option = {
@ -847,15 +836,11 @@ function drawEchart3() {
};
echartsTest.value.setOption(option, true);
window.addEventListener("resize", () => {
console.log(echartsTest);
echartsTest.value.resize();
});
console.log(echartsTest.value);
}
const getStatsByEnterprise = async () => {
console.log("我是子组件", props.majorInfo);
console.log(props.majorInfo?.inspectStartTime, props.majorInfo?.inspectEndTime);
const res: any = await getStatsByEnterpriseApi({
pageNo: 1,
@ -867,7 +852,6 @@ const getStatsByEnterprise = async () => {
inspectTime_end: props.majorInfo?.inspectEndTime,
enumType: parseInt(props.majorInfo?.enumType)
});
console.log("获取分包单位统计", res);
dataList1.value = res.result.records;
drawEchart1();
};
@ -881,7 +865,6 @@ const getCountQualityInspectionRecordRegion = async () => {
isOverdueRectification: props.majorInfo?.isOverdueRectification,
enumType: parseInt(props.majorInfo?.enumType)
});
console.log("获取责任区域排名", res);
dataList2.value = res.result;
drawEchart2();
};
@ -895,7 +878,6 @@ const getStatsDangerType = async () => {
isOverdueRectification: props.majorInfo?.isOverdueRectification,
enumType: parseInt(props.majorInfo?.enumType)
});
console.log("隐患类型分析", res);
dataList3.value = res.result.data.map((item: any, index: number) => {
return {
...item,
@ -925,7 +907,6 @@ const getXzSecurityQualitylnspectionRecordlist = async (tip: any) => {
inspectEndTime: props.majorInfo?.inspectEndTime,
enumType: parseInt(props.majorInfo?.enumType)
});
console.log("获取列表", res);
if (tip == "more") {
const newResult = res.result.page.records.map((item: any) => {
return {
@ -968,8 +949,6 @@ const onSupervise = async (row: any) => {
watch(
() => props.majorInfo,
async newVal => {
// console.log(newVal, "newVal");
console.log(newVal);
await getStatsByEnterprise();
await getCountQualityInspectionRecordRegion();
await getStatsDangerType();
@ -987,14 +966,11 @@ onMounted(async () => {
// await getCompanyList();
// await getMemberCountList("search");
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -197,17 +197,10 @@ const searchForm = ref({
const partyMemberList = ref([] as any);
const handleClick = (tab: TabsPaneContext, event: Event) => {
// console.log(tab, event)
// console.log('tab',tab.index)
// console.log('activeName',activeName.value)
// if(activeName.value === 'first') console.log('1')
// if(activeName.value === 'second') console.log('2')
// if(activeName.value === 'third') console.log('3')
if(tab.index == activeIndex.value) return;
activeIndex.value = tab.index
partyMemberList.value = [];
getMemberCountList('search')
console.log('activeIndex',activeIndex.value)
}
//
const getMemberCountList = async (tip:any) => {
@ -228,7 +221,6 @@ const getMemberCountList = async (tip:any) => {
requestFn = getSideStationApi;
}
const res: any = await requestFn(requestData);
console.log("获取危大工程数据", res);
if(tip == 'more'){
if(activeIndex.value == 0){
partyMemberList.value = partyMemberList.value.concat(res.result.records);
@ -264,14 +256,11 @@ const getMemberCountList = async (tip:any) => {
onMounted(async () => {
await getMemberCountList('search');
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -157,8 +157,6 @@ const projectData = ref({} as any);
//
const getProjectInfo = async () => {
const res = await getProjectDetail({ projectSn: store.sn });
console.log("获取项目信息666", res);
// console.log("", projectTypeEnum);
projectData.value = res.result;
};
//
@ -167,7 +165,6 @@ const getStatScoreFn = async () => {
projectSn: store.sn
};
const res: any = await getStatScoreApi(requestData);
console.log("综合评分详情", res);
countData.value = res.result;
};
@ -179,7 +176,6 @@ const getMemberCountList = async (tip: any) => {
pageNo: 1
};
const res: any = await getMemberJobStatusApi(requestData);
console.log("获取人员信息列表", res);
if (tip == "more") {
partyMemberList.value = partyMemberList.value.concat(res.result.records);
} else {
@ -202,14 +198,11 @@ onMounted(async () => {
await getMemberCountList("search");
await getStatScoreFn();
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -51,7 +51,6 @@ const markerClick = (e: any) => {
};
const initMap = () => {
console.log("33333333", props.mapsDetail);
//
mapInfo.mapObj = new AMap.Map(props.mapsDetail.id, {
resizeEnable: true,
@ -61,7 +60,6 @@ const initMap = () => {
props.mapsDetail.latitude ? props.mapsDetail.latitude : 39.909
] //
});
console.log("222222", mapInfo.mapObj);
const markerArr = mapDataList.value
.filter((item: any) => item.longitude || item.latitude)
.map((item: any) => {
@ -74,7 +72,6 @@ const initMap = () => {
title: item.goodsName
// offset: new AMap.Pixel(-15, (-15 * (index + 1))),
});
console.log(item);
normalMarker.setLabel({
// offset: new AMap.Pixel(20, -10), //
content: item.goodsName, //
@ -109,7 +106,6 @@ const initMap = () => {
title: item.goodsName
// offset: new AMap.Pixel((-15 * (index + 1)), -30),
});
console.log(item);
normalMarker.content =
"<p><b>报警姓名:</b>" +
item.alarmPersonName +
@ -130,26 +126,21 @@ const initMap = () => {
mapInfo.infoWindow = new AMap.InfoWindow({
offset: new AMap.Pixel(16, -50)
});
console.log("我是物资图标~~~~~~~~~~~~·", mapInfo.positionData);
mapInfo.mapObj.add(mapInfo.positionData);
mapInfo.mapObj.setFitView();
console.log("!!!!!!!!!!!!!!!!!!!", mapInfo.mapObj);
};
const getEmergencyReliefList = async () => {
console.log("获取应急物资");
let requestData: any = {
projectSn: store.sn
};
const res: any = await getEmergencyReliefListApi(requestData);
console.log("获取应急物资", res);
mapDataList.value = res.result;
initMap();
};
onMounted(async () => {
console.log("~~~~~~~~~~", props.mapsDetail);
getEmergencyReliefList();
});
</script>

View File

@ -110,7 +110,6 @@ const getStatisticsNumDataFn = async () => {
};
const res: any = await getStatisticsNumDataApi(data);
if (res.code == 200) {
console.log('风险统计顶部统计数据', res)
statisticsData.value = res.result;
}
};
@ -135,7 +134,6 @@ const getMemberCountList = async (tip: any) => {
pageSize: 100
};
const res: any = await getInspectionRecordApi(requestData);
console.log("获取风险统计列表", res);
if (tip == "more") {
partyMemberList.value = partyMemberList.value.concat(res.result.page.records);
} else {
@ -157,14 +155,11 @@ onMounted(async () => {
await getMemberCountList("search");
await getStatisticsNumDataFn();
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -47,7 +47,6 @@ const getMemberCountList = async (tip:any) => {
pageNo: 1
}
const res: any = await getMemberJobStatusApi(requestData);
console.log("获取人员信息列表", res);
if(tip == 'more'){
partyMemberList.value = partyMemberList.value.concat(res.result.records);
} else {
@ -67,14 +66,11 @@ const getMemberCountList = async (tip:any) => {
onMounted(async () => {
await getMemberCountList('search');
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -191,7 +191,6 @@ const topDangerList = ref([] as any)
const partyMemberList = ref({} as any);
//
const textFilter = (val:any) => {
console.log(val,777888)
let findItem:any = statusList.value.find(item => {
return item.value == val;
})
@ -209,7 +208,6 @@ const getSystemUserBySn = async () => {
};
const res: any = await getSystemUserBySnApi(data);
if (res.code == 200) {
console.log("检查人",res)
inspectBySnList.value = res.result;
}
};
@ -220,7 +218,6 @@ const getSystemUserFn = async () => {
};
const res: any = await getSystemUserApi(data);
if (res.code == 200) {
console.log("整改人",res)
inspectList.value = res.result;
}
};
@ -233,7 +230,6 @@ const getDivisionUnitFn = async () => {
};
const res: any = await getProjectEnterpriseApi(data);
if (res.code == 200) {
console.log("分包单位",res)
enterpriseListData.value = res.result.records;
}
};
@ -245,7 +241,6 @@ const getQualityStatisticsNumDataFn = async () => {
};
const res: any = await getQualityStatisticsNumDataApi(data);
if (res.code == 200) {
console.log("安全隐患顶部数据",res)
topDangerList.value = res.result || []
}
};
@ -279,7 +274,6 @@ const getMemberCountList = async (tip:any) => {
requestData.inserviceType = 1;
}
const res: any = await getInspectionRecordApi(requestData);
console.log("获取安全隐患底部列表", res);
if(tip == 'more'){
partyMemberList.value = partyMemberList.value.concat(res.result.page.records);
} else {
@ -304,14 +298,11 @@ onMounted(async () => {
await getQualityStatisticsNumDataFn();
await getMemberCountList('search');
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -135,7 +135,6 @@ const getMemberCountList = async (tip: any) => {
requestData.inserviceType = 1;
}
const res: any = await getSafeEducationDataApi(requestData);
console.log("获取安全教育", res);
if (tip == "more") {
partyMemberList.value = partyMemberList.value.concat(res.result.records);
} else {
@ -155,14 +154,11 @@ const getMemberCountList = async (tip: any) => {
onMounted(async () => {
await getMemberCountList("search");
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -122,7 +122,6 @@ const getDelayEventTypeFn = async () => {
month: dateTime.value
};
const res: any = await getDelayEventTypeApi(requestData);
console.log("获取天气顶部统计数据", res);
topStatisticData.value = res.result;
};
//
@ -136,7 +135,6 @@ const getMemberCountList = async (tip: any) => {
hasDelayEvent: 1
};
const res: any = await getProgressContentApi(requestData);
console.log("获取人员信息列表", res);
if (tip == "more") {
partyMemberList.value = partyMemberList.value.concat(res.result.records);
} else {
@ -155,10 +153,8 @@ const getMemberCountList = async (tip: any) => {
watch(
() => calendarVal.value,
newVal => {
// console.log(newVal, "newVal");
if (newVal) {
// props.xData = newVal;
console.log(newVal);
tableParams.value.calendarVal = moment(newVal).format("YYYY-MM-DD");
dateTime.value = moment(newVal).format("YYYY-MM-DD");
getMemberCountList("search");
@ -171,14 +167,11 @@ onMounted(async () => {
await getDelayEventTypeFn();
await getMemberCountList("search");
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
// console.log("", e);
const scrollTop = e.target.scrollTop;
const scrollHeight = e.target.scrollHeight;
const clientHeight = e.target.clientHeight;
// console.log("", scrollTop, scrollHeight, clientHeight);
//
if (scrollTop >= scrollHeight - clientHeight - 1) {
// console.log("");
if (moreScroll.value) {
getMemberCountList("more");
}

View File

@ -84,10 +84,8 @@ const getAllModelMenu = () => {
return;
}
});
console.log("筛选出的数据看板路由", menuList.value);
};
const navigateTo = (path, type) => {
console.log("点击的路由---", path, type);
if (type == 1) {
activeTab.value = path.modulePath;
itemList.value = path.menuList;
@ -105,18 +103,15 @@ onMounted(async () => {
//token
//
if (window.location.href.indexOf("token") != -1) {
console.log("跳转进来了吗----", window.location.href.indexOf("token"));
const newToken = window.location.href.split("token=")[1];
const data = await jumpLargeUserInfoApi({ token: newToken });
console.log("跳转请求的数据----", data.result);
store.setSN(data.result.sn);
store.setToken(data.result.token);
store.setAccount(data.result.account);
store.setAccountType(data.result.accountType);
store.setProjectDateAuth(data.menuAuthority);
// const data = await res.json();
// console.log("", data);
// let arr = data.result.menuAuthority.moduleList;
// arr.forEach((item: any) => {
// if (item.moduleType == 4) {
@ -124,16 +119,13 @@ onMounted(async () => {
// return;
// }
// });
// console.log("", moduleListData.value);
}
// await getAllModelMenu();
navigateTo(menuList.value[0], 1);
activeTab.value = menuList.value[0].modulePath;
itemList.value = menuList.value[0].menuList;
// console.log(" ");
adminName.value = store.account;
// console.log("store", store.account);
// menuClick(menuList.value[0], activeIndex.value);
getNowTime();
document.addEventListener("click", bodyCloseMenus);