1.代码格式优化
parent
c0667c8b46
commit
290c566c73
|
@ -10,10 +10,12 @@
|
||||||
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
|
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
|
||||||
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
||||||
|
|
||||||
|
<script type="text/javascript" src="static/jswebrtc.min.js"></script>
|
||||||
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
||||||
<script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>
|
<script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>
|
||||||
<script type="text/javascript" src="./static/map/cesium91/CustomCesiumSDK.js"></script>
|
<script type="text/javascript" src="./static/map/cesium91/CustomCesiumSDK.js"></script>
|
||||||
<link href="./static/map/cesium91/CesiumUnminified/Widgets/widgets.css" rel="stylesheet"/>
|
<link href="./static/map/cesium91/CesiumUnminified/Widgets/widgets.css" rel="stylesheet"/>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
@ -24,7 +24,6 @@ router.beforeEach((to, from, next) => {
|
||||||
router.addRoutes(accessRoutes)
|
router.addRoutes(accessRoutes)
|
||||||
next({ ...to, replace: true })
|
next({ ...to, replace: true })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.info(error)
|
|
||||||
next(`/login`)
|
next(`/login`)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -37,7 +36,6 @@ router.beforeEach((to, from, next) => {
|
||||||
router.addRoutes(accessRoutes)
|
router.addRoutes(accessRoutes)
|
||||||
next({ ...to, replace: true })
|
next({ ...to, replace: true })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.info(error)
|
|
||||||
next(`/login`)
|
next(`/login`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
* @returns {Boolean}
|
* @returns {Boolean}
|
||||||
*/
|
*/
|
||||||
export function validText(str) {
|
export function validText(str) {
|
||||||
|
|
||||||
if (str.trim().length < 1) {
|
if (str.trim().length < 1) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,21 +9,22 @@
|
||||||
<windspeedstation v-if="type === '2da29f00852a4653ba3e760b9de57412'" :id="id" :type="type" :gangkou="gangkou"/>
|
<windspeedstation v-if="type === '2da29f00852a4653ba3e760b9de57412'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
|
<xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
|
<xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'|| type ==='PERSON_MACHINE'|| type ==='CAR_MACHINE' "
|
<mk-gate-machine
|
||||||
:id="id"
|
v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'|| type ==='PERSON_MACHINE'|| type ==='CAR_MACHINE' "
|
||||||
:type="type"
|
:id="id"
|
||||||
:gangkou="gangkou"
|
:type="type"
|
||||||
:corp-id="corpInfoId"
|
:gangkou="gangkou"
|
||||||
:gate-video-id="GATE_VIDEO_ID"
|
:corp-id="corpInfoId"
|
||||||
:code = "code"
|
:gate-video-id="GATE_VIDEO_ID"
|
||||||
:video-type="videoType"
|
:code = "code"
|
||||||
:name = "name" />
|
:video-type="videoType"
|
||||||
|
:name = "name" />
|
||||||
<mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
|
<mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
|
||||||
<zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
|
<zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/>
|
<video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/>
|
||||||
<video-play-cfd v-if="type === 'CAMERA00004' || type === 'platcamera00004'" :id="id" :type="type" :gangkou="gangkou"/>
|
<video-play-cfd v-if="type === 'CAMERA00004' || type === 'platcamera00004'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou"/>
|
<video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<!--秦港一公司 边界入侵 详细页面 start-->
|
<!--秦港一公司 边界入侵 详细页面 start-->
|
||||||
<video-play-bianjieruqin v-if="type === 'bianjieruqin'" :id="id" :type="type" :gangkou="gangkou"/>
|
<video-play-bianjieruqin v-if="type === 'bianjieruqin'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<!--秦港一公司 边界入侵 详细页面 end-->
|
<!--秦港一公司 边界入侵 详细页面 end-->
|
||||||
<!--秦港一公司 八项作业 详细页面 start-->
|
<!--秦港一公司 八项作业 详细页面 start-->
|
||||||
|
|
|
@ -59,20 +59,22 @@
|
||||||
<div v-if= "type !== 'CAMERA'" class="level-title">
|
<div v-if= "type !== 'CAMERA'" class="level-title">
|
||||||
<h1>区域名称:{{ info.GATE_AREA_NAME }}</h1>
|
<h1>区域名称:{{ info.GATE_AREA_NAME }}</h1>
|
||||||
</div>
|
</div>
|
||||||
<table v-for="(item,index) in varList" v-if= "type !== 'CAMERA'" :key="index" class="table-ui">
|
<div v-if= "type !== 'CAMERA'" >
|
||||||
<tr>
|
<table v-for="(item,index) in varList" :key="index" class="table-ui">
|
||||||
<td class="bbg-transparent">闸机名称</td>
|
<tr>
|
||||||
<td colspan="5">{{ item.GATE_NAME }}</td>
|
<td class="bbg-transparent">闸机名称</td>
|
||||||
</tr>
|
<td colspan="5">{{ item.GATE_NAME }}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td class="bbg-transparent">今日进</td>
|
<tr>
|
||||||
<td width="80px">{{ item.CAR_IN }}</td>
|
<td class="bbg-transparent">今日进</td>
|
||||||
<td class="bbg-transparent">今日出</td>
|
<td width="80px">{{ item.CAR_IN }}</td>
|
||||||
<td width="80px">{{ item.CAR_OUT }}</td>
|
<td class="bbg-transparent">今日出</td>
|
||||||
<td class="bbg-transparent">当前滞留</td>
|
<td width="80px">{{ item.CAR_OUT }}</td>
|
||||||
<td width="80px">{{ item.CAR_IN - item.CAR_OUT }}</td>
|
<td class="bbg-transparent">当前滞留</td>
|
||||||
</tr>
|
<td width="80px">{{ item.CAR_IN - item.CAR_OUT }}</td>
|
||||||
</table>
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
<table v-if= "type != 'CAMERA'" class="table-ui">
|
<table v-if= "type != 'CAMERA'" class="table-ui">
|
||||||
<tr v-if="carRecordAllList != null && carRecordAllList.length > 0">
|
<tr v-if="carRecordAllList != null && carRecordAllList.length > 0">
|
||||||
<td colspan="6">
|
<td colspan="6">
|
||||||
|
|
|
@ -126,7 +126,6 @@ export default {
|
||||||
this.ImgList = data.ImgList
|
this.ImgList = data.ImgList
|
||||||
this.measuresList = data.varList
|
this.measuresList = data.varList
|
||||||
this.gongdanList = data.data
|
this.gongdanList = data.data
|
||||||
|
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -347,7 +347,6 @@ export default {
|
||||||
},
|
},
|
||||||
// 完成
|
// 完成
|
||||||
subCanvas(img64) {
|
subCanvas(img64) {
|
||||||
|
|
||||||
this.form.INSPECTED_SITEUSER_SIGN_IMG = img64
|
this.form.INSPECTED_SITEUSER_SIGN_IMG = img64
|
||||||
this.$set(this.form, 'INSPECTED_SITEUSER_SIGN_TIME', formatDate(new Date(), 'YYYY-MM-DD HH:mm'))
|
this.$set(this.form, 'INSPECTED_SITEUSER_SIGN_TIME', formatDate(new Date(), 'YYYY-MM-DD HH:mm'))
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<link rel="stylesheet" type="text/css" href="./css/style.css" />
|
<link rel="stylesheet" type="text/css" href="./css/style.css" />
|
||||||
<link rel="stylesheet" href="./swiper-master/package/swiper-bundle.min.css">
|
<link rel="stylesheet" href="./swiper-master/package/swiper-bundle.min.css">
|
||||||
<script src="./js/vue.js"></script>
|
<script src="./js/vue.js"></script>
|
||||||
<script type="text/javascript" src="./js/jquery-3.3.1.min.js"></script>
|
<script type="text/javascript" src="./js/jquery-3.7.1.min.js"></script>
|
||||||
<script src="../config.js"></script>
|
<script src="../config.js"></script>
|
||||||
<script src="./js/sweetalert.min.js"></script>
|
<script src="./js/sweetalert.min.js"></script>
|
||||||
<script src="./js/ezuikit.js"></script>
|
<script src="./js/ezuikit.js"></script>
|
||||||
|
|
Loading…
Reference in New Issue