接口调整修改

src/assets/css/reset.css

@@ -35,7 +35,7 @@ a {
 
 /* 滚动条上的滚动滑块 */
 ::-webkit-scrollbar-thumb {
-  background-color: #49b1f5;
+  background-color: #ccc;
   /* 关键代码 */
   border-radius: 32px;
 }

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({

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({

src/views/components/carouselChart.vue

@@ -6,8 +6,12 @@
       :options="swiperOptionTop"
       ref="swiperTop"
     >
-      <swiper-slide class="slide-1" v-for="item in bigImg" :key="item.id">
+      <swiper-slide
-        <img :src="item.path" style="width: 100%; height: 100%" alt="" />
+        class="slide-1"
+        v-for="item in terminalPhoto"
+        :key="item.id"
+      >
+        <img :src="item.path" style="width: 100%" alt="" />
       </swiper-slide>
       <div
         class="swiper-button-next swiper-button-white"
@@ -26,10 +30,10 @@
     >
       <swiper-slide
         class="slide"
-        v-for="(item, index) in bigImg"
+        v-for="(item, index) in terminalPhoto"
         :key="item.id"
       >
-        <img style="width: 100%; height: 100%" :src="item.path" alt="" />
+        <img style="width: 100%" :src="item.path" alt="" />
         <p class="timeInfo">
           {{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }}
         </p>
@@ -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 {

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); //代码错误、请求失败捕获

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -137,11 +137,15 @@ export default {
   },
   methods: {
     ////获取拍照装置列表数据
-    terminalList() {
+    terminalList(page, pageSize) {
-      getTerminalJoggle()
+      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);
   },
 };
 </script>

src/views/management/userEquipment/lineInformation/components/addLineDialog.vue

@@ -19,10 +19,14 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="DY等级：" prop="dyLevel">
-        <el-input
+        <el-select v-model="lineForm.dyLevelid" placeholder="请选择电压等级">
-          v-model.number="lineForm.dyLevel"
+          <el-option
-          autocomplete="off"
+            v-for="items in dyOptions"
-        ></el-input>
+            :key="items.id"
+            :label="items.name"
+            :value="items.id"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="线路名称：" prop="name">
         <el-input v-model="lineForm.name" autocomplete="off"></el-input>
@@ -35,7 +39,12 @@
   </el-dialog>
 </template>
 <script>
-import { addLineJoggle, updateLineJoggle } from "@/utils/api/index";
+import {
+  addLineJoggle,
+  updateLineJoggle,
+  getdyListJoggle,
+} from "@/utils/api/index";
+
 export default {
   props: {
     lineDialog: {
@@ -56,11 +65,12 @@ export default {
   data() {
     return {
       lineForm: {},
+      dyOptions: "",
       rules: {
         bsManufacturer: [
           { required: true, message: "请输入公司名称", trigger: "blur" },
         ],
-        dyLevel: [
+        dyLevelid: [
           { required: true, message: "请选择DY等级", trigger: "blur" },
           { type: "number", message: "DY等级数字值" },
         ],
@@ -81,9 +91,10 @@ export default {
     submitForm() {
       this.$refs.formLineInfo.validate((valid) => {
         if (valid) {
+          console.log(this.lineForm);
           let formObj = {
             bsManufacturer: this.lineForm.bsManufacturer,
-            dyLevel: this.lineForm.dyLevel,
+            dyLevelid: this.lineForm.dyLevelid,
             name: this.lineForm.name,
           };
           this.formArr.push(formObj);
@@ -95,6 +106,7 @@ export default {
               .then((res) => {
                 console.log(res);
                 this.$emit("lineDialogClose", 1); //关闭弹窗
+                this.formArr = [];
                 this.$message.success("添加成功");
               })
               .catch((err) => {
@@ -104,7 +116,7 @@ export default {
           } else if (this.lineDialogTitle == "修改") {
             let changeformObj = {
               bsManufacturer: this.lineForm.bsManufacturer,
-              dyLevel: this.lineForm.dyLevel,
+              dyLevelid: this.lineForm.dyLevelid,
               name: this.lineForm.name,
               id: this.lineForm.id,
             };
@@ -133,7 +145,7 @@ export default {
   },
   mounted() {
     console.log("打印传过来的对象", this.formItem);
-    console.log("打印传过来的对象", this.formItem.bsIdentifier);
+    console.log("打印传过来的对象", this.formItem.bsManufacturer);
     this.lineForm = JSON.parse(JSON.stringify(this.formItem));
   },
   watch: {
@@ -148,5 +160,19 @@ export default {
       deep: true,
     },
   },
+  created() {
+    getdyListJoggle().then((res) => {
+      console.log(res);
+      this.dyOptions = res.data.list;
+      console.log(this.dyOptions);
+    });
+  },
 };
 </script>
+<style lang="less">
+.addLineDialog {
+  .el-select {
+    width: 100%;
+  }
+}
+</style>

src/views/management/userEquipment/lineInformation/index.vue

@@ -27,25 +27,33 @@
           </el-table-column>
           <el-table-column
             prop="id"
-            label="线路id"
+            label="线路编号"
             show-overflow-tooltip
             min-width="120"
           >
           </el-table-column>
           <el-table-column
             prop="name"
-            label="XL名称"
+            label="线路名称"
             min-width="120"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
-            prop="dyLevel"
+            prop="status"
-            label="DY等级"
+            label="线路状态"
+            min-width="120"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="dyLevelname"
+            label="电压等级名称"
             show-overflow-tooltip
             min-width="120"
           >
           </el-table-column>
+
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
@@ -102,17 +110,21 @@ export default {
       //删除数组
       deleteArr: [],
       page: 1, // 当前页数
-      pageSize: 20, // 每页数量
+      pageSize: 10, // 每页数量
       total: 0, //总条数
     };
   },
   methods: {
     //获取线路列表数据
-    lineList() {
+    lineList(page, pageSize) {
-      getLineListJoggle()
+      getLineListJoggle({
+        pageindex: page,
+        pagesize: pageSize,
+      })
         .then((res) => {
           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);
   },
 };
 </script>

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() {
+    async getLineTreeList() {
-      getdyTreeListJoggle({
+      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) {
+    async getChannelList(id) {
-      getChannelListJoggle({ termid: 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,
+        time: date,
-        pagesize: 100,
         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);
     },
   },
 };

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,