xzzn/emsfront
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop_cloud #1

Merged
dashixiong merged 234 commits from develop_cloud into main-cloud 2026-02-11 02:06:04 +00:00
Conversation 0 Commits 234 Files Changed 137 +9361 -30
97 changed files with 9361 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 763338cc2a - Show all commits

2
src/components/Ems/DateRangeSelect/index.vue
View File

@ -10,7 +10,7 @@
:picker-options="pickerOptions"
end-placeholder="结束时间">
</el-date-picker>
<el-button type="default" size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
<el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
<el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
<el-button type="primary" size="mini" :loading="loading" @click="timeLine('before')">上一时段</el-button>
<el-button type="primary" size="mini" :loading="loading" @click="timeLine('next')" :disabled="disabledNextBtn">下一时段</el-button>

4
src/views/ems/dzjk/home/index.vue
View File

@ -59,7 +59,6 @@ import WeekChart from "./WeekChart.vue";
import ActiveChart from "./ActiveChart.vue";
import AlarmTable from "./AlarmTable.vue";
import getQuerySiteId from '@/mixins/ems/getQuerySiteId'
import {formatDate} from "@/filters/ems";
export default {
name:'DzjkSbjkHome',
components: {WeekChart,ActiveChart,AlarmTable},
@ -111,8 +110,7 @@ export default {
},
getRunningInfo(){
return getDzjkHomeView(this.siteId).then(response => {
const data = response?.data || {}
this.runningInfo = data
this.runningInfo = response?.data || {}
})
},
init(){