- ![]()
+ ![]()
{{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }}
@@ -65,33 +69,6 @@ export default {
},
data() {
return {
- //轮播大图配置
- bigImg: [
- {
- path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/210509/XYIGQ10C221000080_21050918190300_1_255.jpg",
- id: 0,
- },
- {
- path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323100012_1_255_res.jpg",
- id: 1,
- },
- {
- path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323090012_1_255_res.jpg",
- id: 2,
- },
- {
- path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323080011_1_255_res.jpg",
- id: 3,
- },
- {
- path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323070012_1_255_res.jpg",
- id: 4,
- },
- {
- path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323060012_1_255_res.jpg",
- id: 5,
- },
- ],
swiperOptionTop: {
zoom: true,
loop: true,
@@ -164,6 +141,7 @@ export default {
padding: 4px 0px;
font-size: 14px;
text-align: center;
+ color: @color-text-primary;
}
}
.swiper-slide {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 0ccdd87..ff0c265 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -88,7 +88,44 @@ export default {
data() {
return {
formInfo: {},
- rules: {},
+ rules: {
+ bsIdentifier: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ bsManufacturer: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ bsProductionDate: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ cmdid: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
+ displayName: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ equipName: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ essentialInfoVersion: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ hasPan: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ latitude: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ lineid: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ longitude: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ model: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
+ orgId: [{ required: true, message: "请输入公司名称", trigger: "blur" }],
+ towerid: [
+ { required: true, message: "请输入公司名称", trigger: "blur" },
+ ],
+ },
//表单数组，对象
formArr: [],
};
@@ -116,15 +153,14 @@ export default {
};
this.formArr.push(formObj);
console.log(this.formArr);
-
// 走保存请求
if (this.photoDialogTitle == "新增") {
addTerminalJoggle({ list: this.formArr })
.then((res) => {
console.log(res);
this.$emit("photoDialogClose", 1); //关闭弹窗
+ this.formArr = [];
this.$message.success("添加成功");
- this.$refs.formPhotoInfo.resetFields();
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index a8bf606..c02b728 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -137,11 +137,15 @@ export default {
},
methods: {
////获取拍照装置列表数据
- terminalList() {
- getTerminalJoggle()
+ terminalList(page, pageSize) {
+ getTerminalJoggle({
+ pageindex: page,
+ pagesize: pageSize,
+ })
.then((res) => {
console.log(res);
this.terminalTableData = res.data.list;
+ this.total = res.data.total;
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
@@ -179,17 +183,17 @@ export default {
photoDialogClose(flag) {
if (flag) {
//更新列表
- this.terminalList();
+ this.terminalList(this.page, this.pageSize);
}
this.photoDialog = false;
this.formphotoInfo = {};
},
//删除数据
handleDelete(data) {
+ console.log(data);
this.deleteArr.push({
- id: data.id,
+ termid: data.id,
});
-
console.log(this.deleteArr);
this.$confirm("确定要删除记录吗,同时删除关联关系?", "提示", {
confirmButtonText: "确定",
@@ -200,7 +204,7 @@ export default {
// 行设置向后台请求删除数据
deleteTerminalJoggle({ list: this.deleteArr }).then((res) => {
console.log(res);
- this.terminalList(); //刷新
+ this.terminalList(this.page, this.pageSize); //刷新
});
this.$message({
type: "success",
@@ -218,11 +222,12 @@ export default {
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.page = val;
+ this.terminalList(val, this.pageSize); //刷新
//this.getTableList();
},
},
created() {
- this.terminalList();
+ this.terminalList(this.page, this.pageSize);
},
};
diff --git a/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue b/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
index a5a46d9..7fd761f 100644
--- a/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
+++ b/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
@@ -19,10 +19,14 @@
>
-
+
+
+
@@ -35,7 +39,12 @@
+
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index ff12ecd..461f652 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -27,25 +27,33 @@
+
+
+
{
console.log(res);
this.lineTableData = res.data.list;
+ this.total = res.data.total;
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
@@ -145,7 +157,7 @@ export default {
lineDialogClose(flag) {
if (flag) {
//更新列表
- this.lineList();
+ this.lineList(this.page, this.pageSize);
}
this.lineDialog = false;
this.formLineInfo = {};
@@ -166,7 +178,7 @@ export default {
// 行设置向后台请求删除数据
deleteLineJoggle({ list: this.deleteArr }).then((res) => {
console.log(res);
- this.lineList(); //刷新
+ this.lineList(this.page, this.pageSize);
});
this.$message({
type: "success",
@@ -184,11 +196,11 @@ export default {
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.page = val;
- //this.getTableList();
+ this.lineList(val, this.pageSize);
},
},
created() {
- this.lineList();
+ this.lineList(this.page, this.pageSize);
},
};
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index f3a0d34..e11dfad 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -121,10 +121,16 @@ export default {
//选择时间
changedate() {
console.log(this.dateValue);
+ console.log(this.channelList);
+ this.getTerminalPhotoList(
+ this.channelList[0].id,
+ this.dateValue,
+ this.channelList[0].termId
+ );
},
//获取左侧树结构
- getLineTreeList() {
- getdyTreeListJoggle({
+ async getLineTreeList() {
+ await getdyTreeListJoggle({
termid: 123455,
})
.then((res) => {
@@ -139,13 +145,13 @@ export default {
console.log(this.currentNodekey);
this.channelId = this.currentNodekey;
console.log(this.channelId);
- this.getChannelList(this.channelId); //获取通道id接口
});
}
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
});
+ await this.getChannelList(this.channelId); //获取通道id接口
},
//点击获取当前点击的tree数据
handleNodeClick(data, node) {
@@ -158,14 +164,15 @@ export default {
},
//获取通道的接口
- getChannelList(id) {
- getChannelListJoggle({ termid: id })
+ async getChannelList(id) {
+ await getChannelListJoggle({ termid: id })
.then((res) => {
console.log(res);
this.channelList = res.data.list;
console.log(this.channelList);
this.getTerminalPhotoList(
this.channelList[0].id,
+ this.dateValue,
this.channelList[0].termId
); //获取图片列表是传当前设备的 id 和termid
this.channelOption = [];
@@ -184,11 +191,11 @@ export default {
});
},
//获取图片
- getTerminalPhotoList(id, termId) {
+ getTerminalPhotoList(id, date, termId) {
+ console.log(id, date, termId);
getTerminalPhotoListJoggle({
channelid: id,
- pageindex: 1,
- pagesize: 100,
+ time: date,
terminalid: termId,
})
.then((res) => {
@@ -208,7 +215,7 @@ export default {
return i.value === val;
});
console.log(channelObj);
- this.getTerminalPhotoList(val, channelObj.termid);
+ this.getTerminalPhotoList(val, this.dateValue, channelObj.termid);
},
},
};
diff --git a/vue.config.js b/vue.config.js
index efef97e..ccdd126 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,6 +3,7 @@ const path = require("path");
module.exports = defineConfig({
productionSourceMap: false, // 生产环境是否要生成 sourceMap
publicPath: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : "./", // 部署应用包时的基本 URL
+ //assetsPublicPath: process.env.NODE_ENV === "production" ? "" : "/",
outputDir: "dist", // 打包时输出的文件目录
assetsDir: "static", // 放置静态文件夹目录
transpileDependencies: true,
From 2ff5a0e85b18911f305828882b8dd14129f0fb39 Mon Sep 17 00:00:00 2001
From: liuyi
Date: Wed, 19 Apr 2023 17:08:26 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E8=AE=BE=E7=BD=AE?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/api/index.js | 24 +++
.../components/adddeviceDialog.vue | 165 +++++++-----------
src/views/devicePhotoSchedule/index.vue | 73 +++-----
3 files changed, 112 insertions(+), 150 deletions(-)
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index e5b150c..07d75fe 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -149,6 +149,30 @@ export function getScheduleRulelListJoggle(data) {
data,
});
}
+//2.新增任务规则
+export function addScheduleRulel(data) {
+ return request({
+ url: "/test/addSchelduleRuleList",
+ method: "post",
+ data,
+ });
+}
+//3.删除任务规则
+export function deleteScheduleRulel(data) {
+ return request({
+ url: "/test/deleteSchelduleRule",
+ method: "post",
+ data,
+ });
+}
+//4.修改任务规则
+export function updateScheduleRulel(data) {
+ return request({
+ url: "/test/updateSchelduleRule",
+ method: "post",
+ data,
+ });
+}
//线路信息管理接口数据
//1.线路列表信息
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index f111921..7dffdc4 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -1,144 +1,111 @@
-
-
-
-
-
+
+
+
-
+
+
-
+
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 62f664a..52c3c11 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -2,7 +2,7 @@
-
+