From f0e8a40779a894bc288524f8a011bc4d5fd68171 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Tue, 30 May 2023 14:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Permission.vue | 51 +++--- src/views/components/carouselChart.vue | 10 +- .../components/setdevice.vue | 2 +- src/views/devicePhotoSchedule/index.vue | 2 +- .../components/addPhotoDialog.vue | 169 ++++++++++++++---- .../photographicDevice/index.vue | 2 +- src/views/pictureRotation/index.vue | 4 +- 7 files changed, 173 insertions(+), 67 deletions(-) diff --git a/src/views/Permission.vue b/src/views/Permission.vue index 08cf6b9..d25d75f 100644 --- a/src/views/Permission.vue +++ b/src/views/Permission.vue @@ -1,37 +1,46 @@ \ No newline at end of file + diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 2fdaae6..9e781ff 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -498,7 +498,7 @@ export default { width: 40px; height: 40px; &:hover { - color: #409eff; + color: @color-primary; } } .leftArrow { @@ -563,13 +563,13 @@ export default { } .borderActive { .timeInfo { - //background: #409eff; - background: linear-gradient(180deg, #00eaff 10%, #409eff 100%); + //background: @color-primary; + background: linear-gradient(180deg, #00eaff 10%, @color-primary 100%); color: #fff; } } // .borderActive { - // border: 3px solid #409eff; + // border: 3px solid @color-primary; // &::after { // content: ""; // position: absolute; @@ -578,7 +578,7 @@ export default { // left: 50%; // top: -16px; // margin-left: -8px; - // border-bottom: 13px solid #409eff; + // border-bottom: 13px solid @color-primary; // border-left: 8px solid transparent; // border-right: 8px solid transparent; // } diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 815f08e..6f335a6 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -352,7 +352,7 @@ export default { margin-right: 16px; b { font-weight: normal; - color: #409eff; + color: @color-primary; } span { margin: 0px 8px; diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue index 0eb76ae..c9465cb 100644 --- a/src/views/devicePhotoSchedule/index.vue +++ b/src/views/devicePhotoSchedule/index.vue @@ -256,7 +256,7 @@ export default { line-height: 32px; b { font-weight: normal; - color: #409eff; + color: @color-primary; } span { margin: 0px 8px; diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue index bede94f..6e11ea2 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue @@ -4,17 +4,17 @@ :title="photoDialogTitle" :visible.sync="isShow" :close-on-click-modal="false" - width="576px" + width="800px" @close="handleclose" > - + - + - - - - +

添加通道

+
+
- {{ item.channelname }} + + + + + + + +
+ + +
+
+ +
取 消 @@ -105,15 +144,7 @@ export default { }; return { isShow: false, - formInfo: { - // lineid: "", - // towerid: "", - // equipName: "", - // cmdid: "", - // sim: "", - // displayName: "", - channelVal: [], - }, + formInfo: {}, channelOptions: [], //所有通道列表 lineOptions: [], //线路 toweridOptions: [], //杆塔 @@ -137,7 +168,17 @@ export default { this.getChannel(); if (val == null) { return (this.formInfo = { - channelVal: [], + lineid: [], + towerid: [], + cmdid: "", + equipName: "", + sim: "", + list: [ + { + channelVal: [], + nickname: "", + }, + ], }); } this.formInfo = val; @@ -147,6 +188,32 @@ export default { }); this.$set(this.formInfo, "channelVal", channelnr); }, + //新增一行 + addModule() { + //新增一行 + this.formInfo.list.push({ + channelVal: [], + nickname: "", + }); + console.log(this.formInfo.list); + + this.$nextTick(() => { + console.log(this.$refs.channelBoxref); + if (this.$refs.channelBoxref) { + console.log(this.$refs.channelBoxref.scrollHeight); + this.$refs.channelBoxref.scrollTop = + this.$refs.channelBoxref.scrollHeight; + } + }); + }, + //删除一行 + deleteModule(item, index) { + console.log(item, index); + const itemList = this.formInfo.list.indexOf(item); + if (itemList !== -1) { + this.formInfo.list.splice(index, 1); + } + }, // 保存确定操作 submitForm() { this.$refs.formgrapInfo.validate((valid) => { @@ -272,11 +339,11 @@ export default { .addPhotoDialog { .el-dialog { .el-form { - //display: flex; - // flex-wrap: wrap; + display: flex; + flex-wrap: wrap; .el-form-item { - // width: 260px; - // margin-right: 16px; + width: 364px; + margin-right: 16px; .el-select { width: 100%; } @@ -289,6 +356,36 @@ export default { padding-right: 0px; } } + .el-divider--horizontal { + margin: 12px; + } + h4 { + font-size: 16px; + font-weight: normal; + margin-bottom: 6px; + line-height: 24px; + } + .addchannel { + max-height: 200px; + overflow: auto; + .channelBoxadd { + display: flex; + //justify-content: space-between; + padding-right: 6px; + .el-form-item { + width: 310px; + } + .btngrop { + margin-bottom: 16px; + margin-left: 16px; + height: 32px; + .el-button--small { + padding: 9px 8px; + width: 30px; + } + } + } + } .channelBox { .el-checkbox { margin-right: 12px; diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 789012c..662c5fa 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -502,7 +502,7 @@ export default { height: calc(100% - 48px); } .dropgps { - color: #409eff; + color: @color-primary; margin-left: 16px; margin-right: 16px; cursor: pointer; diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index 3c818f2..c28ff56 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -342,7 +342,7 @@ export default { bottom: 28px; left: 0px; font-size: 14px; - background: linear-gradient(180deg, #00eaff 10%, #409eff 100%); + background: linear-gradient(180deg, #00eaff 10%, @color-primary 100%); color: @color-white; font-weight: normal; margin-top: 2px; @@ -355,7 +355,7 @@ export default { color: @color-white; left: 0px; font-size: 14px; - background: linear-gradient(180deg, #00eaff 10%, #409eff 100%); + background: linear-gradient(180deg, #00eaff 10%, @color-primary 100%); font-weight: normal; margin-top: 2px; padding-left: 5px;