代码提交

package.json

@@ -14,22 +14,24 @@
     "dayjs": "^1.11.7",
     "element-resize-detector": "^1.2.4",
     "element-ui": "^2.15.6",
+    "flv.js": "^1.6.2",
     "html2canvas": "^1.4.1",
     "js-cookie": "^3.0.1",
     "jspdf": "^2.5.1",
+    "moment": "^2.29.4",
     "mqtt": "^3.0.0",
     "node-sass": "^8.0.0",
     "postcss-plugin-px2rem": "^0.8.1",
     "screenfull": "5.2.0",
     "v-scale-screen": "^1.0.0",
+    "video.js": "^8.0.4",
     "vue": "^2.5.2",
     "vue-awesome-swiper": "^4.1.1",
     "vue-cropper": "^0.5.8",
     "vue-router": "^3.0.1",
     "vue2-scale-box": "^0.1.4",
     "vuedraggable": "2.24.3",
-    "vuex": "3.0.1",
+    "vuex": "3.0.1"
-    "moment": "^2.29.4"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

src/api/api.js

@@ -149,8 +149,8 @@ export const getWarnSurveillance = (params) => {
    )
 };
 //隐患整改记录
-// export const getMostTroubleCensus = (params) => {
+export const getResolveTroublePage = (params) => {
-//   return axios.get('api/ems-third-party-service/project/mostTroubleCensus',
+  return axios.get('api/ems-third-party-service/project/resolveTroublePage',
-//   {params},
+  {params},
-//    )
+   )
-// };
+};

src/components/common/tableGantt.vue

@@ -819,7 +819,7 @@ $gantt_item_half: 4px;
     // background-color: transparent !important;
     color: #ADFFFE!important;
     border: none !important;
-    padding-left: 0 !important;
+    padding-left: 0 ;
     padding-right: 0 !important;
 }
 

src/main.js

