diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
index 90eda7a..37a1793 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
@@ -1,10 +1,10 @@
@@ -115,6 +115,9 @@
>
+
+<<<<<<< HEAD
+
+=======
+>>>>>>> hn1.0
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
index be38964..54c8e99 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
@@ -1,10 +1,10 @@
@@ -97,6 +97,9 @@
>
+
+<<<<<<< HEAD
+
+=======
+>>>>>>> hn1.0
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
index ae9f7a5..c71f23d 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
@@ -13,9 +13,19 @@
+ >
+ {{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.channelname
+ }}
+
@@ -95,9 +105,19 @@
+ >
+ {{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.channelname
+ }}
+
@@ -246,7 +266,7 @@ export default {
this.searchloading = true;
getPhotoParamApi({
channelId: this.selaccess,
- cmdId: this.selcmdId,
+ termId: this.seltermid,
})
.then((res) => {
if (res.code == 200) {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
index e4997a5..4fa8214 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
@@ -400,6 +400,8 @@ export default {
},
handleclose() {
this.isShow = false;
+ this.activeName = "1";
+ this.tabsActive = "first";
},
},
};
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
index e2ecc06..c687666 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@@ -1,10 +1,10 @@
@@ -103,6 +103,9 @@
>
+
+<<<<<<< HEAD
+
+=======
+>>>>>>> hn1.0
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
index 8d37ce8..9424bab 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
@@ -13,9 +13,19 @@
+ >
+ {{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.channelname
+ }}
+
@@ -78,9 +88,19 @@
+ >
+ {{
+ item.alias !== null && item.alias !== ""
+ ? item.alias
+ : item.channelname
+ }}
+
@@ -142,7 +162,7 @@ export default {
selaccess: "", //选中的通道
capturenr: {}, //查询后的内容
setForm: {
- preset: 255
+ preset: 255,
}, //设置参数
rules: {
channelId: [{ required: true, message: "请选择通道", trigger: "blur" }],
@@ -169,7 +189,7 @@ export default {
//获取设备通道
getSingleAccess(val) {
this.setForm = {
- preset: 255
+ preset: 255,
};
console.log(val);
this.seltermid = val.id;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
index af4ec57..67c6318 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
@@ -1,10 +1,10 @@
@@ -129,6 +129,9 @@
>
+
+<<<<<<< HEAD
+
+=======
+>>>>>>> hn1.0
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 8a306bc..472481d 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -79,17 +79,19 @@
@row-click="handleRowClick"
v-loading="loading"
>
-
+
+
-
+
+ {
+ handleSearchCommand(command, scope.row);
+ }
+ "
+ >
+
+ 数据查询
+
+
+ 基本信息
+ 工作状态
+ 运行状态
+ GPS位置
+
+
+ 参数配置
图片标记
- 装置复位获取GPS位置
+ > -->
- 开启GPS
关闭GPS
-
+ -->
-
+
图片标记
- 获取GPS位置开启GPS
关闭GPS
+<<<<<<< HEAD
+ -->
+=======
+>>>>>>> hn1.0
{
- resetTerminalApi({ cmId: data.cmdId })
- .then((res) => {
- if (res.code == 200) {
- this.$message({
- duration: 1500,
- showClose: true,
- message: "装置已复位",
- type: "success",
- });
- } else {
- this.$message({
- duration: 1500,
- showClose: true,
- message: res.msg,
- type: "error",
- });
- }
- })
- .catch((err) => {});
- })
- .catch(() => {
- // this.$message({
- // duration: 1500,
- // showClose: true,
- // type: "info",
- // message: "已取消删除",
- // });
- });
- },
- //获取GPS位置
- handleShowGPS(data) {
- // this.$refs.gpsdialog_ref.display();
- // this.$refs.gpsdialog_ref.getgpsData(data);
- this.$refs.gpsdialog_ref.display(data);
- this.$refs.gpsdialog_ref.getgpssql();
- console.log(data);
- },
-
- //切换gps开启关闭
- changeGPS(val, row) {
- console.log(val, row);
- setTermGPSJoggle({ gpsstatus: val, cmdId: row.cmdId })
- .then((res) => {
- console.log(res);
- if (val == 0) {
- this.$message({
- duration: 1500,
- message: "关闭GPS",
- type: "success",
- showClose: true,
- });
- } else {
- this.$message({
- duration: 1500,
- message: "成功开启GPS",
- type: "success",
- showClose: true,
- });
- }
- })
- .catch((err) => {
- console.log(err); //代码错误、请求失败捕获
- });
- },
- handleCommand(command, row) {
- console.log(command, row);
- switch (command) {
- case "open": //开启
- this.changeGPS(1, row);
- break;
- case "close": //关闭
- this.changeGPS(0, row);
- break;
- }
- },
- //
- // gpsChange(val) {
- // console.log(val);
- // },
- //图像采集参数
- handleImageCapture(data) {
- this.$refs.imageCaptureref.display();
- this.$refs.imageCaptureref.getSingleAccess(data);
- this.$refs.imageCaptureref.getRatio();
- },
- //视频采集参数
- handleVideoCapture(data) {
- this.$refs.videoCaptureref.display();
- this.$refs.videoCaptureref.getSingleAccess(data);
- this.$refs.videoCaptureref.getRatio();
- },
//线缆绘制
handlepicture(data) {
@@ -846,7 +764,7 @@ export default {
}
.dropgps {
color: @color-primary;
- margin-left: 16px;
+ // margin-left: 16px;
// margin-right: 16px;
cursor: pointer;
font-size: 12px;
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 9271f3d..bd2df6c 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -67,6 +67,17 @@
>
+
+
+ {{ scope.row.status == 1 ? "已启用" : "未启用" }}
+
+
-
+
用户管理
@@ -173,7 +173,7 @@ export default {
};