From ee82d0fc81c92f48a7831370b25e426e9ac6728d Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Wed, 20 Mar 2024 10:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/api/index.js | 17 ++- .../components/addPhotoDialog.vue | 5 +- .../components/baseInfor.vue | 25 ++-- .../components/parameterSetDialog.vue | 116 ++++++++++++++++++ .../components/carouselChart.vue | 1 + .../components/parameterArea.vue | 11 +- .../components/setschedule.vue | 11 +- .../realTimeMonitor/components/siderBar.vue | 2 +- src/views/system/deviceUpgrade/index.vue | 115 ++++++++++++----- vue.config.js | 6 +- 10 files changed, 250 insertions(+), 59 deletions(-) diff --git a/src/utils/api/index.js b/src/utils/api/index.js index d95f99d..44973d5 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -877,13 +877,24 @@ export function uploadApk(data) { url: "/xymanager/uploadApk", method: "post", data, + headers: { + "Content-Type": "multipart/form-data", // set the content type to multipart/form-data + }, }); } -//下发apk -export function issueApk(data) { +//修改apk +export function updateApkApi(data) { + return request({ + url: "/xymanager/updateApk", + method: "post", + data, + }); +} +//删除apk +export function deleteApkApi(data) { return request({ - url: "/xymanager/issueApk", + url: "/xymanager/deleteApk", method: "post", data, }); diff --git a/src/views/photographicDevice/components/addPhotoDialog.vue b/src/views/photographicDevice/components/addPhotoDialog.vue index bb12882..2734af9 100644 --- a/src/views/photographicDevice/components/addPhotoDialog.vue +++ b/src/views/photographicDevice/components/addPhotoDialog.vue @@ -421,8 +421,9 @@ export default { }); }); } else { - console.log(this.formInfo); - + if (this.formInfo.list[0].id == "") { + this.$set(this.formInfo, "list", []); + } updateTerminalJoggle(this.formInfo) .then((res) => { this.isShow = false; diff --git a/src/views/photographicDevice/components/baseInfor.vue b/src/views/photographicDevice/components/baseInfor.vue index faff03f..666c949 100644 --- a/src/views/photographicDevice/components/baseInfor.vue +++ b/src/views/photographicDevice/components/baseInfor.vue @@ -61,25 +61,30 @@ - - MSRDT-1-WP + + + + - - 上海欣影 - + + diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index c68367d..33c7827 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -18,6 +18,7 @@ 浙江 河南 河南郑州 + 河南统一视频v2020 @@ -697,6 +698,43 @@ > + +
+
+ + + + + {{ item.name }} + （{{ item.title }}{{ item.uploadDate }}） + + + + + 确 定 +
+
+
取 消 @@ -710,6 +748,7 @@ import { setTermCamera, getTermCameraRequest, getChannelListJoggle, + listApk, } from "@/utils/api/index"; import imageCapture from "./imageCapture.vue"; @@ -857,6 +896,18 @@ export default { i: 0, tabName: "装置时间", roleUser: "", + //升级确定阿 + ugradLoading: false, + upgradationform: { + upVal: "", + }, + selectUpObj: {}, + upgradationRules: { + upVal: [ + { required: true, message: "请选择升级文件", trigger: "change" }, + ], + }, + upOptions: [], }; }, mounted() {}, @@ -886,6 +937,8 @@ export default { console.log("视频采集参数"); this.$refs.videoCaptureref.getSingleAccess(this.rowData); this.$refs.videoCaptureref.getRatio(this.rowData); + } else if (tab.label == "升级") { + this.getUpgradeList(); } this.tabName = tab.label; }, @@ -1558,6 +1611,7 @@ export default { this.waterSetLoading = false; this.osdLoading = false; this.osdSetLoading = false; + this.ugradLoading = false; console.log("终止轮询"); // && res.data.result == 255 console.log(JSON.parse(res.data.data)); @@ -1629,6 +1683,7 @@ export default { this.waterSetLoading = false; this.osdLoading = false; this.osdSetLoading = false; + this.ugradLoading = false; } }) .catch((err) => {}); @@ -1690,6 +1745,46 @@ export default { // }); }); }, + //获取升级apkList + getUpgradeList() { + listApk({ + pageindex: 1, + pagesize: 2000, + }) + .then((res) => { + console.log(res); + this.upOptions = res.data.list; + }) + .catch((err) => {}); + }, + selectChanged(val) { + console.log(val); + // 找到选中项的整个object对象 + this.selectUpObj = this.upOptions.find((item) => { + return item["path"] === val; + }); + console.log(this.selectUpObj); + }, + //升级确定阿 + handleupgradation() { + console.log(this.upgradationform.upVal); + this.$refs.upgradationRuleForm.validate((valid) => { + if (valid) { + this.ugradLoading = true; + let params = [ + { + name: "act", + value: "upgrade", + }, + { + name: "file", + value: this.upgradationform.upVal, + }, + ]; + this.setTermFn(params); + } + }); + }, display(val) { this.isShow = true; this.rowData = val; @@ -1727,6 +1822,7 @@ export default { this.statusLoading = false; this.waterLoading = false; this.waterSetLoading = false; + this.ugradLoading = false; }, }, destroyed() { @@ -1796,6 +1892,19 @@ export default { background-color: #169e8c; } } + .upgradBox { + // display: flex; + // flex-direction: column; + // align-items: center; + .el-select { + .el-input { + width: 316px; + } + } + .el-button--primary { + margin-left: 76px; + } + } .el-input.is-disabled .el-input__inner { color: #666; } @@ -1834,4 +1943,11 @@ export default { } } } +.el-select-dropdown__item { + i { + margin-left: 8px; + font-size: 12px; + font-style: normal; + } +} diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue index cf8b2a9..a280a46 100644 --- a/src/views/realTimeMonitor/components/carouselChart.vue +++ b/src/views/realTimeMonitor/components/carouselChart.vue @@ -10,6 +10,7 @@ 浙江 河南 河南郑州 + 河南统一视频v2020
diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue index 74da36f..c767d84 100644 --- a/src/views/realTimeMonitor/components/parameterArea.vue +++ b/src/views/realTimeMonitor/components/parameterArea.vue @@ -18,7 +18,6 @@ type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日" - value-format="timestamp" :picker-options="pickerOptions" @change="changedate" @focus="handleDateFocus" @@ -292,7 +291,7 @@ export default { }, //选择时间 changedate() { - console.log(this.dateValue); + console.log(this.dateValue.getTime()); this.$parent.getPhotoList( this.selectChannelValue, this.dateValue, @@ -311,7 +310,7 @@ export default { this.channelListOption = this.channelListOption.concat(res.data.list); console.log(this.channelListOption); this.channelfocalOpyion = res.data.list; //焦距通道 - this.channelarrValue = this.channelfocalOpyion[0].channelid; + this.selectChannelValue = this.channelListOption[0].channelid; //默认选中所有通道; this.$store.commit("channelId", this.selectChannelValue); //通道保存在vuex中 this.$store.commit("channelIdList", res.data.list); //将通道保存在vuex中 @@ -323,6 +322,12 @@ export default { this.selectDyId = res.data.dyId; this.selectLineId = res.data.lineId; //this.selectTowerId = res.data.towerId; + if (res.data.list.length == 0) { + this.channelarrValue = null; + return; + } else { + this.channelarrValue = this.channelfocalOpyion[0].channelid; + } }) .catch((err) => { console.log(err); //代码错误、请求失败捕获 diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index d9ac7ac..0e9d15f 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -61,6 +61,9 @@ >刷新装置时间表 + 装置时间表
{{ @@ -68,11 +71,7 @@ }}
- - 装置时间表 - +
@@ -870,10 +869,12 @@ export default { //点击分页 handleCurrentChange(val) { this.page = val; + this.getruleList(); }, //每页条数 handleSizeChange(val) { this.pageSize = val; + this.getruleList(); }, }, }; diff --git a/src/views/realTimeMonitor/components/siderBar.vue b/src/views/realTimeMonitor/components/siderBar.vue index b5a8a7f..686174a 100644 --- a/src/views/realTimeMonitor/components/siderBar.vue +++ b/src/views/realTimeMonitor/components/siderBar.vue @@ -88,7 +88,7 @@ >{{ node.label }} ({{ data.list.length }}) + >({{ data.list.length }} ) diff --git a/src/views/system/deviceUpgrade/index.vue b/src/views/system/deviceUpgrade/index.vue index 19dc435..fb761b0 100644 --- a/src/views/system/deviceUpgrade/index.vue +++ b/src/views/system/deviceUpgrade/index.vue @@ -6,14 +6,12 @@ 选取文件 @@ -124,7 +122,12 @@