Merge branch 'lukeyan' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into lukeyan

1 year ago · 06c91882fa
parent 8536c4f96a 454a208c46
commit 06c91882fa
5 changed files with 149 additions and 9 deletions
--- a/src/assets/safetyIndex/背景001.png
+++ b/src/assets/safetyIndex/背景001.png
--- a/src/assets/safetyIndex/背景002.png
+++ b/src/assets/safetyIndex/背景002.png
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -4,10 +4,10 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  //baseURL: 'http://172.18.113.50:8080/zhapi',
+  baseURL: 'http://172.18.113.50:8080/zhapi',
  //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
  //baseURL: 'http://192.168.0.188:8888/zhapi',
-  baseURL: `http://${window.location.host}/zhapi`,
+  //baseURL: `http://${window.location.host}/zhapi`,
  timeout: 50000,
  headers: { 'content-type': 'application/json' },
 })
--- a/src/views/realtimeWarning/index.vue
+++ b/src/views/realtimeWarning/index.vue
@ -549,6 +549,7 @@ export default {
                width: 461px;
                height: 412px;
                position: relative;
+                margin-top: 30vh !important;

                .el-dialog__title {
                    font-size: 16px;
--- a/src/views/safetyIndex/cheliang.vue
+++ b/src/views/safetyIndex/cheliang.vue
@ -3,14 +3,14 @@
        <div class="title"><img src="../../assets/safetyIndex/装饰009991.png" alt="">企业车辆</div>
        <div class="qyclBody">
            <div class="today">
-                <div class="todayChild">
+                <div class="todayChild" @click="showpicVisible(1)">
                    <div class="iconBox"><img src="../../assets/safetyIndex/今日进园区.png" alt=""></div>
                    <div class="iconmsg">
                        <div class="msgText">今日进园区</div>
                        <div class="msgNum"><span>{{ intotal }}</span>&nbsp;辆</div>
                    </div>
                </div>
-                <div class="todayChild">
+                <div class="todayChild" @click="showpicVisible(2)">
                    <div class="iconBox"><img src="../../assets/safetyIndex/今日出园区.png" alt=""></div>
                    <div class="iconmsg">
                        <div class="msgText">今日出园区</div>
@ -74,6 +74,38 @@
                </el-pagination>
            </div>
        </el-dialog>
+        <el-dialog title="园区车辆进出详情" :visible.sync="diaVisible" class="picForm">
+
+            <div class="imgList">
+                <div class="imgListItem" v-for="item in disList" :key="item.id">
+                    <div class="detailImg">
+                        <img :src="item.globalUrlPic">
+                    </div>
+                    <div class="ListItem">
+                        <div class="detailText">
+                            车牌号码&nbsp;&nbsp;<span>{{ item.plateNo }}</span>
+                        </div>
+                        <div class="detailText">
+                            过车时间&nbsp;&nbsp;<span>{{ item.partitionField }}</span>
+                        </div>
+                        <div class="detailText">
+                            经过位置&nbsp;&nbsp;<span>{{ item.doorwayName }}</span>
+                        </div>
+                        <div class="detailText">
+                            进出方向&nbsp;&nbsp;<span>{{ item.directionCn }}</span>
+                        </div>
+                    </div>
+                </div>
+
+
+            </div>
+            <div class="block">
+                <el-pagination style="float:right;margin:5px;" class="msg-pagination-container" :background="true"
+                    @size-change="diaSizeChange" @current-change="diaCurrentChange" :current-page="fangkepageNum"
+                    :page-sizes="[10]" layout="total, sizes, prev, pager, next, jumper" :total="diatotal">
+                </el-pagination>
+            </div>
+        </el-dialog>
    </div>
 </template>

@ -86,6 +118,7 @@ export default {
            staffDetailList: [],
            listTotal: {},
            fangkeVisible: false,
+            diaVisible: false,
            fangkepageSize: 10,
            fangkepageNum: 1,
            fangketotal: 0,
@ -95,14 +128,24 @@ export default {
            ziyouTotal: 0,
            zulintotal: 0,
            useType: 0,
+            inList: [],
+            diapageSize: 10,
+            diapageNum: 1,
+            diatotal: 0,
+            outList: [],
+            diaIndex: 1,
+            disList: [],
+
        }
    },
    created() {
        this.getUserType()
-        vehicleIn({ direction: 1, pageSize: 10, pageNum: 1 }).then(res => {
+        vehicleIn({ direction: 1, pageSize: this.diapageNum, pageNum: this.diapageNum }).then(res => {
+            this.inList = res.data
            this.intotal = res.total
        })
-        vehicleIn({ direction: 2, pageSize: 10, pageNum: 1 }).then(res => {
+        vehicleIn({ direction: 2, pageSize: this.diapageNum, pageNum: this.diapageNum }).then(res => {
+            this.outList = res.data
            this.outtotal = res.total
        })
    },
@ -121,7 +164,6 @@ export default {
        tableHeaderCellColor() {
            return { 'background': 'rgba(0,0,0,0)', 'border': '0', 'color': '#fff' }
        },
-
        fangkeSizeChange(val) {
            this.fangkepageNum = 1;
            this.fangkepageSize = val;
@ -131,7 +173,23 @@ export default {
            this.fangkepageNum = val;
            this.showfangkeVisible(this.useType)
        },
-
+        showpicVisible(index) {
+            this.diaIndex = index
+            vehicleIn({ direction: index, pageSize: this.diapageNum, pageNum: this.diapageNum }).then(res => {
+                this.disList = res.data
+                this.diatotal = res.total
+                this.diaVisible = true
+            })
+        },
+        diaSizeChange(val) {
+            this.fangkepageNum = 1;
+            this.fangkepageSize = val;
+            this.showpicVisible(this.diaIndex)
+        },
+        diaCurrentChange(val) {
+            this.fangkepageNum = val;
+            this.showpicVisible(this.diaIndex)
+        },
        getUserType() {
            vehicleUserType({ useType: 1 }).then(res => {
                this.ziyouTotal = res.data
@ -139,7 +197,6 @@ export default {
            vehicleUserType({ useType: 2 }).then(res => {
                this.zulintotal = res.data
            })
-
        },
        showfangkeVisible(val) {
            this.useType = val
@ -206,6 +263,7 @@ export default {

                align-items: center;
                box-sizing: border-box;
+                cursor: pointer;

                .iconBox {
                    width: 48px;
@ -308,6 +366,87 @@ export default {
    }
 }

+.picForm {
+    /deep/ .el-dialog {
+        background-color: rgba(0, 0, 0, 0);
+        background: url('~@/assets/head/编组 3021112.png') no-repeat;
+        background-size: 100% 100%;
+        width: 1241px;
+        height: 850px;
+        position: relative;
+        margin-top: 3vh !important;
+
+        .el-dialog__title {
+            font-size: 16px;
+            color: #EBFFF4;
+            letter-spacing: 2px;
+            text-shadow: 0 0 9px rgba(21, 255, 195, 0.77);
+            font-weight: 400;
+        }
+
+        .el-dialog__body {
+            box-sizing: border-box;
+            height: 770px;
+
+            .imgList {
+                width: 100%;
+                height: 100%;
+                display: flex;
+                justify-content: space-evenly;
+                flex-wrap: wrap;
+
+                .imgListItem {
+                    height: calc(50% - 8px);
+                    width: calc(20% - 10px);
+                    background: url('~@/assets/safetyIndex/背景001.png') no-repeat;
+                    background-size: 100% 100%;
+                    padding: 10px;
+                    position: relative;
+
+                    .detailImg {
+                        margin: 0 auto;
+                        width: 96%;
+                        height: calc(100% - 150px);
+
+
+                        img {
+                            width: 100%;
+                            height: 100%;
+                            ;
+                        }
+                    }
+
+                    .ListItem {
+                        margin-top: 10px;
+                        background: url('~@/assets/safetyIndex/背景001.png') no-repeat;
+                        background-size: 100% 100%;
+                    }
+
+                    .detailText {
+                        margin: 15px 0;
+                        margin-left: 10px;
+                        height: 20px;
+                        font-family: PingFangSC-Regular;
+                        font-size: 12px;
+                        color: rgba(255, 255, 255, 0.7);
+                        letter-spacing: 1.52px;
+
+                        span {
+                            color: #fff;
+                            font-size: 12px;
+                        }
+                    }
+                }
+            }
+
+            .scopeQuantity {
+                letter-spacing: 2px;
+            }
+
+        }
+    }
+}
+
 /deep/.el-table {
    background: rgba(0, 0, 0, 0);