修改bug

src/assets/styles/index.scss

@@ -126,7 +126,9 @@ aside {
   height: 100vh; /* 视口高度 */
   margin: 0;
   //padding: 0;
-  overflow: hidden; /* 防止内容溢出 */
+  //overflow: hidden; /* 防止内容溢出 */
+  overflow-y: auto;
+  overflow-x: hidden;
   padding-left: 40px;
   padding-right: 40px;
   padding-top: 20px;

src/components/TopNav/index.vue

@@ -214,7 +214,7 @@ export default {
     this.roles = this.$store.getters.roles;
   },
   created() {
-    this.getinfo();
+    // this.getinfo();
   },
   methods: {
     updateBackTag(path) {

src/layout/components/Navbar.vue

@@ -40,7 +40,7 @@
               <!--              </el-form-item>-->
             </el-form>
             <span slot="footer" class="dialog-footer">
-              <el-button @click.native="resetPwdVisible = false">取 消</el-button>
+              <el-button @click="closePwd">取 消</el-button>
               <el-button type="primary" @click="submit">确 定</el-button>
             </span>
           </el-dialog>
@@ -148,12 +148,17 @@ export default {
     }
   },
   methods: {
+    closePwd() {
+      this.resetPwdVisible = false
+      this.$refs['form'].resetFields();
+    },
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.resetPwdVisible = false;
+            this.$refs['form'].resetFields();
           });
         }
       });

src/views/employee/index.vue

 <template>
   <div class="app-container">
-    <div style="background-color: #F6F6FA;height: 95vh;padding-left: 30px;padding-right: 30px" >
+    <div style="background-color: #F6F6FA;margin-bottom:20px; padding-left: 30px;padding-right: 30px" >
       <div>
         <span style="display: flex;justify-content: flex-start;align-items: center;"><div style="border: 1px solid #116FBB;width: 2px;height: 20px;margin-right: 5px"></div><h5 style="color: #116FBB">员工信息管理</h5></span>
       </div>
       <el-row :gutter="20">
         <!--部门数据-->
-        <el-col :span="4" :xs="24">
-          <div class="head-container" v-if="false">
-            <el-input
-              v-model="deptName"
-              placeholder="请输入部门名称"
-              clearable
-              size="small"
-              prefix-icon="el-icon-search"
-              style="margin-bottom: 20px"
-            />
-          </div>
-          <div class="head-container" v-if="false">
-            <el-tree
-              :data="deptOptions"
-              :props="defaultProps"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              ref="tree"
-              node-key="id"
-              default-expand-all
-              highlight-current
-              @node-click="handleNodeClick"
-            />
-          </div>
-        </el-col>
+<!--        <el-col :span="4" :xs="24">-->
+<!--          <div class="head-container" v-if="false">-->
+<!--            <el-input-->
+<!--              v-model="deptName"-->
+<!--              placeholder="请输入部门名称"-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              prefix-icon="el-icon-search"-->
+<!--              style="margin-bottom: 20px"-->
+<!--            />-->
+<!--          </div>-->
+<!--          <div class="head-container" v-if="false">-->
+<!--            <el-tree-->
+<!--              :data="deptOptions"-->
+<!--              :props="defaultProps"-->
+<!--              :expand-on-click-node="false"-->
+<!--              :filter-node-method="filterNode"-->
+<!--              ref="tree"-->
+<!--              node-key="id"-->
+<!--              default-expand-all-->
+<!--              highlight-current-->
+<!--              @node-click="handleNodeClick"-->
+<!--            />-->
+<!--          </div>-->
+<!--        </el-col>-->
         <!--用户数据-->
         <el-col :span="24" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -268,14 +268,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="权重">
-                <el-input-number v-model="form.weightNum" controls-position="right" :min="1" ></el-input-number>
+                <el-input-number v-model="form.weightNum" controls-position="right" :min="1" :max="100000"></el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="备注">
-                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="255"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -863,7 +863,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
 
 
 /* styles.css 文件 */
