ly.fan
/
xy-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'role1.0' into menu1.0

Browse Source
role1.0
fanluyan 1 year ago
parent 1127c752e1 2fb20f00ea
commit b6ee182149
8 changed files with 335 additions and 20 deletions
Show Stats Download Patch File Download Diff File

269
src/views/photographicDevice/components/parameterSetDialog.vue
Unescape Escape View File

@ -800,6 +800,148 @@
</div>
</div>
</el-tab-pane>
<el-tab-pane label="网络适配器" name="13">
<div class="tabsBox">
<div class="queryParam">
<el-form
:model="inetComputer"
label-position="right"
label-width="124px"
>
<el-form-item label="IP地址">
<el-input
v-model="inetComputer.ip"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="子网掩码">
<el-input
v-model="inetComputer.subnetMask"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="网关">
<el-input
v-model="inetComputer.gateway"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="DNS服务器">
<el-input
v-model="inetComputer.dns"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="手机串号">
<el-input
v-model="inetComputer.phoneNumber"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="inetSearch"
:loading="inetLoading"
>查询</el-button
>
<p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
</p>
</el-form-item>
</el-form>
</div>
<!-- <el-tabs
v-model="tabsActive"
type="card"
@tab-click="inethandleClick"
>
<el-tab-pane label="查询参数" name="first">
<div class="queryParam">
<el-form
:model="inetComputer"
label-position="right"
label-width="124px"
>
<el-form-item label="IP地址">
<el-input
v-model="inetComputer.ip"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="子网掩码">
<el-input
v-model="inetComputer.subnetMask"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="网关">
<el-input
v-model="inetComputer.gateway"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="DNS服务器">
<el-input
v-model="inetComputer.dns"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item label="手机串号">
<el-input
v-model="inetComputer.phoneNumber"
disabled="disabled"
></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="inetSearch"
:loading="inetLoading"
>查询</el-button
>
<p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
</p>
</el-form-item>
</el-form>
</div>
</el-tab-pane> -->
<!-- <el-tab-pane label="设置参数" name="second">
<div class="queryParam">
<el-form
:model="inetComputer"
label-position="right"
label-width="124px"
ref="inetFormref"
:rules="inetrulse"
>
<el-form-item label="IP" prop="ip">
<el-input v-model="inetComputer.ip"></el-input>
</el-form-item>
<el-form-item label="子网掩码" prop="port">
<el-input v-model="inetComputer.subnetMask"></el-input>
</el-form-item>
<el-form-item label="网关">
<el-input v-model="inetComputer.gateway"></el-input>
</el-form-item>
<el-form-item label="DNS服务器">
<el-input v-model="inetComputer.dns"></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="inetSet"
:loading="inetSetLoading"
>设置</el-button
>
</el-form-item>
</el-form>
</div>
</el-tab-pane> -->
<!-- </el-tabs> -->
</div>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false">取 消</el-button>
@ -992,6 +1134,21 @@ export default {
],
},
upOptions: [],
//网络适配器
//上位机信息
inetComputer: {
ip: "",
subnetMask: "",
gateway: "",
dns: "",
phoneNumber: "",
},
inetrulse: {
ip: [{ required: true, validator: validateIPAddress, trigger: "blur" }],
port: [{ required: true, message: "请输入端口号", trigger: "blur" }],
},
inetLoading: false,
inetSetLoading: false,
};
},
mounted() {},
@ -1132,6 +1289,14 @@ export default {
this.i = 0;
this.timer = null;
},
//上位机重置数据
inethandleClick() {
this.inetComputer = {};
this.lookTime = "";
clearInterval(this.timer);
this.i = 0;
this.timer = null;
},
//id重置数据
idhandleClick() {
this.idParameter = {};
@ -1750,7 +1915,100 @@ export default {
})
.catch((err) => {});
},
//网络适配器
//--act=cma [0xA7] --flag=[Request Set Flag, default is set=1, 0: request] --ip=[IP Address] --cmaport=[CMA Port] --domain=[Domain]
//--act=inet --flag=[Request Set Flag, default is request=0, 1: set] --rf=[Request Flag] --ip=[IP] --subnetMask=[Subnet Mask] --gateway=[Gateway] --dns
inetSearch() {
if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
this.inetLoading = true;
let params = [
{
name: "act",
value: "inet",
},
{
name: "flag",
value: 0,
},
{
name: "rf",
value: 31,
},
{
name: "ip",
value: "",
},
{
name: "subnetMask",
value: "",
},
{
name: "gateway",
value: "",
},
{
name: "dns",
value: "",
},
];
this.setTermFn(params);
} else {
this.$message({
duration: 1500,
showClose: true,
message: "装置下线，发送指令失败",
type: "error",
});
}
},
//网络适配器设置
inetSet() {
if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
this.$refs.inetFormref.validate((valid) => {
console.log(valid);
if (valid) {
this.inetSetLoading = true;
let params = [
{
name: "act",
value: "cma",
},
{
name: "flag",
value: 1,
},
{
name: "rf",
value: 255,
},
{
name: "ip",
value: this.inetComputer.ip,
},
{
name: "subnetMask",
value: this.inetComputer.subnetMask,
},
{
name: "gateway",
value: this.inetComputer.gateway,
},
];
this.setTermFn(params);
} else {
console.log("error submit!!");
return false;
}
});
} else {
this.$message({
duration: 1500,
showClose: true,
message: "装置下线，发送指令失败",
type: "error",
});
}
},
getinfo() {
getTermCameraRequest({ requestid: this.requestid })
.then((res) => {
@ -1764,6 +2022,8 @@ export default {
this.sampSetLoading = false;
this.upperLoading = false;
this.upperSetLoading = false;
this.inetLoading = false;
this.inetSetLoading = false;
this.idLoading = false;
this.idSetLoading = false;
this.statusLoading = false;
@ -1786,6 +2046,8 @@ export default {
this.samplingForm = JSON.parse(res.data.data);
//ip地址解析开始
this.upperComputer = JSON.parse(res.data.data);
//网络适配器结果
this.inetComputer = JSON.parse(res.data.data);
//修改cmdid
this.idParameter = JSON.parse(res.data.data);
this.waterForm = JSON.parse(res.data.data);
@ -1835,6 +2097,8 @@ export default {
this.sampSetLoading = false;
this.upperLoading = false;
this.upperSetLoading = false;
this.inetLoading = false;
this.inetSetLoading = false;
this.idLoading = false;
this.idSetLoading = false;
this.statusLoading = false;
@ -1967,6 +2231,7 @@ export default {
this.samplingForm = {};
this.deviceTimeForm = {};
this.upperComputer = {};
this.inetComputer = {};
this.idParameter = {};
this.zjidParameter = {};
this.gpsForm = {};
@ -1982,6 +2247,8 @@ export default {
this.sampSetLoading = false;
this.upperLoading = false;
this.upperSetLoading = false;
this.inetLoading = false;
this.inetSetLoading = false;
this.idLoading = false;
this.idSetLoading = false;
this.statusLoading = false;

29
src/views/photographicDevice/components/videoCapture.vue
Unescape Escape View File

@ -206,6 +206,32 @@ export default {
name: "VGA",
},
], //分辨率
zzratiolist: [
{
id: 1,
name: "QVGA",
},
{
id: 2,
name: "VGA",
},
{
id: 3,
name: "480p;",
},
{
id: 4,
name: "720P",
},
{
id: 5,
name: "1080P",
},
{
id: 6,
name: "其它",
},
], //分辨率
selaccess: "", //选中的通道
capturenr: {}, //查询后的内容
setForm: {
@ -259,7 +285,8 @@ export default {
getRatio() {
getResolutionRatio({ type: 1 })
.then((res) => {
this.ratiolist = this.hnratiolist;
//this.ratiolist = this.hnratiolist;
this.ratiolist = this.zzratiolist;
this.$set(this.setForm, "videoFormat", this.ratiolist[0].id);
})
.catch((err) => {});

16
src/views/photographicDevice/components/workStatus.vue
Unescape Escape View File

@ -265,11 +265,17 @@ export default {
pageindex: this.page,
pagesize: this.pageSize,
}).then((res) => {
this.listData = res.data.list;
this.total = res.data.total;
this.$nextTick(() => {
this.loading = false;
});
if (res.code == 200) {
this.listData = res.data.list;
this.total = res.data.total;
this.$nextTick(() => {
this.loading = false;
});
} else {
this.$nextTick(() => {
this.loading = false;
});
}
});
},
//点击分页

10
src/views/photographicDevice/index.vue
Unescape Escape View File

@ -150,13 +150,17 @@
min-width="90"
/>
<el-table-column
prop="isonline"
prop="onlinestatus"
label="是否在线"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.isonline ? "在线" : "离线" }}</template
>
<!-- {{ scope.row.onlinestatus ? "在线" : "离线" }} -->
<span style="color: #169e8c" v-if="scope.row.onlinestatus"
>在线</span
>
<span style="color: #f56c6c" v-else>离线</span>
</template>
</el-table-column>
<el-table-column
prop="hasPan"

16
src/views/realTimeMonitor/components/carouselChart.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div class="thumb-example">
<div class="radioBox" v-if="roleUser == 1 || roleUser == 0">
{{ radioPx }} <span v-if="fileSize">({{ fileSize.toFixed(2) }}M)</span>
{{ radioPx }} <span v-if="fileSize">({{ fileSize }})</span>
<span v-if="protocolInfo == '65280'"> 国网I1 </span>
<span v-if="protocolInfo == '65296'"> 陕西 </span>
<span v-if="protocolInfo == '65281'"> 安徽 </span>
@ -391,10 +391,18 @@ export default {
} else {
this.radioPx = "";
}
if (data.fileSize != undefined) {
this.fileSize = data.fileSize / (1024 * 1024);
if (data.fileSize !== undefined) {
const sizeInBytes = data.fileSize;
const sizeInMB = sizeInBytes / (1024 * 1024);
const sizeInKB = sizeInBytes / 1024;
if (sizeInMB >= 1) {
this.fileSize = `${sizeInMB.toFixed(2)}M`; // 大于等于1MB，以MB为单位，保留两位小数
} else {
this.fileSize = `${sizeInKB.toFixed(2)}K`; // 小于1MB，以KB为单位，保留两位小数
}
} else {
this.fileSize = "";
this.fileSize = ""; // 如果data.fileSize未定义，则设置为空字符串
}
// console.log(data.channelId);

1
src/views/realTimeSearch/index.vue
Unescape Escape View File

@ -310,7 +310,6 @@ export default {
} else {
this.formdata.lineid = Number(this.$route.query.lineId);
}
this.getSearchgt();
})
.catch((err) => {});

5
src/views/towerInformation/index.vue
Unescape Escape View File

@ -112,6 +112,11 @@
}}</el-link>
</template></el-table-column
>
<el-table-column
prop="termcount"
label="已绑定数量"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="address"
label="杆塔地址"

9
vue.config.js
Unescape Escape View File

@ -21,13 +21,12 @@ module.exports = defineConfig({
proxy: {
"/api": {
//表示拦截以/api开头的请求路径
//target: "http://47.96.238.157:8093", //阿里云服务器环境
target: "http://180.166.218.222:40080", //dell
//target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api
// target: "http://192.168.50.42:81", //东视
//target: "http://180.166.218.222:40080", //dell
// target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api
target: "http://192.168.50.7:8093", //东视
changOrigin: true, //是否开启跨域
pathRewrite: {
"^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
"^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
},
},
},

Write Preview
Loading…
Cancel
Save