-
+
+
+
+ 补召
+ 返回
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+ 取消
-
-
+
+
+
+
+
+
+
+
+
+
@@ -43,21 +48,25 @@
import { ref, onMounted, defineExpose, onBeforeUnmount, inject } from 'vue'
import { getMakeUpData, getAskDirOrFile, offlineDataUploadMakeUp } from '@/api/cs-harmonic-boot/recruitment.ts'
import DatePicker from '@/components/form/datePicker/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
import { useRouter, useRoute } from 'vue-router'
import { mainHeight } from '@/utils/layout'
+import { VxeUI, VxeTableInstance, VxeTableEvents } from 'vxe-table'
import {
Back,
- Setting} from '@element-plus/icons-vue'
+ Setting
+} from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus'
import mqtt from 'mqtt'
const checkList: any = ref([])
// const props = defineProps(['lineId'])
const { go } = useRouter() // 路由
-
+const selectRow: any = ref(null)
const loading = ref(false)
const dirList = ref([])
const route: any = ref({})
const datePickerRef = ref()
+const format = (percentage) => (percentage === 100 ? '完成' : `${percentage}%`)
const getMakeUpDataList = (row: any) => {
route.value = row
loading.value = true
@@ -77,9 +86,10 @@ const getMakeUpDataList = (row: any) => {
// 进入文件夹
const dirCheckedList: any = ref([])
const tbodyRef = ref()
-const tableHeight = mainHeight(90).height
+const tableHeight = mainHeight(105).height
const routes = useRoute()
const tableRef = ref()
+const selectRowCopy: any = ref(null)
const handleUpDevice = () => {
let proList = tableRef.value.getCheckboxRecords().map((item: any) => {
return item.prjDataPath
@@ -87,21 +97,30 @@ const handleUpDevice = () => {
if (checkList.value.length == 0) {
return ElMessage.warning('请选择暂态稳态')
}
- if (proList.length == 0) {
+ if (selectRow.value == null) {
return ElMessage.warning('请选择工程')
}
+ selectRowCopy.value = JSON.parse(JSON.stringify(selectRow.value))
let form = {
dataTypeList: checkList.value,
startTime: datePickerRef.value && datePickerRef.value.timeValue[0],
endTime: datePickerRef.value && datePickerRef.value.timeValue[1],
lineId: routes.query.id,
ndid: routes.query.ndid,
- proList: proList
+ proList: [selectRow.value?.prjDataPath]
}
+ ElMessage.warning('补召中, 请稍等...')
offlineDataUploadMakeUp(form)
.then((res: any) => {
if (res.code == 'A0000') {
- ElMessage.success(res.message)
+ ElMessage.success(res.data)
+ dirList.value.map((item: any) => {
+ // checkedList.map((vv: any) => {
+ if (item.name == selectRowCopy.value?.name) {
+ item.status = 5
+ }
+ // })
+ })
// loading.value = false
}
})
@@ -110,6 +129,19 @@ const handleUpDevice = () => {
})
}
+const radioChangeEvent: VxeTableEvents.RadioChange = ({ row }) => {
+ selectRow.value = row
+ console.log('单选事件')
+}
+
+
+const clearRadioRowEvent = () => {
+ const $table = tableRef.value
+ if ($table) {
+ selectRow.value = null
+ $table.clearRadioRow()
+ }
+}
const mqttRef = ref()
const url: any = inject('MQTTURL')
const connectMqtt = () => {
@@ -153,11 +185,15 @@ mqttRef.value.on('message', (topic: any, message: any) => {
return item.name
})
dirList.value.map((item: any) => {
- checkedList.map((vv: any) => {
- if (item.name == vv) {
- item.status = parseInt(Number((mqttMessage.value.nowStep / mqttMessage.value.allStep) * 100)) || 0
+ // checkedList.map((vv: any) => {
+ if (item.name == selectRowCopy.value?.name) {
+ let percentage = parseInt(Number((mqttMessage.value.nowStep / mqttMessage.value.allStep) * 100)) || 0
+ if (percentage > 5) {
+ item.status = percentage
+
}
- })
+ }
+ // })
})
})
@@ -179,27 +215,40 @@ onBeforeUnmount(() => {
defineExpose({ getMakeUpDataList })
diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index dff32df..0f96c93 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -325,7 +325,7 @@ const init = async () => {
position: 'right',
offset: (index - 1) * 80
}
- console.log("🚀 ~ unitList.forEach ~ right.index:", index)
+ // console.log("🚀 ~ unitList.forEach ~ right.index:", index)
echartsData.value.yAxis.push({
name: item,
yAxisIndex: index,
@@ -388,7 +388,7 @@ const init = async () => {
echartsData.value.yAxis[index].min = min
echartsData.value.yAxis[index].max = max
})
- console.log("🚀 ~ result.forEach ~ echartsData.value:", echartsData.value)
+ // console.log("🚀 ~ result.forEach ~ echartsData.value:", echartsData.value)
}
loading.value = false
}
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 9a6b32d..9a884a9 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -120,8 +120,8 @@
+ :label="item.name.includes('次数') ? item.name : item.name.includes('幅值') ? item.name.slice(0, -2) + '次数' : item.name + '谐波次数'"
+ v-show="item.countOptions.length != 0">