@@ -907,6 +907,17 @@ export default {
 .status-disabled {
   color: red; /* 已禁用状态的颜色 */
 }
+.text-right {
+  text-align: right;
+}
+::v-deep .el-table{
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+::v-deep .el-table__body-wrapper{
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 </style>
 
 <!-- 按钮靠右对齐  -->
@@ -918,7 +929,5 @@ export default {
   transform: translateY(-10%);
 }
 
-.text-right {
-  text-align: right;
-}
+
 </style>

src/views/history/index.vue

@@ -3,7 +3,7 @@
     <div
       style="
         background-color: white;
-        height: 95vh;
+        margin-bottom: 30px;
         padding-left: 30px;
         padding-right: 30px;
       "
@@ -109,7 +109,7 @@
         @selection-change="handleSelectionChange"
         style="min-height: 650px"
       >
-        <el-table-column type="selection" width="55" align="center" />
+<!--        <el-table-column type="selection" width="55" align="center" />-->
 
         <el-table-column label="序号" align="center" width="100">
           <template slot-scope="scope">
@@ -292,6 +292,9 @@ export default {
         monitorTime: undefined,
         monitorState: undefined,
         id: undefined,
+        monitoringFinallytime: '',
+        monitoringStarttime: ''
+
       },
       // 表单参数
       form: {},
@@ -391,6 +394,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.monitoringFinallytime = ''
+      this.queryParams.monitoringStarttime = ''
+      this.queryParams.monitorState = ''
+      this.queryParams.monitoringName = ''
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -476,4 +483,12 @@ export default {
 .green-icon .el-icon-view {
   color: #51ad51;
 }
+::v-deep .el-table{
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+::v-deep .el-table__body-wrapper{
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 </style>

src/views/video/index.vue

@@ -6,8 +6,8 @@
         <div id="video-container" style="width: 910px; height: 380px" @click="abv" >
         </div>
         <div style="display: flex;">
-          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain
-                     @click="fulScreen"></el-button>
+<!--          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain-->
+<!--                     @click="fulScreen"></el-button>-->
           <el-button v-if="recordButton" icon="el-icon-video-camera" style="border: transparent;background-color: transparent;font-size: large" plain
                      @click="startSave"></el-button>
           <el-button v-if="!recordButton" icon="el-icon-video-camera-solid" style="border: transparent;background-color: transparent;font-size: large;color: #F6F6FA" plain
@@ -20,8 +20,8 @@
         <div id="video-container1" style="width: 910px; height: 380px">
         </div>
         <div style="display: flex;">
-          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain
-                     @click="fulScreen1"></el-button>
+<!--          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain-->
+<!--                     @click="fulScreen1"></el-button>-->
           <el-button v-if="recordButton1" icon="el-icon-video-camera" style="border: transparent;background-color: transparent;font-size: large" plain
                      @click="startSave1"></el-button>
           <el-button v-if="!recordButton1" icon="el-icon-video-camera-solid" style="border: transparent;background-color: transparent;font-size: large;color: #F6F6FA" plain
@@ -37,8 +37,8 @@
         <div id="video-container2" style="width: 910px; height: 380px">
         </div>
         <div style="display: flex;">
-          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain
-                     @click="fulScreen2"></el-button>
+<!--          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain-->
+<!--                     @click="fulScreen2"></el-button>-->
           <el-button v-if="recordButton2" icon="el-icon-video-camera" style="border: transparent;background-color: transparent;font-size: large" plain
                      @click="startSave2"></el-button>
           <el-button v-if="!recordButton2" icon="el-icon-video-camera-solid" style="border: transparent;background-color: transparent;font-size: large;color: #F6F6FA" plain
@@ -51,8 +51,8 @@
         <div id="video-container3" style="width: 910px; height: 380px">
         </div>
         <div style="display: flex;">
-          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain
-                     @click="fulScreen"></el-button>
+<!--          <el-button icon="el-icon-full-screen" style="border: transparent;background-color: transparent;font-size: large" plain-->
+<!--                     @click="fulScreen"></el-button>-->
           <el-button v-if="recordButton3" icon="el-icon-video-camera" style="border: transparent;background-color: transparent;font-size: large" plain
                      @click="startSave3"></el-button>
           <el-button v-if="!recordButton3" icon="el-icon-video-camera-solid" style="border: transparent;background-color: transparent;font-size: large;color: #F6F6FA" plain
@@ -165,31 +165,31 @@ export default {
           } else {
             this.$message.error("获取视频流失败")
           }
-          console.info('视频流是0',res)
         })
       } else if (this.deviceList.length == 2){
         getStream(this.deviceList[0],this.accessToken).then(res => {
-          console.info('视频流是1',res)
+          this.getInit(this.accessToken,res.data.data.url)
         })
         getStream(this.deviceList[1],this.accessToken).then(res => {
-          console.info('视频流是2',res)
+          this.getInit1(this.accessToken,res.data.data.url)
         })
-      } else if (this.deviceList.length === 3){
+      }
+      else if (this.deviceList.length === 3){
         getStream(this.deviceList[0],this.accessToken).then(res => {
-          console.info('视频流是3',res)
+          this.getInit(this.accessToken,res.data.data.url)
         })
         getStream(this.deviceList[1],this.accessToken).then(res => {
-          console.info('视频流是4',res)
+          this.getInit1(this.accessToken,res.data.data.url)
         })
         getStream(this.deviceList[2],this.accessToken).then(res => {
-          console.info('视频流是5',res)
+          this.getInit2(this.accessToken,res.data.data.url)
         })
       } else if(this.deviceList.length == 4) {
-
         getStream(this.deviceList[0],this.accessToken).then(res => {
           this.getInit(this.accessToken,res.data.data.url)
         })
         getStream(this.deviceList[1],this.accessToken).then(res => {
+          console.info('', )
           this.getInit1(this.accessToken,res.data.data.url)
         })
         getStream(this.deviceList[2],this.accessToken).then(res => {

src/views/video/playback.vue

@@ -33,7 +33,7 @@
         <el-form-item label="监控状态">
           <el-input
             disabled
-            :value="carryRowCode.monitorState === 0 ? '进行中' : '已完成' "
+            :value="carryRowCode.monitorState === 0 || carryRowCode.monitorState === '0' ? '进行中' : '已完成' "
           ></el-input>
         </el-form-item>
       </el-form>
@@ -95,6 +95,7 @@ export default {
 
   },
   mounted() {
+    console.info('传递的数据',this.$route.query.carryRowCode)
     this.carryRowCode = this.$route.query.carryRowCode;
     this.code = this.$route.query.carryRowCode.code;
     this.startTime = this.$route.query.carryRowCode.monitoringStarttime