diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index f1f7cc6..fa11162 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -35,7 +35,7 @@ a { /* 滚动条上的滚动滑块 */ ::-webkit-scrollbar-thumb { - background-color: #49b1f5; + background-color: #ccc; /* 关键代码 */ border-radius: 32px; } diff --git a/src/main.js b/src/main.js index 01db7d3..86aeacc 100644 --- a/src/main.js +++ b/src/main.js @@ -32,7 +32,6 @@ Vue.prototype.$md5 = md5; import moment from "moment"; // 导入文件 // 注册全局 moment Vue.prototype.$moment = moment; - Vue.config.productionTip = false; new Vue({ diff --git a/src/utils/api/index.js b/src/utils/api/index.js index f17809b..964a7a4 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -151,6 +151,14 @@ export function getScheduleRulelListJoggle(data) { } //线路信息管理接口数据 +//获取电压等级列表 +export function getdyListJoggle(data) { + return request({ + url: "/test/getdyList", + method: "post", + data, + }); +} //1.线路列表信息 export function getLineListJoggle(data) { return request({ diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 04dcc23..26af4a5 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -6,8 +6,12 @@ :options="swiperOptionTop" ref="swiperTop" > - - + +
- +

{{ $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 @@ + + +