| .env.development | ●●●●● patch | view | raw | blame | history | |
| package-lock.json | ●●●●● patch | view | raw | blame | history | |
| src/views/dataCenter/components/searchData.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/dataCenter/dataCenter.vue | ●●●●● patch | view | raw | blame | history | |
| yarn.lock | ●●●●● patch | view | raw | blame | history |
.env.development
@@ -10,9 +10,9 @@ VITE_APP_BASE=/manage # 服务地址 #VITE_APP_URL = https://wrj.shuixiongit.com/api VITE_APP_URL = https://wrj.shuixiongit.com/api #VITE_APP_URL= http://192.168.1.168 rjg VITE_APP_URL= http://192.168.1.33 #VITE_APP_URL= http://192.168.1.33 #新大屏地址 VITE_APP_DASHBOARD_URL = 'https://wrj.shuixiongit.com/command-center-dashboard/' package-lock.json
Diff too large src/views/dataCenter/components/searchData.vue
@@ -111,10 +111,10 @@ import dayjs from 'dayjs'; import { useStore } from 'vuex'; import { getRegionTreeAll, getDeviceRegion, deptsByAreaCode } from '@/api/job/task'; const store = useStore(); const userAreaCode = computed(() => store.getters.userInfo.detail.areaCode); const selectedAreaCode = computed(() => store.state.user.selectedAreaCode); const emit = defineEmits(['search']); const treeProps = { label: 'name', value: 'id', @@ -172,7 +172,21 @@ let deptData = ref([]); // 从单机巢任务传参值 const signDevice_sn = ref(''); const handleDateChange = () => {}; // 日期限制 const handleDateChange = val => { if (val && val.length === 2) { const start = dayjs(val[0]); const end = dayjs(val[1]); const diff = end.diff(start, 'day'); if (diff > 31) { ElMessage.warning('日期范围不能超过31天'); dateRange.value = []; return; } } handleSearch(); }; // 部门下得机巢 const requestDockInfo = () => { getRegionTreeAll({ parentCode: userAreaCode.value }).then(res => { @@ -207,9 +221,32 @@ }); }; // 搜索 const handleSearch = () => {}; const handleSearch = () => { if (!dateRange.value) { dateRange.value = []; } let params = { ...searchForm, start_date: dateRange.value.length ? dayjs(dateRange?.value[0]).startOf('day').format(timeFormat) : null, end_date: dateRange.value.length ? dayjs(dateRange?.value[1]).endOf('day').format(timeFormat) : null, }; console.log('searchForm', params); // 调用父组件方法 emit('search', params); }; // 重置 const handleReset = () => {}; const handleReset = () => { dateRange.value = []; Object.keys(searchForm).forEach(key => { searchForm[key] = ''; }); handleNodeClick({ id: userAreaCode.value }); handleSearch(); }; onMounted(() => { requestDockInfo(); }); src/views/dataCenter/dataCenter.vue
@@ -1,11 +1,11 @@ <template> <div class="dataCenter-table"> <searchData></searchData> <searchData @search="searchClick"></searchData> <!-- 表格部分 --> <div class="dataTable" > <div class="dataTable"> <el-table v-loading="loading" element-loading-text="加载中" v-loading="loading" element-loading-text="加载中" stripe :data="tableData" class="custom-header" @@ -15,8 +15,8 @@ <el-table-column label="序号" type="index" width="60" /> <el-table-column prop="regionName" label="所属区域" /> <el-table-column property="nestName" label="所属机巢" /> <el-table-column property="jobName" label="任务名称" show-overflow-tooltip/> <el-table-column prop="nickName" label="文件名称" show-overflow-tooltip /> <el-table-column property="jobName" label="任务名称" show-overflow-tooltip /> <el-table-column prop="nickName" label="文件名称" show-overflow-tooltip /> <el-table-column property="img" label="缩图" width="120"> <template #default="scope"> <img @@ -43,10 +43,10 @@ </template> </el-table-column> <el-table-column prop="createTime" label="任务时间" /> <el-table-column property="photoType" label="文件类别" > <template #default="scope"> <span>{{scope.row.photoType=== 'visible' ? '可见光':'红外'}}</span> </template> <el-table-column property="photoType" label="文件类别"> <template #default="scope"> <span>{{ scope.row.photoType === 'visible' ? '可见光' : '红外' }}</span> </template> </el-table-column> <el-table-column property="resultType" label="文件格式"> <template #default="scope"> @@ -196,16 +196,31 @@ // 获取列表数据 const getgetaiImagesPage = () => { getaiImagesPage(jobListParams).then(res => { loading.value = true; loading.value = true; total.value = res.data.data.total; tableData.value = res.data.data?.records; console.log('res', tableData.value, total.value); loading.value = false; loading.value = false; }); }; const handleSizeChange = () => {}; const handleCurrentChange = () => {}; // 查询 const searchClick = params => { jobListParams.current = 1; jobListParams.size = 10; jobListParams.searchParams = params; console.log('jobListParams', jobListParams); // getgetaiImagesPage() }; const handleSizeChange = val => { jobListParams.size = val; getgetaiImagesPage(); }; const handleCurrentChange = val => { jobListParams.current = val; getgetaiImagesPage(); }; // 多选 const selectedRows = ref([]); const handleSelectionChange = val => { yarn.lock
Diff too large