Skip to content

W
web-project
Commit 409ee0dc authored by 张伯涛's avatar 张伯涛
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ebbbda09 3fa2b0a3
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
src/api/AIStation/VoiceCommand.js
View file @ 409ee0dc
......@@ -2,7 +2,7 @@ import httpTwo from '../httpTwo'
export const getVoiceCommandsData = (item) => {
return httpTwo.get(`/busVoiceCommands/list?page=${item.page}&rows=${item.rows}&stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}&startTime=${item.startTime}&endTime=${item.endTime}`)
return httpTwo.get(`/busVoiceCommands/list?page=${item.page}&rows=${item.rows}&stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}&beginTime=${item.beginTime}&endTime=${item.endTime}`)
}
export const addVoiceCommands = (item) => {
......@@ -18,5 +18,5 @@ export const updateVoiceCommands = (item) => {
}
export const exportVoiceCommands = (item) => {
return httpTwo.get(`/busVoiceCommands/export?stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}&startTime=${item.startTime}&endTime=${item.endTime}`,'','',{responseType:'blob'})
return httpTwo.get(`/busVoiceCommands/export?stationId=${item.stationId}&ipAddress=${item.ipAddress}&macAddress=${item.macAddress}&beginTime=${item.beginTime}&endTime=${item.endTime}`,'','',{responseType:'blob'})
}
src/views/AIStation/ExtinguisherPage/index.vue
View file @ 409ee0dc
......@@ -105,7 +105,7 @@ function getNumber() {
})
}
handleGetAIToken();
// handleGetAIToken();
/** 导出按钮操作 */
const handleExport = () => {
const item = reactive({
......@@ -247,14 +247,14 @@ function getSupplys() {
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间：" prop="startTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.startTime"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
......
src/views/AIStation/MoveMonitorPage/index.vue
View file @ 409ee0dc
......@@ -70,7 +70,7 @@ const queryParams = reactive({
stationId: '',
alarmStatus: '',
alarmType: '',
startTime: '',
beginTime: '',
endTime: '',
});
......@@ -81,7 +81,7 @@ const search = () => {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
if (selectedBtn.value === 1) {
......@@ -108,7 +108,7 @@ const handleExport = () => {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
console.log('selectedBtn.value:', selectedBtn.value)
......@@ -249,14 +249,14 @@ getSupplys();
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间：" prop="startTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.startTime"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
......
src/views/AIStation/PipelineTempPage/index.vue
View file @ 409ee0dc
......@@ -67,7 +67,7 @@ const queryParams = reactive({
stationId: '',
alarmStatus: '',
thermalAlarmType: '',
startTime: '',
beginTime: '',
endTime: '',
});
const Page = reactive({total: 0, rows: 20, page: 1});
......@@ -106,7 +106,7 @@ const search = () => {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.thermalAlarmType,
startTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
......@@ -133,8 +133,8 @@ const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
startTime: queryParams.startTime,
alarmType: queryParams.thermalAlarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
console.log('selectedBtn.value:', selectedBtn.value)
......@@ -281,14 +281,14 @@ getSupplys();
<el-option v-for="item in thermalAlarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间：" prop="startTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.startTime"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
......
src/views/AIStation/RecyclePumpPage/index.vue
View file @ 409ee0dc
......@@ -90,7 +90,7 @@ const queryParams = reactive({
stationId: '',
alarmStatus: '',
alarmType: '',
startTime: '',
beginTime: '',
endTime: '',
});
......@@ -100,10 +100,10 @@ const search = () => {
const item = {
page: Page.page,
size: Page.rows,
stationId: stationId.value,
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
startTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
if (selectedBtn.value === 1) {
......@@ -130,7 +130,7 @@ const handleExport = () => {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
console.log('selectedBtn.value:', selectedBtn.value)
......@@ -273,14 +273,14 @@ getSupplys();
<el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间：" prop="startTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.startTime"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
......
src/views/AIStation/TransTempPage/index.vue
View file @ 409ee0dc
......@@ -101,7 +101,7 @@ const queryParams = reactive({
stationId: '',
alarmStatus: '',
alarmType: '',
startTime: '',
beginTime: '',
endTime: '',
});
......@@ -114,7 +114,7 @@ const search = () => {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
startTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
if (selectedBtn.value === 1) {
......@@ -141,7 +141,7 @@ const handleExport = () => {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
beginTime: queryParams.startTime,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
console.log('selectedBtn.value:', selectedBtn.value)
......@@ -289,14 +289,14 @@ getSupplys();
<el-option v-for="item in alarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
</el-select>
</el-form-item>
<el-form-item label="开始时间：" prop="startTime" v-if="selectedBtn !== 1">
<el-form-item label="开始时间：" prop="beginTime" v-if="selectedBtn !== 1">
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.startTime"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
......
src/views/AIStation/VoiceCommandPage.vue
View file @ 409ee0dc
......@@ -38,7 +38,7 @@ let singleDetails = {
const queryParams = ref({
stationId: '',
startTime: '',
beginTime: '',
endTime: '',
ipAddress: '',
macAddress: '',
......@@ -51,7 +51,7 @@ function loadData(){
page: Page.page,
rows: Page.rows,
stationId: queryParams.value.stationId,
startTime: queryParams.value.startTime,
beginTime: queryParams.value.beginTime,
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
......@@ -69,7 +69,7 @@ loadData()
const handleExport = () => {
const item = {
stationId: queryParams.value.stationId,
startTime: queryParams.value.startTime,
beginTime: queryParams.value.beginTime,
endTime: queryParams.value.endTime,
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
......@@ -91,7 +91,7 @@ const handleExport = () => {
const resetSearch = () => {
queryParams.value = {
stationId: '',
startTime: '',
beginTime: '',
endTime: '',
ipAddress: '',
macAddress: '',
......@@ -201,14 +201,14 @@ function handleDetail(row) {
<el-form-item label="MAC地址:" prop="macAddress">
<el-input placeholder="" style="width: 180px" v-model="queryParams.macAddress"/>
</el-form-item>
<el-form-item label="开始时间：" prop="startTime">
<el-form-item label="开始时间：" prop="beginTime">
<el-config-provider :locale="zhCn">
<el-date-picker
type="datetime"
value-format="YYYY-MM-DD HH:00:00"
placeholder="选择开始时间"
style="width: 180px"
v-model="queryParams.startTime"
v-model="queryParams.beginTime"
/>
</el-config-provider>
</el-form-item>
......
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