Browse Source

youhua

master
4670101279 2 years ago
parent
commit
8566420028
  1. 7
      src/views/basic/station/index.vue
  2. 8
      src/views/web/camera/index.vue

7
src/views/basic/station/index.vue

@ -63,14 +63,13 @@ @@ -63,14 +63,13 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="测站id" align="center" prop="id" />
<el-table-column label="测站名称" align="center" prop="stnm" />
<el-table-column label="经度" align="center" prop="longitude" />
<el-table-column label="纬度" align="center" prop="latitude" />
<el-table-column label="测站编码" align="center" prop="staid" />
<el-table-column label="站址" align="center" prop="stlc" />
<el-table-column label="测站编码" align="center" prop="isState" />
<el-table-column label="保证水位" align="center" prop="bzsw" />
<el-table-column label="水位计" align="center" prop="cameraName" />
<el-table-column label="测站状态" align="center" prop="status">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == '0'">正常</el-tag>
@ -143,9 +142,6 @@ @@ -143,9 +142,6 @@
<el-form-item label="站址" prop="stlc">
<el-input v-model="form.stlc" placeholder="请输入站址" />
</el-form-item>
<el-form-item label="测站编码" prop="isState">
<el-input v-model="form.isState" placeholder="请输入测站编码" />
</el-form-item>
<el-form-item label="保证水位" prop="bzsw">
<el-input v-model="form.bzsw" placeholder="请输入保证水位" />
</el-form-item>
@ -269,7 +265,6 @@ export default { @@ -269,7 +265,6 @@ export default {
hnnm: null,
bsnm: null,
stlc: null,
isState: null,
bzsw: null,
cameraSn: null,
delFlag: null,

8
src/views/web/camera/index.vue

@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
<el-table-column label="设备ip" align="center" prop="ip" />
<el-table-column label="设备序列号" align="center" prop="devsn" />
<el-table-column label="首次注册时间" align="center" prop="firstTime" />
<el-table-column label="心跳时间" align="center" prop="updateTime" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status == 1"><el-tag type="success">在线</el-tag></span>
@ -82,14 +83,14 @@ @@ -82,14 +83,14 @@
type="text"
icon="el-icon-setting"
@click="openFtpCfg(scope.row)"
v-hasPermi="['web:camera:edit']"
v-hasPermi="['web:camera:remove']"
>FTP配置</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="showVideo(scope.row)"
v-hasPermi="['web:camera:edit']"
v-hasPermi="['web:camera:remove']"
>查看视频</el-button>
<el-button
size="mini"
@ -378,6 +379,9 @@ export default { @@ -378,6 +379,9 @@ export default {
return;
}
let res = await this.$axiosGet('/web/camera/showVideo/'+id);
if(res.code === 500){
this.$modal.msg(res.msg);
}
},
async register() {
let res = await this.$axiosGet('/web/camera/register');

Loading…
Cancel
Save