调整login

src/components/common/Header.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="header">
-    <div class="logo">可视化智能管控系统</div>
+    <div class="logo">
+      <img
+        src="../../assets/img/logo.png"
+        alt="欣影"
+        width="110px"
+      />智能管控系统
+    </div>
     <v-sidebar></v-sidebar>
     <div class="header-right">
       <div class="header-user-con">
@@ -177,6 +183,13 @@ export default {
     width: 250px;
     line-height: 70px;
     text-align: center;
+    display: flex;
+    align-items: center;
+    padding-left: 16px;
+    font-size: 20px;
+    img {
+      margin-right: 8px;
+    }
   }
   .header-right {
     float: right;

src/components/common/Sidebar.vue

@@ -162,10 +162,10 @@ export default {
                   index: "lineInformation",
                   title: "线路信息管理",
                 },
-                {
+                // {
-                  index: "towerInformation",
+                //   index: "towerInformation",
-                  title: "杆塔信息管理",
+                //   title: "杆塔信息管理",
-                },
+                // },
                 // {
                 //     index: 'towerTeam',
                 //     title: '杆塔班组用户'

src/views/Login.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="login-wrap">
+    <p class="blurBox"></p>
     <div class="loginFilter">
       <div class="ms-login">
         <div class="ms-title">
@@ -37,6 +38,7 @@
         </el-form>
       </div>
     </div>
+    <p class="webInfo">© 2023 可视化智能管控系统.All right reserved.</p>
   </div>
 </template>
 
@@ -91,46 +93,50 @@ export default {
   position: relative;
   width: 100%;
   height: 100%;
-  background: url(../assets/img/loginbg.jpeg) no-repeat center center;
+  background: url(../assets/img/logo.jpg) no-repeat center center;
   background-size: cover;
-  backdrop-filter: blur(15px);
-  -webkit-backdrop-filter: blur(5px);
   overflow: hidden;
-  .loginFilter {
+  .blurBox {
-    height: 100%;
+    position: absolute;
     width: 100%;
-    filter: drop-shadow(0px 20px 10px rgba(0, 0, 0, 0.5));
+    height: 100%;
+    //background: #86b7ff;
+    -webkit-backdrop-filter: blur(30px);
+    backdrop-filter: blur(30px);
+  }
+  .loginFilter {
+    width: 420px;
+    height: 454px;
+    background: transparent;
+    box-shadow: 0px 4px 12px 0px rgba(51, 51, 51, 0.15);
+    border-radius: 4px;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%;-50%);
+    position: absolute;
     display: flex;
-    justify-content: center;
+
-    align-items: center;
     .ms-login {
-      position: absolute;
       width: 420px;
       height: 454px;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%;-50%);
       border-radius: 5px;
-      background: url(../assets/img/loginBackImage.8b77ab2c.png) no-repeat;
-      // -webkit-backdrop-filter: blur(5px);
-      // backdrop-filter: blur(15px);
       overflow: hidden;
       background-size: 100%;
+      //background: @color-white;
       .ms-title {
         text-align: center;
-        border-bottom: 1px solid @border-color-base;
+        border-bottom: 1px solid #dcdfe6;
         padding: 40px 16px;
-
         img {
           margin-bottom: 8px;
-          width: 160px;
+          //width: 160px;
         }
         h3 {
           font-size: 30px;
-          background: linear-gradient(0deg, #86b7ff, #4293fd 99.46289%);
+          //background: linear-gradient(0deg, #86b7ff, #4293fd 99.46289%);
-          background-clip: text;
+          // background-clip: text;
-          -webkit-text-fill-color: transparent;
+          color: @color-text-primary;
-          // font-weight: normal;
+          font-weight: normal;
         }
       }
       .ms-content {
@@ -154,5 +160,14 @@ export default {
       // }
     }
   }
+  .webInfo {
+    bottom: 5%;
+    left: 50%;
+    transform: translate(-50%;-50%);
+    position: absolute;
+    font-size: 12px;
+    font-weight: 400;
+    color: @color-white;
+  }
 }
 </style>

src/views/devicePhotoSchedule/components/adddeviceDialog.vue

@@ -35,7 +35,7 @@
   </el-dialog>
 </template>
 <script>
-import { adddeviceJoggle, updatedeviceJoggle } from "@/utils/api/index";
+//import { adddeviceJoggle, updatedeviceJoggle } from "@/utils/api/index";
 export default {
   props: {
     deviceDialog: {

src/views/devicePhotoSchedule/index.vue

@@ -68,6 +68,14 @@
         </el-table-column>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip>
         </el-table-column>
+        <el-table-column fixed="right" label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text"
+              >修改</el-button
+            >
+            <el-button type="text">删除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!-- 新增线路 -->
@@ -82,7 +90,7 @@
 <script>
 import {
   getScheduleRulelListJoggle,
-  deletedeviceJoggle,
+  // deletedeviceJoggle,
 } from "@/utils/api/index";
 import adddeviceDialog from "./components/adddeviceDialog.vue";
 

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

@@ -142,6 +142,14 @@
           :formatter="dateFormat"
         >
         </el-table-column>
+        <el-table-column fixed="right" label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text"
+              >修改</el-button
+            >
+            <el-button type="text">删除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <addPhotoDialog

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

@@ -46,6 +46,7 @@
         border
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
+        :header-cell-style="{ background: '#F5F7FA' }"
       >
         <el-table-column type="index" width="55"> </el-table-column>
         <el-table-column type="selection" width="55"> </el-table-column>
@@ -63,6 +64,14 @@
         </el-table-column>
         <el-table-column prop="dyLevel" label="DY等级" show-overflow-tooltip>
         </el-table-column>
+        <el-table-column fixed="right" label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text"
+              >修改</el-button
+            >
+            <el-button type="text">删除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!-- 新增线路 -->

src/views/realTimeMonitor/index.vue

@@ -37,23 +37,30 @@
         <carouselChart :terminalPhoto="terminalPhoto"></carouselChart>
       </div>
       <div class="parameterArea">
+        <div class="paramsDate">
+          <h3>日期选择</h3>
+          <el-date-picker
+            v-model="dateValue"
+            type="date"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </div>
         <div class="monitorItemBox">
           <h3>检测项 通道</h3>
-          <div class="btnBox">
+          <el-select
-            <el-select
+            v-model="channelValue"
-              v-model="channelValue"
+            placeholder="请选择"
-              placeholder="请选择"
+            @change="changeChannelId"
-              @change="changeChannelId"
+          >
+            <el-option
+              v-for="item in channelOption"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-              <el-option
+            </el-option>
-                v-for="item in channelOption"
+          </el-select>
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </div>
         </div>
       </div>
       <!-- <paramArea></paramArea> -->
@@ -95,6 +102,7 @@ export default {
       channelOption: [], //通道分类
       channelValue: "",
       terminalPhoto: [], //获取拍照装置当前数据
+      dateValue: "", //日期
     };
   },
   watch: {},
@@ -228,5 +236,23 @@ export default {
       overflow: hidden;
     }
   }
+  .parameterArea {
+    width: 300px;
+    padding: 16px 16px;
+    border-left: 1px solid #dcdfe6;
+    .monitorItemBox,
+    .paramsDate {
+      margin-bottom: 16px;
+      h3 {
+        font-size: 16px;
+        font-weight: normal;
+        color: @color-text-primary;
+        margin-bottom: 8px;
+      }
+      .el-date-editor.el-input {
+        width: 215px;
+      }
+    }
+  }
 }
 </style>

src/views/realTimeMonitor/paramArea.vue

@@ -181,36 +181,36 @@ export default {
 };
 </script>
 <style lang="less">
-.parameterArea {
+// .parameterArea {
-  width: 300px;
+//   width: 300px;
-  padding: 16px 8px;
+//   padding: 16px 8px;
-  .monitorItemBox,
+//   .monitorItemBox,
-  .monitorPointBox,
+//   .monitorPointBox,
-  .actionItem,
+//   .actionItem,
-  .configItem {
+//   .configItem {
-    border: 1px solid @border-color-base;
+//     border: 1px solid @border-color-base;
-    padding: 8px 16px 8px 16px;
+//     padding: 8px 16px 8px 16px;
-    margin-bottom: 32px;
+//     margin-bottom: 32px;
-    h3 {
+//     h3 {
-      font-size: 16px;
+//       font-size: 16px;
-      margin-bottom: 8px;
+//       margin-bottom: 8px;
-      background: transparent;
+//       background: transparent;
-      color: @color-text-regular;
+//       color: @color-text-regular;
-    }
+//     }
-    .btnBox {
+//     .btnBox {
-      display: flex;
+//       display: flex;
-      flex-wrap: wrap;
+//       flex-wrap: wrap;
-      justify-content: space-between;
+//       justify-content: space-between;
-      .el-button {
+//       .el-button {
-        width: 84px;
+//         width: 84px;
-        padding: 6px 0px;
+//         padding: 6px 0px;
-        font-size: 12px;
+//         font-size: 12px;
-        margin-bottom: 8px;
+//         margin-bottom: 8px;
-      }
+//       }
-      .el-button + .el-button {
+//       .el-button + .el-button {
-        margin-left: 0px;
+//         margin-left: 0px;
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
 </style>

vue.config.js

@@ -18,16 +18,26 @@ module.exports = defineConfig({
   },
   devServer: {
     proxy: {
-      [process.env.VUE_APP_BASE_API]: {
+      '/api': {//表示拦截以/api开头的请求路径
         //表示拦截以/api开头的请求路径
         //target: 'http://localhost:1234', //本地nodejs服务器
         target: "http://47.96.238.157:8093", //公司项目服务器环境
         //target: 'http://180.166.218.222:7200',
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          ["^" + process.env.VUE_APP_BASE_API]: "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          '^/api': '' //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
-        },
+        }
-      },
+      }
+      // [process.env.VUE_APP_BASE_API]: {
+      //   //表示拦截以/api开头的请求路径
+      //   //target: 'http://localhost:1234', //本地nodejs服务器
+      //   target: "http://47.96.238.157:8093", //公司项目服务器环境
+      //   //target: 'http://180.166.218.222:7200',
+      //   changOrigin: true, //是否开启跨域
+      //   pathRewrite: {
+      //     ["^" + process.env.VUE_APP_BASE_API]: "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+      //   },
+      // },
     },
   },
 });