Browse Source

fix: 去除多余代码、声明变量

feature-v1.0.0
chenhaojie 1 month ago
parent
commit
1181be33ec
  1. 1
      src/views/BottomPanel/index.vue
  2. 61
      src/views/Main/ProjectOperation/components/MonitorWarning.vue
  3. 2
      src/views/Main/ProjectOperation/index.vue
  4. 54
      src/views/Main/SafetyAppraise/index.vue

1
src/views/BottomPanel/index.vue

@ -18,7 +18,6 @@ const projectStore = useProjectStore();
defineOptions({
name: "bottom-panel",
});
const activeLayers = ref<any[]>([]);
const listName = ref(["水库点", "堤防", "水闸"]);
const layerData: any = computed(() => {
const list: any[] = [];

61
src/views/Main/ProjectOperation/components/MonitorWarning.vue

@ -88,71 +88,70 @@
</div>
</template>
<script setup lang="ts">
import { ref, watch } from 'vue';
import dayjs from 'dayjs';
import { getReservoirCZAlarmPageData } from '@/api/reservoir';
import { ref, watch } from "vue";
import dayjs from "dayjs";
import { getReservoirCZAlarmPageData } from "@/api/reservoir";
const props = defineProps({
resCode: {
type: String,
default: ''
}
default: "",
},
});
const dateRange: any = ref('0');
const startDate: any = ref(dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss'));
const endDate: any = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
const dateRange: any = ref("0");
const startDate: any = ref(dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"));
const endDate: any = ref(dayjs().format("YYYY-MM-DD HH:mm:ss"));
const tableData: any = ref([]);
const paramsData: any = ref({
pageSize: 10,
pageNum: 1,
total: 0
total: 0,
});
const emit = defineEmits(['node-click']);
watch(
() => props.resCode,
(val) => {
getTableData(val);
},
{ immediate: true }
{ immediate: true },
);
// onMounted(() => {
// getTableData();
// });
function getTableData(code = '') {
function getTableData(code = "") {
getReservoirCZAlarmPageData({
startDate: startDate.value + ' 00:00:00',
endDate: endDate.value + ' 23:59:59',
startDate: startDate.value + " 00:00:00",
endDate: endDate.value + " 23:59:59",
pageSize: paramsData.value.pageSize,
pageNum: paramsData.value.pageNum
pageNum: paramsData.value.pageNum,
}).then((res: any) => {
console.log('res >>>>> ', res);
console.log("res >>>>> ", res);
tableData.value = res.records || [];
paramsData.value.total = res.total;
});
}
function handleChangeDate(value: any) {
switch (value) {
case '0':
startDate.value = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss');
endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
case "0":
startDate.value = dayjs().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss");
endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
break;
case '1':
startDate.value = dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss');
endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
case "1":
startDate.value = dayjs().subtract(1, "day").format("YYYY-MM-DD HH:mm:ss");
endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
break;
case '2':
startDate.value = dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss');
endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
case "2":
startDate.value = dayjs().subtract(7, "day").format("YYYY-MM-DD HH:mm:ss");
endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
break;
case '3':
startDate.value = dayjs().subtract(3, 'month').format('YYYY-MM-DD HH:mm:ss');
endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
case "3":
startDate.value = dayjs().subtract(3, "month").format("YYYY-MM-DD HH:mm:ss");
endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
break;
case '4':
startDate.value = dayjs().subtract(1, 'year').format('YYYY-MM-DD HH:mm:ss');
endDate.value = dayjs().format('YYYY-MM-DD HH:mm:ss');
case "4":
startDate.value = dayjs().subtract(1, "year").format("YYYY-MM-DD HH:mm:ss");
endDate.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
break;
default:
break;

2
src/views/Main/ProjectOperation/index.vue

@ -30,7 +30,7 @@
</div>
</template>
<script setup lang="ts">
import { ref, defineOptions, defineEmits, defineProps, watch, onMounted } from "vue";
import { ref, watch, onMounted } from "vue";
import BaseInfo from "./components/BaseInfo.vue";
import DataStatistics from "./components/DataStatistics.vue";
import MonitorWarning from "./components/MonitorWarning.vue";

54
src/views/Main/SafetyAppraise/index.vue

@ -41,32 +41,32 @@
</template>
<script setup lang="ts">
import { ref, onMounted, watch, computed, reactive } from 'vue';
import { useChartStore } from '@/store/modules/chart';
import { ref, onMounted, watch, computed, reactive } from "vue";
import { useChartStore } from "@/store/modules/chart";
const chartStore = useChartStore();
defineOptions({
name: 'safety-appraise'
name: "safety-appraise",
});
const props = defineProps({
timeRange: {
type: Object,
default: () => ({
startTime: '',
endTime: ''
})
}
startTime: "",
endTime: "",
}),
},
});
const taskCount = ref(0);
const safetyData: any = ref([]);
const safety = reactive<any>({
rws: 0,
djd: 0,
yjd: 0
yjd: 0,
});
const okNum = computed(() => {
const num = safetyData.value.find((item: any) => item.name === '任务数');
const okNum: any = computed(() => {
const num = safetyData.value.find((item: any) => item.name === "任务数");
return taskCount.value ? ((Number(num?.value || 0) / taskCount.value) * 100).toFixed(2) : 0;
});
// const inNum = computed(() => {
@ -81,25 +81,25 @@ const getChartData = async (time: any) => {
// endTime: '',
// startTime: '',
...time,
group: 'K4'
group: "K4",
};
const data: any = await chartStore.initStatisticChart(pramas);
if (data?.yaxis?.length) {
let newArr = data.yaxis.flatMap((v: any) => v.series);
newArr?.forEach((item: any) => {
if (item.code === 'YZT_TOUR_CHECK_RWS_SUM') {
if (item.code === "YZT_TOUR_CHECK_RWS_SUM") {
safety.rws = +(+item.sum).toFixed(0);
}
if (item.code === 'YZT_TOUR_CHECK_DJD_SUM') {
if (item.code === "YZT_TOUR_CHECK_DJD_SUM") {
safety.dyd = +(+item.sum).toFixed(0);
}
if (item.code === 'YZT_TOUR_CHECK_YJD_SUM') {
if (item.code === "YZT_TOUR_CHECK_YJD_SUM") {
safety.yjd = +(+item.sum).toFixed(0);
}
safetyData.value.push({
name: item.name || '',
name: item.name || "",
value: Number(item.sum)?.toFixed(0) || 0,
unit: item.unit || ''
unit: item.unit || "",
});
taskCount.value += Number(item.sum) || 0;
});
@ -107,15 +107,15 @@ const getChartData = async (time: any) => {
//
safetyData.value = [
{
name: '任务数',
name: "任务数",
value: 0,
unit: ''
unit: "",
},
{
name: '已完成',
name: "已完成",
value: 0,
unit: ''
}
unit: "",
},
];
}
};
@ -126,7 +126,7 @@ watch(
taskCount.value = 0;
safetyData.value = [];
getChartData(newVal);
}
},
);
onMounted(() => {
// getChartData(props.timeRange);
@ -148,7 +148,7 @@ onMounted(() => {
.appraise-item {
width: 104px;
height: 119px;
background: url('@/assets/card/safety-item-bg.png') no-repeat;
background: url("@/assets/card/safety-item-bg.png") no-repeat;
display: flex;
flex-direction: column;
align-items: center;
@ -162,8 +162,8 @@ onMounted(() => {
text-align: center;
letter-spacing: 0em;
font-variation-settings: 'opsz' auto;
font-feature-settings: 'kern' on;
font-variation-settings: "opsz" auto;
font-feature-settings: "kern" on;
color: #ffffff;
}
.count {
@ -200,7 +200,7 @@ onMounted(() => {
line-height: 22px;
letter-spacing: 0px;
font-variation-settings: 'opsz' auto;
font-variation-settings: "opsz" auto;
color: rgba(0, 0, 0, 0.55);
span {
font-family: DIN;
@ -209,7 +209,7 @@ onMounted(() => {
line-height: 22px;
letter-spacing: 0px;
font-variation-settings: 'opsz' auto;
font-variation-settings: "opsz" auto;
&.ok {
color: #28ce8e;
}

Loading…
Cancel
Save