综合服务完善修改
This commit is contained in:
1 parent
78762f43d2
commit
8d96247c44
7 files changed
+28
-10
No files matched your search
@@ -25,3 +25,6 @@ indent_size = 2
|
|||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -32,3 +32,6 @@
|
|||||||
*.otf binary
|
*.otf binary
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -62,7 +62,8 @@
|
|||||||
<dict-tag :options="feedback_type" :value="scope.row.type"></dict-tag>
|
<dict-tag :options="feedback_type" :value="scope.row.type"></dict-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="sort" label="排序" show-overflow-tooltip/>
|
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
|
||||||
|
<!-- <el-table-column prop="sort" label="排序" show-overflow-tooltip/>-->
|
||||||
<el-table-column label="操作" width="200">
|
<el-table-column label="操作" width="200">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button icon="view" text type="primary" v-auth="'integrated_feedback_edit'"
|
<el-button icon="view" text type="primary" v-auth="'integrated_feedback_edit'"
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12" class="mb20">
|
<el-col :span="12" class="mb20">
|
||||||
<el-form-item label="图片" prop="picUrl">
|
<el-form-item label="图片" prop="picUrl">
|
||||||
<upload-img v-model="form.picUrl"></upload-img>
|
<upload-img v-model:imageUrl="form.picUrl"></upload-img>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
|
|||||||
@@ -34,14 +34,18 @@
|
|||||||
@queryTable="getDataList"></right-toolbar>
|
@queryTable="getDataList"></right-toolbar>
|
||||||
</div>
|
</div>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-table :data="state.dataList" v-loading="state.loading" border
|
<el-table :data="state.dataList" v-loading="state.loading" border
|
||||||
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
|
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
|
||||||
@selection-change="selectionChangHandle"
|
@selection-change="selectionChangHandle"
|
||||||
@sort-change="sortChangeHandle">
|
@sort-change="sortChangeHandle">
|
||||||
<el-table-column type="selection" width="40" align="center" />
|
<el-table-column type="selection" width="40" align="center" />
|
||||||
<el-table-column type="index" label="#" width="40" />
|
<el-table-column type="index" label="#" width="40" />
|
||||||
<el-table-column prop="title" label="标题" show-overflow-tooltip/>
|
<el-table-column prop="title" label="标题" show-overflow-tooltip/>
|
||||||
<el-table-column prop="picUrl" label="图片" show-overflow-tooltip/>
|
<el-table-column prop="picUrl" label="图片" align="center" width="160px" show-overflow-tooltip>
|
||||||
|
<template #default="scope">
|
||||||
|
<preview-image :src="scope.row.picUrl" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="sort" label="排序" show-overflow-tooltip/>
|
<el-table-column prop="sort" label="排序" show-overflow-tooltip/>
|
||||||
<el-table-column prop="status" label="状态" show-overflow-tooltip>
|
<el-table-column prop="status" label="状态" show-overflow-tooltip>
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
@@ -50,6 +54,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="dateFound" label="发现日期" show-overflow-tooltip/>
|
<el-table-column prop="dateFound" label="发现日期" show-overflow-tooltip/>
|
||||||
<el-table-column prop="location" label="发现地点" show-overflow-tooltip/>
|
<el-table-column prop="location" label="发现地点" show-overflow-tooltip/>
|
||||||
|
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
|
||||||
<el-table-column label="操作" width="150">
|
<el-table-column label="操作" width="150">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button icon="edit-pen" text type="primary" v-auth="'integrated_lostAndFound_edit'"
|
<el-button icon="edit-pen" text type="primary" v-auth="'integrated_lostAndFound_edit'"
|
||||||
@@ -138,4 +143,4 @@ const handleDelete = async (ids: string[]) => {
|
|||||||
useMessage().error(err.msg);
|
useMessage().error(err.msg);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@@ -36,6 +36,11 @@
|
|||||||
<el-table-column type="selection" width="40" align="center" />
|
<el-table-column type="selection" width="40" align="center" />
|
||||||
<el-table-column type="index" label="#" width="40" />
|
<el-table-column type="index" label="#" width="40" />
|
||||||
<el-table-column prop="title" label="标题" show-overflow-tooltip/>
|
<el-table-column prop="title" label="标题" show-overflow-tooltip/>
|
||||||
|
<el-table-column prop="picUrl" label="图片" align="center" width="160px" show-overflow-tooltip>
|
||||||
|
<template #default="scope">
|
||||||
|
<preview-image :src="scope.row.picUrl" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column prop="status" label="状态" show-overflow-tooltip>
|
<el-table-column prop="status" label="状态" show-overflow-tooltip>
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
|
<dict-tag :options="maintenance_status" :value="scope.row.status"></dict-tag>
|
||||||
@@ -49,7 +54,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="createBy" label="上报人" show-overflow-tooltip/>
|
<el-table-column prop="createBy" label="上报人" show-overflow-tooltip/>
|
||||||
<el-table-column prop="sort" label="排序" show-overflow-tooltip/>
|
<!-- <el-table-column prop="sort" label="排序" show-overflow-tooltip/>-->
|
||||||
|
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
|
||||||
<el-table-column label="操作" width="200">
|
<el-table-column label="操作" width="200">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button icon="view" text type="primary" v-auth="'integrated_maintenanceOrder_edit'"
|
<el-button icon="view" text type="primary" v-auth="'integrated_maintenanceOrder_edit'"
|
||||||
|
|||||||
@@ -111,12 +111,12 @@ export const generateRandomData = (min: number, max: number): number => {
|
|||||||
export const generateTimeSeries = (startTime: Date, endTime: Date, interval: number = 60): string[] => {
|
export const generateTimeSeries = (startTime: Date, endTime: Date, interval: number = 60): string[] => {
|
||||||
const times: string[] = [];
|
const times: string[] = [];
|
||||||
const current = new Date(startTime);
|
const current = new Date(startTime);
|
||||||
|
|
||||||
while (current <= endTime) {
|
while (current <= endTime) {
|
||||||
times.push(formatDateTime(current, 'HH:mm'));
|
times.push(formatDateTime(current, 'HH:mm'));
|
||||||
current.setMinutes(current.getMinutes() + interval);
|
current.setMinutes(current.getMinutes() + interval);
|
||||||
}
|
}
|
||||||
|
|
||||||
return times;
|
return times;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -128,7 +128,7 @@ export const generateTimeSeries = (startTime: Date, endTime: Date, interval: num
|
|||||||
export const getDefaultTimeRange = (type: 'hour' | 'day' | 'month' = 'day') => {
|
export const getDefaultTimeRange = (type: 'hour' | 'day' | 'month' = 'day') => {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const startTime = new Date(now);
|
const startTime = new Date(now);
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'hour':
|
case 'hour':
|
||||||
startTime.setHours(now.getHours() - 24);
|
startTime.setHours(now.getHours() - 24);
|
||||||
@@ -140,7 +140,7 @@ export const getDefaultTimeRange = (type: 'hour' | 'day' | 'month' = 'day') => {
|
|||||||
startTime.setMonth(now.getMonth() - 6);
|
startTime.setMonth(now.getMonth() - 6);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
startTime: formatDateTime(startTime),
|
startTime: formatDateTime(startTime),
|
||||||
endTime: formatDateTime(now),
|
endTime: formatDateTime(now),
|
||||||
|
|||||||
Reference in new issue
Block a user