@@ -44,6 +44,11 @@ Vue.filter('datefmt',function (input,fmtstring) {//当input为时间戳时，需
 
 Vue.prototype.$moment = moment
 Vue.config.productionTip = false
+
+//引入video
+import videojs from "video.js";
+import "video.js/dist/video-js.css";
+Vue.prototype.$video = videojs;
 //MQTT订阅
 var currentTopics = null;
 var client = null;

src/views/login.vue

@@ -32,7 +32,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item prop="password" label="" style="margin-top: 15px;margin-bottom:35px">
-                        <el-input type="password" placeholder="请输入密码" v-model="param.password" @keyup.enter.native="submitForm()">
+                        <el-input type="password" placeholder="请输入密码" v-model="param.password" @keyup.enter.native="submitForm()" show-password>
                             <el-button slot="prepend" icon="el-icon-lock"></el-button>
                         </el-input>
                     </el-form-item>
@@ -84,7 +84,7 @@ export default {
   created() {
     let h = document.documentElement.clientHeight || document.body.clientHeight;
     this.vdaH = h - 0 + "px";
-    //    this.createMqtt()
+       this.createMqtt()
        this.getWeather()
       //  this.getTokenData()
   },
@@ -190,7 +190,7 @@ export default {
         },
        createMqtt() {
            
-            this.topicSends = ['/SC/pub/uwb'];
+            this.topicSends = ['webdata'];
              console.log("this.topicSends",this.topicSends)
         window.PubScribe(this.topicSends, this.realInfo);  
          },
@@ -199,7 +199,7 @@ export default {
         // console.log("topic",topic)
       switch (topic) {
         // 接收托片
-         case "/SC/pub/uwb":
+         case "webdata":
              try {
                 console.log("message",message)
             //   const utf8decoder = new TextDecoder()
@@ -525,7 +525,7 @@ getWeather () {
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 

src/views/modelScreen.vue

@@ -1476,7 +1476,7 @@ export default {
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 

src/views/modelScreenComponents.vue

@@ -1693,7 +1693,7 @@ export default {
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 

src/views/progress.vue

@@ -1332,7 +1332,7 @@ export default {
     // background-color: transparent !important;
     color: #ADFFFE !important;
     border: none !important;
-    padding-left: 0 !important;
+    padding-left: 0 ;
     padding-right: 0 !important;
 }
 

src/views/progressComponents.vue

@@ -77,7 +77,7 @@
                 </div>
                 <div class="btnIcon" @click="gantDialog"></div>
                 <div class="tableBox">
-                    <el-table height="237" :row-style="{ height: '0' }" :cell-style="{ padding: '8px' }"
+                    <el-table height="100%" :row-style="{ height: '0' }" :cell-style="{ padding: '8px' }"
                         :row-class-name="tableRowClassName" :data="tableData" style="width: 100%">
                         <el-table-column header-align="center" align="center" show-overflow-tooltip prop="name"
                             label="任务名称">
@@ -137,10 +137,10 @@
                 <span></span>
             </div>
             <div class="table2Box">
-                <el-table height="270" :row-class-name="tableRowClassName" :data="table2Data" style="width: 100%" :cell-style="{ padding: '5px' }">
+                <el-table height="100%" :row-class-name="tableRowClassName" :data="table2Data" style="width: 100%" :cell-style="{ padding: '5px' }">
-                    <el-table-column header-align="center" align="center" show-overflow-tooltip prop="name" label="任务名称">
+                    <el-table-column align="left" show-overflow-tooltip prop="name" label="任务名称" style="left:20px">
                     </el-table-column>
-                    <el-table-column align="center" prop="startDate" label="开始时间">
+                    <el-table-column align="center" prop="startDate" label="开始时间" >
                     </el-table-column>
                     <el-table-column align="center" prop="endDate" label="结束时间">
                     </el-table-column>
@@ -691,6 +691,10 @@ export default {
     top: 70px;
     left: 16px;
     position: absolute;
+    height: 286px;
+    @media only screen and (max-height: 1000px) {
+        height: 237px;
+    }
 }
 .dh1 {
     animation: mytest 0.5s linear;
@@ -889,7 +893,7 @@ export default {
     font-size: 14px;
     display: flex;
     flex-wrap: wrap;
-    margin: 10px auto 0;
+    margin: 13px auto 0;
     width: 90%;
     border-bottom: 1px solid rgba(96, 213, 205, 0.4);
 }
@@ -1311,7 +1315,7 @@ export default {
     // background-color: transparent !important;
     color: #ADFFFE !important;
     border: none !important;
-    padding-left: 0 !important;
+    padding-left: 7 !important;
     padding-right: 0 !important;
 }
 

src/views/swiper.vue

@@ -38,25 +38,60 @@
           <div class="boxChild">
             <div class="fathBox"></div>
             <div class="fath2Box">
-                <div style="margin-left: 21px;margin-top: 8px;">
+              <div style="margin-left: 21px; margin-top: 8px">
-                  <span style="color:#82DDDB;">派单时间：</span>
+                <span style="color: #82dddb">派单时间：</span>
-                  <span style="color:#fff;">{{ item.value }}</span>
+                <span style="color: #fff">{{ item.allocateDate }}</span>
               </div>
-                <div style="margin-left: 21px;margin-top: 8px;">
+              <div style="margin-left: 21px; margin-top: 8px">
-                  <span style="color:#82DDDB;width: 71px; text-align-last: justify;display: inline-block;">整改人：</span>
+                <span
-                  <span style="color:#fff;">陈晓红</span>
+                  style="
+                    color: #82dddb;
+                    width: 71px;
+                    text-align-last: justify;
+                    display: inline-block;
+                  "
+                  >整改人：</span
+                >
+                <span style="color: #fff">{{ item.rectifier }}</span>
               </div>
-                <div style="margin-left: 21px;margin-top: 8px;">
+              <div style="margin-left: 21px; margin-top: 8px">
-                  <span style="color:#82DDDB;width: 71px; text-align-last: justify;display: inline-block;">状态：</span>
+                <span
-                  <span style="color:#EAA505;">待处理</span>
+                  style="
+                    color: #82dddb;
+                    width: 71px;
+                    text-align-last: justify;
+                    display: inline-block;
+                  "
+                  >状态：</span
+                >
+                <span style="color: #eaa505">{{ item.status }}</span>
               </div>
-                <div style="margin-left: 21px;margin-top: 8px;">
+              <div style="margin-left: 21px; margin-top: 8px">
-                  <span style="color:#82DDDB;width: 71px; text-align-last: justify;display: inline-block;">隐患内容：</span>
+                <span
-                  <span style="color:#fff;">现场作业准备</span>
+                  style="
+                    color: #82dddb;
+                    width: 71px;
+                    text-align-last: justify;
+                    display: inline-block;
+                  "
+                  >隐患内容：</span
+                >
+                <span style="color: #fff">{{ item.troubleContent }}</span>
               </div>
-                <div style="margin-left: 21px;margin-top: 8px;">
+              <div style="margin-left: 21px; margin-top: 8px">
-                  <span style="color:#82DDDB;width: 71px;vertical-align: top; text-align-last: justify;display: inline-block;">隐患内容：</span>
+                <span
-                  <span style="color:#fff;display: inline-block;width: 90px;">上方悬挂摇晃吊灯下坠</span>
+                  style="
+                    color: #82dddb;
+                    width: 71px;
+                    vertical-align: top;
+                    text-align-last: justify;
+                    display: inline-block;
+                  "
+                  >隐患内容：</span
+                >
+                <span style="color: #fff; display: inline-block; width: 90px">{{
+                  item.troubleMark
+                }}</span>
               </div>
             </div>
           </div>
@@ -64,36 +99,19 @@
 
         <p class="left" @click="changePage(1)"></p>
         <p class="right" @click="changePage(2)"></p>
-
       </div>
     </el-carousel-item>
   </el-carousel>
 </template>
 
 <script>
-import {
+import { getResolveTroublePage } from "../api/api";
-  getMostTroubleCensus
-} from "../api/api";
 export default {
   components: {},
   props: {},
   data() {
     return {
-      list: [
+      list: [],
-        {
-          value: "2023-01-17"
-        },
-        {
-          value: "2023-01-18"
-        },
-        {
-          value: "2023-01-19"
-        }, {
-          value: "2023-11-20"
-        }, {
-          value: "2023-01-21"
-        }
-      ],
       listIndex: 0, //默认显示第几张图片
       timer: null, //定时器
     };
@@ -117,20 +135,33 @@ export default {
     },
   },
   methods: {
-    getData(){
+    getData() {
-      getMostTroubleCensus({
+      getResolveTroublePage({
         projectId: sessionStorage.getItem("projectId"),
-        // size:10,
+        size: 100,
-        // current:1
+        current: 1,
       }).then((res) => {
-        console.log(res.data,'==================');
+        this.list = Object.keys(res.data.data.records).map((item, index) => {
+          if (res.data.data.records[item].status == 0) {
+            res.data.data.records[item].status = "未完成";
+          } else {
+            res.data.data.records[item].status = "已完成";
+          }
+          return {
+            allocateDate: res.data.data.records[item].allocateDate,
+            rectifier: res.data.data.records[item].rectifier,
+            status: res.data.data.records[item].status,
+            troubleContent: res.data.data.records[item].troubleContent,
+            troubleMark: res.data.data.records[item].troubleMark,
+          };
+        });
       });
     },
     changePage(index) {
       if (index == 1) {
-        this.$refs.carousel.prev()
+        this.$refs.carousel.prev();
       } else {
-        this.$refs.carousel.next()
+        this.$refs.carousel.next();
       }
       // this.listIndex = index;
     },
@@ -157,13 +188,13 @@ export default {
     this.setTimer();
   },
   mounted() {
-    this.getData()
+    this.getData();
   },
 };
 </script>
 
 <style scoped lang="less">
-@marginLeft:50px;
+@marginLeft: 50px;
 .home {
   display: flex;
   align-items: center;
@@ -220,7 +251,6 @@ export default {
     @media only screen and (max-height: 1000px) {
       top: 31px;
     }
-
   }
 
   .right {
@@ -260,7 +290,6 @@ export default {
   //     }
   //   }
   // }
-
 }
 </style>
 <style>
@@ -268,7 +297,7 @@ export default {
 .el-carousel__arrow--right {
   display: none;
 }
- .el-carousel__container {
+.el-carousel__container {
   position: relative;
   height: 180px !important;
 }

src/views/videoViewingComponents.vue

@@ -159,6 +159,7 @@ import pieChart from "@/components/common/pieChart";
 import pieDateChart from "@/components/common/pieDateChart";
 import Resize from "../utils/Resize.vue";
 import { getCameraCount, getCameraHistory } from "@/api/api";
+import flvjs from 'flv.js'
 export default {
   name: "report",
   props: {