Skip to content

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

Merge remote-tracking branch 'origin/master'

parents bcd59b45 0c9b9a68
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 107 deletions
src/views/AIStation/MoveMonitorPage/MoveMonitorAlarmPage.vue
View file @ d195c095
......@@ -89,12 +89,12 @@ function getDataByParams(){
Page.rows = res.pageSize
})
}
function getName(name) {
if (AlarmData && AlarmData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (AlarmData && AlarmData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
function getDataNew(item) {
getMoveListAlarmNewData(item).then(res => {
......@@ -178,28 +178,28 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站" sortable>
<el-table-column prop="stationName" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" align="center" label="设施名称" sortable/>
<el-table-column prop="eventTime" align="center" label="报警时间" sortable/>
<el-table-column prop="alarmType" align="center" label="报警类型">
<el-table-column prop="eventType" align="center" label="报警类型">
<template #default="scope">
<span v-if="scope.row.alarmType=== '0'">最高温度</span>
<span v-else-if="scope.row.alarmType=== '1'">最低温度</span>
<span v-else-if="scope.row.alarmType=== '2'">平均温度</span>
<span v-else-if="scope.row.alarmType=== '3'">温差</span>
<span v-else-if="scope.row.alarmType=== '4'">温度突升</span>
<span v-else-if="scope.row.alarmType=== '5'">温度突降</span>
<span v-if="scope.row.eventType=== 0">最高温度</span>
<span v-else-if="scope.row.eventType=== 1">最低温度</span>
<span v-else-if="scope.row.eventType=== 2">平均温度</span>
<span v-else-if="scope.row.eventType=== 3">温差</span>
<span v-else-if="scope.row.eventType=== 4">温度突升</span>
<span v-else-if="scope.row.eventType=== 5">温度突降</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="handleStatus" align="center" label="处理状态">
<template #default="scope">
<span v-if="scope.row.handleStatus=== '0'" style="color: red">未处理</span>
<span v-else-if="scope.row.handleStatus=== '1'">已处理</span>
<span v-if="scope.row.handleStatus=== 0" style="color: red">未处理</span>
<span v-else-if="scope.row.handleStatus=== 1">已处理</span>
<span v-else>-</span>
</template>
</el-table-column>
......
src/views/AIStation/MoveMonitorPage/MoveMonitorHistoryPage.vue
View file @ d195c095
......@@ -85,12 +85,12 @@ function getDataByParams(){
historyPage.rows = res.pageSize
})
}
function getName(name) {
if (HistoryData && HistoryData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (HistoryData && HistoryData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
function getDataNew(item) {
getMoveListHistoryData(item).then(res => {
......@@ -174,9 +174,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="所属换热站" sortable>
<el-table-column prop="stationName" align="center" label="所属换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable/>
......@@ -192,9 +192,9 @@ getSupplys()
<el-table-column prop="result" align="center" label="采集数据"/>
<el-table-column prop="taskState" align="center" label="状态">
<template #default="scope">
<span v-if="scope.row.taskState=== '1'">执行中</span>
<span v-else-if="scope.row.taskState=== '2'">成功</span>
<span v-else-if="scope.row.taskState=== '99'">失败</span>
<span v-if="scope.row.taskState=== 1">执行中</span>
<span v-else-if="scope.row.taskState=== 2">成功</span>
<span v-else-if="scope.row.taskState=== 99">失败</span>
<span v-else>-</span>
</template>
</el-table-column>
......
src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue
View file @ d195c095
......@@ -80,12 +80,12 @@ function getData(){
Page.rows = res.pageSize
})
}
function getName(name) {
if (data && data.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (data && data.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
function getDataNew(item) {
getMoveListNewData(item).then(res => {
......@@ -169,9 +169,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="所属换热站" sortable>
<el-table-column prop="stationName" align="center" label="所属换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="relateDeviceId" align="center" label="设备" sortable/>
......@@ -187,9 +187,9 @@ getSupplys()
<el-table-column prop="result" align="center" label="采集数据"/>
<el-table-column prop="taskState" align="center" label="状态">
<template #default="scope">
<span v-if="scope.row.taskState=== '1'">执行中</span>
<span v-else-if="scope.row.taskState=== '2'">成功</span>
<span v-else-if="scope.row.taskState=== '99'">失败</span>
<span v-if="scope.row.taskState=== 1">执行中</span>
<span v-else-if="scope.row.taskState=== 2">成功</span>
<span v-else-if="scope.row.taskState=== 99">失败</span>
<span v-else>-</span>
</template>
</el-table-column>
......
src/views/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue
View file @ d195c095
......@@ -80,12 +80,12 @@ function getDataByParams(){
Page.rows = res.pageSize
})
}
function getName(name){
if(AlarmData && AlarmData.value.length > 0 && name !== undefined && options && options.value.length>0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name){
// if(AlarmData && AlarmData.value.length > 0 && name !== undefined && options && options.value.length>0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
getEnterprise();
function getEnterprise(){
const result = store.getters.getEnterprise();
......@@ -149,9 +149,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站" sortable>
<el-table-column prop="stationName" align="center" label="换热站" sortable>
<template #default="scope">
<span>{{getName(scope.row.stationId) || '-' }}</span>
<span>{{scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" align="center" label="设施名称" sortable/>
......
src/views/AIStation/PipelineTempPage/PipelineTempHistoryPage.vue
View file @ d195c095
......@@ -91,12 +91,12 @@ function getDataByParams() {
})
}
function getName(name) {
if (HistoryData && HistoryData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (HistoryData && HistoryData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
getEnterprise();
......@@ -172,9 +172,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<el-table-column prop="stationName" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{ getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/>
......
src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue
View file @ d195c095
......@@ -83,12 +83,12 @@ function getDataByParams() {
})
}
function getName(name) {
if (data && data.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (data && data.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
const enterpriseId = ref();
const loading = ref(true);
......@@ -175,9 +175,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<el-table-column prop="stationName" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{ getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceIndexCode" align="center" label="光纤设备" sortable/>
......
src/views/AIStation/PipelineTempPage/index.vue
View file @ d195c095
......@@ -133,7 +133,7 @@ const handleExport = () => {
const item = {
stationId: queryParams.stationId,
alarmStatus: queryParams.alarmStatus,
alarmType: queryParams.alarmType,
alarmType: queryParams.thermalAlarmType,
beginTime: queryParams.beginTime,
endTime: queryParams.endTime,
}
......
src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
View file @ d195c095
......@@ -82,12 +82,12 @@ function getDataByParams() {
})
}
function getName(name) {
if (TransTempAlarmData && TransTempAlarmData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (TransTempAlarmData && TransTempAlarmData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
function getDataNew(item) {
getTransListAlarmData(item).then(res => {
......@@ -171,9 +171,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" label="换热站" align="center" sortable>
<el-table-column prop="stationName" label="换热站" align="center" sortable>
<template #default="scope">
<span>{{ getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="srcName" label="设备名称" align="center" sortable/>
......
src/views/AIStation/TransTempPage/TransTempHistoryPage.vue
View file @ d195c095
......@@ -85,12 +85,12 @@ function getDataByParams() {
})
}
function getName(name) {
if (TransTempHistoryData && TransTempHistoryData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (TransTempHistoryData && TransTempHistoryData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
function getDataNew(item) {
getTransListHistoryData(item).then(res => {
......@@ -174,9 +174,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<el-table-column prop="stationName" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{ getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
......
src/views/AIStation/TransTempPage/TransTempNewDataPage.vue
View file @ d195c095
......@@ -86,12 +86,12 @@ function getDataByParams() {
})
}
function getName(name) {
if (TransTempNewData && TransTempNewData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
const option = options.value.find(item => item.stationId === name);
return option.stationName
}
}
// function getName(name) {
// if (TransTempNewData && TransTempNewData.value.length > 0 && name !== undefined && options && options.value.length > 0) {
// const option = options.value.find(item => item.stationId === name);
// return option.stationName
// }
// }
function getDataNew(item) {
getTransListNewData(item).then(res => {
......@@ -175,9 +175,9 @@ getSupplys()
:row-class-name="tableBodyClass"
>
<el-table-column type="index" label="序号" align="center" width="100"/>
<el-table-column prop="stationId" align="center" label="换热站名称" sortable>
<el-table-column prop="stationName" align="center" label="换热站名称" sortable>
<template #default="scope">
<span>{{ getName(scope.row.stationId) || '-' }}</span>
<span>{{ scope.row.stationName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="deviceName" align="center" label="设备名称" sortable/>
......
src/views/AIStation/VoiceCommandLocationPage.vue
View file @ d195c095
......@@ -4,8 +4,7 @@ import zhCn from "element-plus/dist/locale/zh-cn.mjs"
import axios from "axios";
import store from "../../store";
import {getVoiceCommandsLocationData,deleteVoiceCommandsLocation,addVoiceCommandsLocation,updateVoiceCommandsLocation,getVoiceCommandsLocationDetail} from "../../api/AIStation/VoiceCommandLocation";
import { ElMessage } from 'element-plus';
import { ElMessage,ElMessageBox } from 'element-plus';
// 查询条件
const queryParams = ref({
stationId: '',//换热站id
......@@ -52,7 +51,7 @@ const Page = reactive({total: 0, rows: 20, page: 1});
// 详情弹窗
const detailOpen = ref(false)
//新增 修改弹窗
const dialogFormVisible = ref(false)
let dialogFormVisible = ref(false)
//新增或修改表单的title
const formTitle = ref('')
......@@ -67,7 +66,9 @@ function loadData(){
ipAddress: queryParams.value.ipAddress,
macAddress: queryParams.value.macAddress,
}
console.log('item:',item)
if (item.stationId === undefined){
item.stationId = ''
}
//查询数据
getVoiceCommandsLocationData(item).then(res => {
voiceCommandLocationData.value = res.rows
......@@ -120,7 +121,11 @@ const handleFormData = async () => {
message: '当前mac和ip地址已重复，请重新输入',
type: 'warning'
});
} else{
} else if (res.code === 200){
ElMessage({
message: '修改成功',
type: 'success'
});
dialogFormVisible.value = false
}
}).catch((err) => {
......@@ -196,14 +201,29 @@ function handleUpdateButton(row) {
//删除按钮
function deleteButton(row) {
console.log('row.businessId:', row.businessId)
deleteVoiceCommandsLocation(row.businessId).then(res => {
loadData()
console.log('删除:')
}).catch((err) => {
console.log(err)
}).finally(() =>{
loadData()
})
ElMessageBox.confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteVoiceCommandsLocation(row.businessId).then(res => {
if (res.code === 200){
ElMessage.success({
message: '删除成功!'
});
loadData()
}else {
ElMessage.error({
message: '删除失败!'
});
loadData()
}
})
}).catch(() => {
ElMessage.info({
message: '已取消删除'
});
});
}
// //获取换热机组列表
// function getSupplys(){
......@@ -301,7 +321,7 @@ getSupplys()
<el-form-item label="换热站：">
<!-- <el-cascader :options="options" v-model="queryParams.stationId" :props="props" collapse-tags clearable :show-all-levels="false"-->
<!-- placeholder="请选择" style="min-width: 210px;" />-->
<el-select v-model="queryParams.stationId" placeholder="请选择" style="min-width: 210px" filterable clearable >
<el-select v-model="queryParams.stationId" placeholder="请选择" style="min-width: 210px" filterable clearable>
<el-option
v-for="item in options"
:key="item.value"
......@@ -407,17 +427,17 @@ getSupplys()
</el-select>
</el-form-item>
<el-form-item label="编号:">
<el-input v-model="addOrUpdateForm.code" placeholder="请选择编号"></el-input>
<el-input v-model="addOrUpdateForm.code" placeholder="请选择编号" :maxlength="100" show-word-limit></el-input>
</el-form-item>
<el-form-item label="MAC地址:">
<el-input v-model="addOrUpdateForm.macAddress" placeholder="请输入MAC地址"></el-input>
<el-input v-model="addOrUpdateForm.macAddress" placeholder="请输入MAC地址" :maxlength="50" show-word-limit></el-input>
</el-form-item>
<el-form-item label="IP地址:">
<el-input v-model="addOrUpdateForm.ipAddress" placeholder="请输入IP地址"></el-input>
<el-input v-model="addOrUpdateForm.ipAddress" placeholder="请输入IP地址" :maxlength="50" show-word-limit></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="addDialog-footer">
<el-button @click="dialogFormVisible.value = false">取 消</el-button>
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="handleFormData()">确 定</el-button>
</div>
</el-dialog>
......
src/views/AIStation/VoiceCommandPage.vue
View file @ d195c095
......@@ -294,7 +294,7 @@ function handleDetail(row) {
</el-col>
<el-col :span="12">
<el-form-item label="指令结果：" prop="result">
<span>{{ singleDetails.result || '-' }}</span>
<span>{{ singleDetails.result === '0' ? '无' : singleDetails.result === '1' ? '成功' : singleDetails.result === '2' ? '失败' : '-' }}</span>
</el-form-item>
</el-col>
</el-row>
......
src/views/home.vue
View file @ d195c095
......@@ -766,6 +766,7 @@ export default defineComponent({
});
if (res == "confirm") {
store.commit("clearUserInfo", "");
localStorage.removeItem('AIToken')
router.push({ path: "/login" });
} else {
//重置视频插件位置
......
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