chengdandan
/
qiuwang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

代码提交

This commit is contained in:
lixiaobang 2023-03-29 16:30:21 +08:00
parent 420508d008
commit 89cac3357b
7 changed files with 594 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -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",
"moment": "^2.29.4"
"vuex": "3.0.1"
},
"devDependencies": {
"autoprefixer": "^7.1.2",

10
src/api/api.js
View File

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

5
src/main.js
View File

@ -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;

895
src/views/index.vue
View File

File diff suppressed because it is too large Load Diff

8
src/views/login.vue
View File

@ -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()

161
src/views/swiper.vue
View File

@ -31,69 +31,87 @@
<p class="right" @click="changePage(nextIndex)"></p>
</div> -->
<!-- </div> -->
<el-carousel indicator-position="1000" :autoplay="true" ref="carousel">
<el-carousel-item v-for="(item, index) in list" :key="index">
<div class="home">
<div class="box">
<div class="boxChild">
<div class="fathBox"></div>
<div class="fath2Box">
<div style="margin-left: 21px;margin-top: 8px;">
<span style="color:#82DDDB;">派单时间：</span>
<span style="color:#fff;">{{ item.value }}</span>
</div>
<div style="margin-left: 21px;margin-top: 8px;">
<span style="color:#82DDDB;width: 71px; text-align-last: justify;display: inline-block;">整改人：</span>
<span style="color:#fff;">陈晓红</span>
</div>
<div style="margin-left: 21px;margin-top: 8px;">
<span style="color:#82DDDB;width: 71px; text-align-last: justify;display: inline-block;">状态：</span>
<span style="color:#EAA505;">待处理</span>
</div>
<div style="margin-left: 21px;margin-top: 8px;">
<span style="color:#82DDDB;width: 71px; text-align-last: justify;display: inline-block;">隐患内容：</span>
<span style="color:#fff;">现场作业准备</span>
</div>
<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 style="color:#fff;display: inline-block;width: 90px;">上方悬挂摇晃吊灯下坠</span>
</div>
<el-carousel indicator-position="1000" :autoplay="true" ref="carousel">
<el-carousel-item v-for="(item, index) in list" :key="index">
<div class="home">
<div class="box">
<div class="boxChild">
<div class="fathBox"></div>
<div class="fath2Box">
<div style="margin-left: 21px; margin-top: 8px">
<span style="color: #82dddb">派单时间：</span>
<span style="color: #fff">{{ item.allocateDate }}</span>
</div>
<div style="margin-left: 21px; margin-top: 8px">
<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">
<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">
<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">
<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>
<p class="left" @click="changePage(1)"></p>
<p class="right" @click="changePage(2)"></p>
</div>
</el-carousel-item>
</el-carousel>
<p class="left" @click="changePage(1)"></p>
<p class="right" @click="changePage(2)"></p>
</div>
</el-carousel-item>
</el-carousel>
</template>
<script>
import {
getMostTroubleCensus
} from "../api/api";
import { getResolveTroublePage } from "../api/api";
export default {
components: {},
props: {},
data() {
return {
list: [
{
value: "2023-01-17"
},
{
value: "2023-01-18"
},
{
value: "2023-01-19"
}, {
value: "2023-11-20"
}, {
value: "2023-01-21"
}
],
list: [],
listIndex: 0, //默认显示第几张图片
timer: null, //定时器
};
@ -117,20 +135,33 @@ export default {
},
},
methods: {
getData(){
getMostTroubleCensus({
getData() {
getResolveTroublePage({
projectId: sessionStorage.getItem("projectId"),
// size:10,
// current:1
size: 100,
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,8 +297,8 @@ export default {
.el-carousel__arrow--right {
display: none;
}
.el-carousel__container {
position: relative;
height: 180px !important;
.el-carousel__container {
position: relative;
height: 180px !important;
}
</style>

3
src/views/videoViewingComponents.vue
View File

@ -25,7 +25,7 @@
alt=""
style="width: 100%; height: 100%"
/>
<div class="childrenBox">
<div class="childrenBox">
{{ videoName }}
</div>
</div>
@ -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: {