diff --git a/src/api/bpm/model.ts b/src/api/bpm/model.ts
index 9f95291b..c41485ce 100644
--- a/src/api/bpm/model.ts
+++ b/src/api/bpm/model.ts
@@ -28,7 +28,7 @@ export const updateModelState = async (id: number, state: number) => {
return await createAxios({ url: '/bpm/model/update-state', method: 'put', data: data })
}
-export const createModel = async (data) => {
+export const createModel = async data => {
return await createAxios({ url: '/bpm/model/create', method: 'POST', data: data })
}
diff --git a/src/api/harmonic-boot/area.ts b/src/api/harmonic-boot/area.ts
index 4277cb42..ee6e5560 100644
--- a/src/api/harmonic-boot/area.ts
+++ b/src/api/harmonic-boot/area.ts
@@ -96,3 +96,11 @@ export function getXbLineRank(data:any) {
data: data
})
}
+// 数据补招
+export function recall(data:any) {
+ return request({
+ url: '/data-processing-boot/data/recall',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index d959c4e8..595553c8 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -1,16 +1,25 @@
@@ -48,7 +81,7 @@ import { mainHeight } from '@/utils/layout'
import { useDictData } from '@/stores/dictData'
import { Search, RefreshLeft } from '@element-plus/icons-vue'
import { defineProps } from 'vue'
-const emit = defineEmits(['selectChange',])
+const emit = defineEmits(['selectChange'])
const tableStore = inject('tableStore') as TableStore
const tableHeader = ref()
const datePickerRef = ref()
@@ -66,7 +99,6 @@ interface Props {
showReset?: boolean //是否显示重置按钮
showExport?: boolean //导出控制
showTimeAll?: boolean //控制时间是否显示
-
}
const props = withDefaults(defineProps(), {
@@ -78,7 +110,6 @@ const props = withDefaults(defineProps(), {
showReset: true,
showExport: false,
showTimeAll: false
-
})
// 动态计算table高度
const resizeObserver = new ResizeObserver(entries => {
@@ -101,20 +132,19 @@ const headerFormSecondStyleClose = {
watch(
() => tableStore.table.params.deptIndex,
- (newVal) => {
+ newVal => {
setTimeout(() => {
- areaRef.value.change()
- }, 0);
+ areaRef.value && areaRef.value.change()
+ }, 0)
}
)
watch(
() => timeAll.value,
- (newVal) => {
+ newVal => {
tableStore.timeAll = newVal
- setTimeout(() => {
- computedSearchRow()
- },500)
-
+ setTimeout(() => {
+ computedSearchRow()
+ }, 500)
}
)
onMounted(() => {
@@ -131,9 +161,9 @@ onMounted(() => {
}
nextTick(() => {
resizeObserver.observe(tableHeader.value)
- setTimeout(() => {
- computedSearchRow()
- },500)
+ setTimeout(() => {
+ computedSearchRow()
+ }, 500)
})
})
onUnmounted(() => {
@@ -147,30 +177,30 @@ const handlerHeight = () => {
).height as string
}
const computedSearchRow = () => {
-if (!headerForm.value.$el) return
-// 清空headerFormSecond.value.$el下的元素
-while (headerFormSecond.value.$el.firstChild) {
- headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
-}
-// 获取第一行放了几个表单
-const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
-
-// 把第一行放不下的复制一份放到headerFormSecond.value.$el
-let width = 0
-for (let i = 0; i < elFormItem.length; i++) {
- width += elFormItem[i].offsetWidth + 32
-
- if (width > headerForm.value.$el.offsetWidth) {
- headerFormSecond.value.$el.appendChild(elFormItem[i])
+ if (!headerForm.value.$el) return
+ // 清空headerFormSecond.value.$el下的元素
+ while (headerFormSecond.value.$el.firstChild) {
+ headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
}
-}
+ // 获取第一行放了几个表单
+ const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
-// 判断是否需要折叠
-if (headerFormSecond.value.$el.scrollHeight > 0) {
- showUnfoldButton.value = true
-} else {
- showUnfoldButton.value = false
-}
+ // 把第一行放不下的复制一份放到headerFormSecond.value.$el
+ let width = 0
+ for (let i = 0; i < elFormItem.length; i++) {
+ width += elFormItem[i].offsetWidth + 32
+
+ if (width > headerForm.value.$el.offsetWidth) {
+ headerFormSecond.value.$el.appendChild(elFormItem[i])
+ }
+ }
+
+ // 判断是否需要折叠
+ if (headerFormSecond.value.$el.scrollHeight > 0) {
+ showUnfoldButton.value = true
+ } else {
+ showUnfoldButton.value = false
+ }
}
const showSelect = ref(false)
@@ -179,7 +209,6 @@ const showSelectChange = () => {
emit('selectChange', showSelect.value)
}
const onComSearch = async () => {
-
if (props.datePicker && timeAll.value) {
tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
@@ -206,7 +235,16 @@ const onExport = () => {
tableStore.onTableAction('export', { showAllFlag: true })
}
-defineExpose({ onComSearch, areaRef, setDatePicker, setTheDate, datePickerRef, showSelectChange,computedSearchRow,onExport })
+defineExpose({
+ onComSearch,
+ areaRef,
+ setDatePicker,
+ setTheDate,
+ datePickerRef,
+ showSelectChange,
+ computedSearchRow,
+ onExport
+})