Skip to content

W
web-project
Commit f182416c authored by hubaoshan's avatar hubaoshan
Browse files
Options

结束时间不能早于开始时间等bug

parent 52e4eb8a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 158 deletions
src/api/AIStation/TransTemp.js
View file @ f182416c
...@@ -25,5 +25,5 @@ export const exportTransTempHistoryData = (item) =>{ ...@@ -25,5 +25,5 @@ export const exportTransTempHistoryData = (item) =>{
} }
export const exportTransTempAlarmData = (item) =>{ export const exportTransTempAlarmData = (item) =>{
return httpTwo.get(`/bustransfertemperaturealarm/export?stationId=${item.stationId}&alarmStatus=${item.alarmStatus}&beginTime=${item.beginTime}&endTime=${item.endTime}&alarmType=${item.alarmType}`,'','',{responseType:'blob'}) return httpTwo.get(`/bustransfertemperaturealarm/export?stationId=${item.stationId}&handleStatus=${item.handleStatus}&alarmStatus=${item.alarmStatus}&beginTime=${item.beginTime}&endTime=${item.endTime}&alarmType=${item.alarmType}`,'','',{responseType:'blob'})
} }
src/views/AIStation/ExtinguisherPage/index.vue
View file @ f182416c
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
exportExtinguisherAlarmData, getListNewData exportExtinguisherAlarmData, getListNewData
} from "../../../api/AIStation/Extinguisher.js"; } from "../../../api/AIStation/Extinguisher.js";
import {useRoute} from "vue-router"; import {useRoute} from "vue-router";
import {ElMessage} from "element-plus";
const options = ref([]); const options = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
...@@ -220,9 +221,31 @@ const resetSearch = () => { ...@@ -220,9 +221,31 @@ const resetSearch = () => {
endTime: '', endTime: '',
} }
console.log('queryParams:',queryParams) console.log('queryParams:',queryParams)
getData() // getData()
} }
watch(
() => queryParams.endTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.endTime = '';
}
}
)
watch(
() => queryParams.beginTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.beginTime = '';
}
}
)
const loading = ref(true); const loading = ref(true);
getEnterprise(); getEnterprise();
...@@ -338,16 +361,6 @@ watch( ...@@ -338,16 +361,6 @@ watch(
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化，执行相应操作 // 路由变化，执行相应操作
performActions() performActions()
// handleGetAIToken();
// const checkAIToken = setInterval(() => {
// if (localStorage.getItem('AIToken')) {
// clearInterval(checkAIToken); // 停止轮询
// getNumber();
// // getData();
// resetSearch();
// }
// }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
...@@ -398,7 +411,7 @@ watch( ...@@ -398,7 +411,7 @@ watch(
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button> <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
<el-button type="primary" @click="resetSearch()" class="add-search-btn" v-if="selectedBtn !== 3">重置</el-button> <el-button type="primary" @click="resetSearch()" class="add-search-btn">重置</el-button>
<el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button> <el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
src/views/AIStation/MoveMonitorPage/index.vue
View file @ f182416c
...@@ -14,6 +14,7 @@ import { ...@@ -14,6 +14,7 @@ import {
import {useRoute} from "vue-router"; import {useRoute} from "vue-router";
import {handleGetAIToken} from "../AItoken.js"; import {handleGetAIToken} from "../AItoken.js";
import ExtinguisherNewDataPage from "../ExtinguisherPage/ExtinguisherNewDataPage.vue"; import ExtinguisherNewDataPage from "../ExtinguisherPage/ExtinguisherNewDataPage.vue";
import {ElMessage} from "element-plus";
const options = ref([]); const options = ref([]);
...@@ -218,7 +219,7 @@ const resetSearch = () => { ...@@ -218,7 +219,7 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '', endTime: '',
} }
getData() // getData()
} }
const loading = ref(true); const loading = ref(true);
...@@ -337,21 +338,33 @@ watch( ...@@ -337,21 +338,33 @@ watch(
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化，执行相应操作 // 路由变化，执行相应操作
performActions() performActions()
// handleGetAIToken();
// // 轮询检测 localStorage 是否更新
// const checkAIToken = setInterval(() => {
// if (localStorage.getItem('AIToken')) {
// clearInterval(checkAIToken); // 停止轮询
// getNumber();
// // getData();
// resetSearch();
// }
// }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
) )
watch(
() => queryParams.endTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.endTime = '';
}
}
)
watch(
() => queryParams.beginTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.beginTime = '';
}
}
)
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
......
src/views/AIStation/PipelineTempPage/index.vue
View file @ f182416c
...@@ -15,6 +15,7 @@ import { ...@@ -15,6 +15,7 @@ import {
import {useRoute} from "vue-router"; import {useRoute} from "vue-router";
import {handleGetAIToken} from "../AItoken.js"; import {handleGetAIToken} from "../AItoken.js";
import RecyclePumpNewDataPage from "../RecyclePumpPage/RecyclePumpNewDataPage.vue"; import RecyclePumpNewDataPage from "../RecyclePumpPage/RecyclePumpNewDataPage.vue";
import {ElMessage} from "element-plus";
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
...@@ -242,7 +243,7 @@ const resetSearch = () => { ...@@ -242,7 +243,7 @@ const resetSearch = () => {
beginTime: '', beginTime: '',
endTime: '', endTime: '',
} }
getData() // getData()
} }
const options = ref([]); const options = ref([]);
const enterpriseId = ref(); const enterpriseId = ref();
...@@ -362,21 +363,33 @@ watch( ...@@ -362,21 +363,33 @@ watch(
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化，执行相应操作 // 路由变化，执行相应操作
performActions() performActions()
// handleGetAIToken();
// // 轮询检测 localStorage 是否更新
// const checkAIToken = setInterval(() => {
// if (localStorage.getItem('AIToken')) {
// clearInterval(checkAIToken); // 停止轮询
// getNumber();
// // getData();
// resetSearch();
// }
// }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
) )
watch(
() => queryParams.endTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.endTime = '';
}
}
)
watch(
() => queryParams.beginTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.beginTime = '';
}
}
)
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
...@@ -428,7 +441,7 @@ watch( ...@@ -428,7 +441,7 @@ watch(
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button> <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
<el-button type="primary" @click="resetSearch" class="add-search-btn" v-if="selectedBtn !== 3">重置</el-button> <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
<el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button> <el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button>
</el-form-item> </el-form-item>
<!-- <div>--> <!-- <div>-->
......
src/views/AIStation/RecyclePumpPage/index.vue
View file @ f182416c
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
} from "../../../api/AIStation/RecyclePump.js"; } from "../../../api/AIStation/RecyclePump.js";
import {handleGetAIToken} from "../AItoken.js"; import {handleGetAIToken} from "../AItoken.js";
import {useRoute} from "vue-router"; import {useRoute} from "vue-router";
import {ElMessage} from "element-plus";
const {proxy} = getCurrentInstance(); const {proxy} = getCurrentInstance();
// 列表 // 列表
...@@ -193,16 +194,16 @@ const resetSearch = () => { ...@@ -193,16 +194,16 @@ const resetSearch = () => {
queryParams.endTime = '' queryParams.endTime = ''
queryParams.stationId = '' queryParams.stationId = ''
searchData.value = [] searchData.value = []
// childParams.value = { childParams.value = {
// // page: Page.page, page: Page.page,
// // size: Page.rows, size: Page.rows,
// // stationId: '', stationId: '',
// // alarmStatus: '', alarmStatus: '',
// // alarmType: '', alarmType: '',
// // beginTime: '', beginTime: '',
// // endTime: '', endTime: '',
// } }
getData() // getData()
}; };
const childComponentRef = ref(null); const childComponentRef = ref(null);
// 子组件getData()方法 // 子组件getData()方法
...@@ -335,6 +336,29 @@ function getSupplys(){ ...@@ -335,6 +336,29 @@ function getSupplys(){
// stationId.value.push(options[0].children[0].children[0].value); // stationId.value.push(options[0].children[0].children[0].value);
} }
getSupplys(); getSupplys();
watch(
() => queryParams.endTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.endTime = '';
}
}
)
watch(
() => queryParams.beginTime,
() => {
if (queryParams.endTime && queryParams.beginTime && queryParams.endTime < queryParams.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.beginTime = '';
}
}
)
</script> </script>
<template> <template>
<div class="app-content"> <div class="app-content">
...@@ -381,7 +405,7 @@ getSupplys(); ...@@ -381,7 +405,7 @@ getSupplys();
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="search" class="add-search-btn">查询</el-button> <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
<el-button type="primary" @click="resetSearch" class="add-search-btn" v-if="selectedBtn !== 3">重置</el-button> <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
<el-button type="primary" @click="handleExport" class="add-search-btn">导出</el-button> <el-button type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
View file @ f182416c
...@@ -252,10 +252,10 @@ function handleDetail(item){ ...@@ -252,10 +252,10 @@ function handleDetail(item){
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="handleStatus" align="center" label="处理状态" sortable :sort-map="sortMapData"> <el-table-column prop="handleStatus" align="center" label="处理状态" sortable :sort-map="sortMapData">
<template #header> <!-- <template #header>-->
<span>处理状态</span> <!-- <span>处理状态</span>-->
<el-button size="small" @click="handleStatus1">操作</el-button> <!-- <el-button size="small" @click="handleStatus1">操作</el-button>-->
</template> <!-- </template>-->
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.handleStatus=== 0" style="color: red">未处理</span> <span v-if="scope.row.handleStatus=== 0" style="color: red">未处理</span>
<span v-else-if="scope.row.handleStatus=== 1">已处理</span> <span v-else-if="scope.row.handleStatus=== 1">已处理</span>
......
src/views/AIStation/TransTempPage/TransTempHistoryPage.vue
View file @ f182416c
...@@ -196,7 +196,7 @@ const handleSortChange = (data) => { ...@@ -196,7 +196,7 @@ const handleSortChange = (data) => {
:data="TransTempHistoryData" :data="TransTempHistoryData"
border border
style="width: 98%;margin-left: 15px" style="width: 98%;margin-left: 15px"
height="calc(100vh - 280px)" height="calc(100vh - 330px)"
:header-cell-class-name="tableHeaderClass" :header-cell-class-name="tableHeaderClass"
:row-class-name="tableBodyClass" :row-class-name="tableBodyClass"
@sort-change="handleSortChange" @sort-change="handleSortChange"
......
src/views/AIStation/TransTempPage/index.vue
View file @ f182416c
This diff is collapsed.
src/views/AIStation/VoiceCommandLocationPage.vue
View file @ f182416c
...@@ -707,7 +707,7 @@ function validateIp(rule, value, callback) { ...@@ -707,7 +707,7 @@ function validateIp(rule, value, callback) {
<el-form label-width="80px"> <el-form label-width="80px">
<el-form-item label="换热站:"> <el-form-item label="换热站:">
<el-cascader :options="options" v-model="addOrUpdateForm.stationId" filterable clearable :show-all-levels="false" <el-cascader :options="options" v-model="addOrUpdateForm.stationId" filterable clearable :show-all-levels="false"
placeholder="请选择" style="min-width: 810px;" /> placeholder="请选择" style="min-width: 652px;" />
<!-- <el-select v-model="addOrUpdateForm.stationId" placeholder="请选择" filterable clearable>--> <!-- <el-select v-model="addOrUpdateForm.stationId" placeholder="请选择" filterable clearable>-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in options"--> <!-- v-for="item in options"-->
......
src/views/AIStation/VoiceCommandPage.vue
View file @ f182416c
...@@ -142,7 +142,29 @@ const resetSearch = () => { ...@@ -142,7 +142,29 @@ const resetSearch = () => {
loadData(); loadData();
}; };
watch(
() => queryParams.value.endTime,
() => {
if (queryParams.value.endTime && queryParams.value.beginTime && queryParams.value.endTime < queryParams.value.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.value.endTime = '';
}
}
)
watch(
() => queryParams.value.beginTime,
() => {
if (queryParams.value.endTime && queryParams.value.beginTime && queryParams.value.endTime < queryParams.value.beginTime) {
ElMessage.error({
message: '结束时间不能早于开始时间!'
})
queryParams.value.beginTime = '';
}
}
)
getEnterprise(); getEnterprise();
function getEnterprise(){ function getEnterprise(){
const result = store.getters.getEnterprise(); const result = store.getters.getEnterprise();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment