From d0223045d2dd1cccc26c995c972e80e60bd19b26 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 02 六月 2025 08:45:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
index 250d167..3c1820f 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
@@ -62,15 +62,11 @@
import { filterObj } from '@/utils/util'
import { putAction, getAction } from '@/api/manage'
import DeviceCalendarModel from './DeviceCalendarModel'
- import DeviceCalendarAdd from './DeviceCalendarAdd'
- import DeviceCalendarListModel from './DeviceCalendarListModel'
- import {
- JeecgListMixin
- } from '@/mixins/JeecgListMixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'DeviceCalendarList',
- components: { DeviceCalendarModel, DeviceCalendarAdd, DeviceCalendarListModel },
+ components: { DeviceCalendarModel },
mixins: [JeecgListMixin],
data() {
return {
@@ -106,7 +102,7 @@
width: 150
},
{
- title: '璁惧鍚嶇О',
+ title: '瀹夎浣嶇疆',
align: 'center',
dataIndex: 'equipmentName',
width: 150
--
Gitblit v1.9.3