#add message
This commit is contained in:
parent
faed03e6cd
commit
f053d9cc13
|
|
@ -17329,9 +17329,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"v-viewer": {
|
||||
"version": "1.5.1",
|
||||
"resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.5.1.tgz",
|
||||
"integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==",
|
||||
"version": "1.6.3",
|
||||
"resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.6.3.tgz",
|
||||
"integrity": "sha512-W45FU18rO6ZiID4CS+DdsZJ7m5CXSxV0Js9O9E/+THWk4PqILUzFUPUndJ6vMf0IKymvQmyvwRXawCMDxGCzcQ==",
|
||||
"requires": {
|
||||
"throttle-debounce": "^2.0.1",
|
||||
"viewerjs": "^1.5.0"
|
||||
|
|
@ -17384,9 +17384,9 @@
|
|||
}
|
||||
},
|
||||
"viewerjs": {
|
||||
"version": "1.6.2",
|
||||
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.6.2.tgz",
|
||||
"integrity": "sha512-EHepcPFz2YOv0wOKMUU7JwcUGdF3EmTH8A4owYeNPCM1t5XuE7ePelACY8ltWvh6O2yPOdJ9CI3T6m04RjsmpQ=="
|
||||
"version": "1.10.0",
|
||||
"resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.10.0.tgz",
|
||||
"integrity": "sha512-013z8sU9tnAFDfJo4p8z38sqnj1GwRXzlawwbY4oXQMr6lCRMG9TXJ7fyXgVL1jFXyCwkb6xGVJRj6+gfQ2o8A=="
|
||||
},
|
||||
"vm-browserify": {
|
||||
"version": "1.1.2",
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
"gcoord": "^0.2.3",
|
||||
"jquery": "^3.5.1",
|
||||
"ol": "^6.3.1",
|
||||
"v-viewer": "^1.5.1",
|
||||
"v-viewer": "^1.6.3",
|
||||
"vue": "^2.6.11",
|
||||
"vue-router": "^3.0.7",
|
||||
"vuex": "^3.1.2"
|
||||
|
|
|
|||
23
src/main.js
23
src/main.js
|
|
@ -8,12 +8,35 @@ import ElementUI from 'element-ui'
|
|||
import 'element-ui/lib/theme-chalk/index.css'
|
||||
import echarts from 'echarts'
|
||||
import IPconfig from '../IPconfig.js'
|
||||
import Viewer from 'v-viewer'
|
||||
Vue.prototype.GLOBAL = IPconfig
|
||||
Vue.config.productionTip = false
|
||||
Vue.prototype.axios = axios
|
||||
Vue.use(ElementUI)
|
||||
Vue.use(Vuex)
|
||||
Vue.use(echarts)
|
||||
Vue.use(Viewer)
|
||||
Viewer.setDefaults({
|
||||
zIndexInline: 9999,
|
||||
Options: {
|
||||
inline: true,
|
||||
button: true,
|
||||
navbar: false,
|
||||
title: true,
|
||||
toolbar: false,
|
||||
tooltip: true,
|
||||
movable: false,
|
||||
zoomable: true,
|
||||
rotatable: false,
|
||||
scalable: false,
|
||||
transition: true,
|
||||
fullscreen: true,
|
||||
keyboard: false,
|
||||
minZoomRatio: 0.15,
|
||||
url: 'data-source'
|
||||
|
||||
}
|
||||
})
|
||||
new Vue({
|
||||
store,
|
||||
router,
|
||||
|
|
|
|||
|
|
@ -639,6 +639,14 @@ const routes = [
|
|||
meta: {
|
||||
requireAuth: true
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/scenephotos/reveal',
|
||||
name: 'scenephotosreveal',
|
||||
component: () => import(/* webpackChunkName: "about" */ '../views/reveal/AccessoryReveal'),
|
||||
meta: {
|
||||
requireAuth: true
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="现场照片" width="95">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ scope.row.resultsaccessory }}</span><span style="margin-left: 5px" @click="Scenephotos(scope.row.findingscode)" class="plus"><i class="el-icon-circle-plus"></i></span>
|
||||
<span style="margin-left: 10px">{{ scope.row.resultsaccessory }}</span><span style="margin-left: 5px" @click="ScenephotosReveal(scope.row.findingscode)"><i class="el-icon-view"></i></span><span style="margin-left: 5px" @click="Scenephotos(scope.row.findingscode)"><i class="el-icon-circle-plus"></i></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数据完备指数" width="115" >
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
<span style="margin-left: 40%;">{{ scope.row.index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="附件" width="80">
|
||||
<el-table-column label="附件" width="95">
|
||||
<template slot-scope="scope">
|
||||
<span style="margin-left: 10px">{{ scope.row.resultsscenephoto }}</span><span style="margin-left: 5px" @click="Enclosure(scope.row.findingscode)" class="plus"><i class="el-icon-circle-plus"></i></span>
|
||||
</template>
|
||||
|
|
@ -417,6 +417,15 @@ export default {
|
|||
}
|
||||
})
|
||||
},
|
||||
ScenephotosReveal (findingscode) {
|
||||
var _this = this
|
||||
_this.$router.push({
|
||||
path: '/scenephotos/reveal',
|
||||
query: {
|
||||
findingscode: findingscode
|
||||
}
|
||||
})
|
||||
},
|
||||
// 附件
|
||||
Enclosure (findingscode) {
|
||||
var _this = this
|
||||
|
|
|
|||
|
|
@ -0,0 +1,427 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-row>
|
||||
<div><Headernew></Headernew></div>
|
||||
<el-col :xs="16" :sm="16" :md="16" :lg="16" :xl="16" :offset="4">
|
||||
<div class="breadcrumb">
|
||||
<el-breadcrumb separator-class="el-icon-arrow-right">
|
||||
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
|
||||
<el-breadcrumb-item>数据展示</el-breadcrumb-item>
|
||||
<el-breadcrumb-item>现场照片</el-breadcrumb-item>
|
||||
</el-breadcrumb>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :xs="16" :sm="16" :md="16" :lg="16" :xl="16" :offset="4" class="gis" style="margin-top: 20px">
|
||||
<viewer :images='res'>
|
||||
<img v-for='(src,index) in res' :src="src" :key="index" :v-if="index>0">
|
||||
</viewer>
|
||||
<button type="button" @click="show">Click to show</button>
|
||||
</el-col>
|
||||
<Footer></Footer>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import axios from 'axios'
|
||||
import Headernew from '../../../src/components/Headernew.vue'
|
||||
import Footer from '../../../src/components/Footer.vue'
|
||||
import 'viewerjs/dist/viewer.css'
|
||||
export default {
|
||||
components: {
|
||||
// Header
|
||||
Headernew,
|
||||
Footer
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
res: '',
|
||||
findingscode: this.$route.query.findingscode
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
var _this = this
|
||||
axios({
|
||||
method: 'get',
|
||||
url: this.GLOBAL.baseURL + '/display/scene/photo/reveal/?findingscode=' + _this.findingscode
|
||||
}).then(function (response) {
|
||||
_this.res = response.data.res
|
||||
}).catch(function (error) {
|
||||
console.log(error)
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
show () {
|
||||
this.$viewerApi({
|
||||
images: this.images
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.box{
|
||||
width: 80%;
|
||||
background-color: #f5f5f5;
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
|
||||
min-height: 800px;
|
||||
}
|
||||
.list{
|
||||
width: 1200px;
|
||||
height: 800px;
|
||||
margin: 0 auto;
|
||||
margin-top: 30px;
|
||||
}
|
||||
.el-table__body-wrapper .is-scrolling-middle{
|
||||
height: 800px;
|
||||
/*max-height: 800px !important;*/
|
||||
}
|
||||
.breadcrumb{
|
||||
margin-top: 70px;
|
||||
}
|
||||
.title{
|
||||
margin-top: 20px;
|
||||
font-size: 20px;
|
||||
text-align: left;
|
||||
margin-left: 10%;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
#map {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
text-align: center
|
||||
}
|
||||
.el-table-column {
|
||||
cursor: pointer;
|
||||
}
|
||||
.el-table td .el-table_2_column_6 .cell{
|
||||
font-style: italic!important;
|
||||
}
|
||||
.topimg {
|
||||
/*position: absolute;*/
|
||||
/*left: 0;*/
|
||||
/*top: 40px;*/
|
||||
/*width: 1366px;*/
|
||||
background: url("../../../public/static/image/TOP.jpg") no-repeat ;
|
||||
margin-top: 40px;
|
||||
}
|
||||
.bottomdiv{
|
||||
/*width: 1366px;*/
|
||||
height: auto;
|
||||
background-color: rgba(229,229,229,0.3);
|
||||
/*background-color: red;*/
|
||||
/*position: absolute;*/
|
||||
/*left: 100px;*/
|
||||
/*top: 200px;*/
|
||||
}
|
||||
.bottomdiv2{
|
||||
/*width: 1366px;*/
|
||||
height: auto;
|
||||
background-color: rgba(229,229,229,0.3);
|
||||
/*background-color: red;*/
|
||||
/*position: absolute;*/
|
||||
/*left: 100px;*/
|
||||
/*top: 600px;*/
|
||||
/*margin-bottom: 100px;*/
|
||||
}
|
||||
.bottomleft{
|
||||
width: 250px;
|
||||
height: 446px;
|
||||
border: 1px solid #DDDDDD;
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
}
|
||||
.numlefttop {
|
||||
width: 100%;
|
||||
height: 46px;
|
||||
font-size: 14px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
color: white;
|
||||
background-color: #26c3e4;
|
||||
line-height: 46px;
|
||||
}
|
||||
.numleft {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
border-top: 1px solid #DDDDDD;
|
||||
box-sizing: border-box;
|
||||
line-height: 40px;
|
||||
font-size: 14px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
/*color: #26c3e4;*/
|
||||
position: relative;
|
||||
}
|
||||
.numnum1 {
|
||||
font-size: 14px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
color: #26c3e4;
|
||||
position: absolute;
|
||||
left: 50px;
|
||||
}
|
||||
.numnum2 {
|
||||
font-size: 14px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
color: #666666;
|
||||
position: absolute;
|
||||
right: 50px;
|
||||
}
|
||||
.bottomright1 {
|
||||
width: 905px;
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
right: 160px;
|
||||
top: 600px;
|
||||
border: 1px solid #DDDDDD;
|
||||
}
|
||||
.bottomright2 {
|
||||
width: 905px;
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
right: 160px;
|
||||
/*top: 200px;*/
|
||||
border: 1px solid #DDDDDD;
|
||||
}
|
||||
.tablehead1 {
|
||||
width: 100%;
|
||||
height: 46px;
|
||||
background-color: #f9e7b7;
|
||||
color: #999999;
|
||||
line-height: 46px;
|
||||
text-align: left;
|
||||
padding-left: 60px;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
margin-top: 20px;
|
||||
}
|
||||
.tablehead2 {
|
||||
width: 100%;
|
||||
height: 46px;
|
||||
background-color: #f9e7b7;
|
||||
color: #999999;
|
||||
line-height: 46px;
|
||||
text-align: left;
|
||||
padding-left: 60px;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
margin-top: 20px;
|
||||
}
|
||||
.copyright {
|
||||
width: 100%;
|
||||
height: 110px;
|
||||
font-family: "微软雅黑 Light";
|
||||
font-size: 12px;
|
||||
position: absolute;
|
||||
bottom: -1360px;
|
||||
border-top: 1px solid #EFEFEF;
|
||||
}
|
||||
.coco {
|
||||
padding-top: 30px;
|
||||
}
|
||||
.coco2 {
|
||||
padding-top: 10px;
|
||||
}
|
||||
.gis {
|
||||
/*width: 100%;*/
|
||||
height: 600px;
|
||||
/*background-color: rgba(229,229,229,0.1);*/
|
||||
background-color: #f3f6fb;
|
||||
/*position: relative;*/
|
||||
}
|
||||
.realgis {
|
||||
/*width: 760px;*/
|
||||
height: 600px;
|
||||
border: 8px solid #E9F3FD;
|
||||
/*position: relative;*/
|
||||
/*top: -570px;*/
|
||||
/*left: -472px;*/
|
||||
}
|
||||
.bluebackground {
|
||||
width: 1200px;
|
||||
height: 362px;
|
||||
/*background: url("../../../public/static/image/background.jpg") no-repeat ;*/
|
||||
background: url("../../../public/static/image/yellow.jpg") no-repeat ;
|
||||
position: absolute;
|
||||
left: 100px;
|
||||
bottom: 56px;
|
||||
z-index: 0;
|
||||
}
|
||||
.echarts {
|
||||
/*width: 100%;*/
|
||||
height: 710px;
|
||||
background-color: #f3f6fb;
|
||||
position: relative;
|
||||
}
|
||||
.echarttitle {
|
||||
width: 100%;
|
||||
height: 70px;
|
||||
border-bottom: 1px solid #ffffff;
|
||||
/*text-align: left;*/
|
||||
/*position: absolute;*/
|
||||
}
|
||||
.echarttitle2 {
|
||||
/*border-bottom: 1px solid #ffffff;*/
|
||||
/*text-align: left;*/
|
||||
width: 300px;
|
||||
position: absolute;
|
||||
left: 693px;
|
||||
}
|
||||
.ecshujv {
|
||||
font-size: 24px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
color: #706f6f;
|
||||
position: absolute;
|
||||
top: 30px;
|
||||
left: 120px;
|
||||
margin: 0;
|
||||
}
|
||||
.echdata {
|
||||
position: absolute;
|
||||
left: 120px;
|
||||
top: 72px;
|
||||
font-size: 18px;
|
||||
font-family: "微软雅黑 Light";
|
||||
color: #979797;
|
||||
}
|
||||
.echdata2 {
|
||||
position: absolute;
|
||||
left: 813px;
|
||||
top: 72px;
|
||||
font-size: 18px;
|
||||
font-family: "微软雅黑 Light";
|
||||
color: #979797;
|
||||
}
|
||||
.realecharta {
|
||||
/*position: absolute;*/
|
||||
/*left: 100px;*/
|
||||
/*top: 120px;*/
|
||||
/*width: 1200px;*/
|
||||
height: 540px;
|
||||
/*border: 1px solid;*/
|
||||
background-color: #ffffff;
|
||||
margin-top: 60px;
|
||||
}
|
||||
.echarts1a {
|
||||
/*width: 500px;*/
|
||||
height: 500px;
|
||||
margin-top: 40px;
|
||||
background-color: #ffffff;
|
||||
display: inline-block;
|
||||
}
|
||||
.echarts2a {
|
||||
/*width: 600px;*/
|
||||
height: 500px;
|
||||
/*position: absolute;*/
|
||||
/*top: 0;*/
|
||||
/*right: 0;*/
|
||||
z-index: 99;
|
||||
background-color: #ffffff;
|
||||
display: inline-block;
|
||||
background: url("../../../public/static/image/echBG.jpg") no-repeat right top;
|
||||
}
|
||||
.gisname {
|
||||
width: 257px;
|
||||
text-align: left;
|
||||
font-size: 26px;
|
||||
font-family: "微软雅黑 Regular";
|
||||
color: #706f6f;
|
||||
position: absolute;
|
||||
top: 40px;
|
||||
left: 40px;
|
||||
opacity: 0.7;
|
||||
border-bottom: 2px solid #DFEFFC;
|
||||
}
|
||||
.middleshape {
|
||||
width: 13px;
|
||||
height: 540px;
|
||||
background-color: #f3f6fb;
|
||||
position: absolute;
|
||||
left: 500px;
|
||||
bottom: 0;
|
||||
z-index: 99;
|
||||
}
|
||||
.newtit{
|
||||
position: absolute;
|
||||
top: 158px;
|
||||
left: 448px;
|
||||
font-size: 40px;
|
||||
z-index: 99;
|
||||
color: #eeb975;
|
||||
font-family: "微软雅黑 Regular";
|
||||
font-weight: bold;
|
||||
}
|
||||
.gisleft {
|
||||
height: 600px;
|
||||
/*margin-top: 8px;*/
|
||||
background-color: #ffffff;
|
||||
border-top: 8px solid #E9F3FD;
|
||||
border-bottom: 8px solid #E9F3FD;
|
||||
}
|
||||
#g1 {
|
||||
margin-top: 40px;
|
||||
border-top: 1px solid #EBECF1;
|
||||
}
|
||||
.gisblue {
|
||||
width: 8px;
|
||||
height: 100%;
|
||||
background-color: #93B4FB;
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
border-radius: 2px;
|
||||
}
|
||||
.gisclick {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
border-bottom: 1px solid #EBECF1;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
}
|
||||
.ol-popup{
|
||||
z-index: 999;
|
||||
width: 180px;
|
||||
height: 100px;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.ol-popup-closer {
|
||||
text-decoration: none;
|
||||
position: absolute;
|
||||
top: -1px;
|
||||
right: -10%;
|
||||
}
|
||||
|
||||
.ol-popup-closer:after {
|
||||
color: black;
|
||||
content: "✖";
|
||||
}
|
||||
|
||||
.ol-control {
|
||||
display: none;
|
||||
}
|
||||
#popup-content{
|
||||
background-color: rgba(253, 240, 205, 0.8)
|
||||
}
|
||||
.legend {
|
||||
position: absolute;
|
||||
top: 732px;
|
||||
left: 560px;
|
||||
opacity: 0.6;
|
||||
z-index: 999;
|
||||
}
|
||||
.el-tabs--left .el-tabs__header.is-left {
|
||||
margin-right: 0;
|
||||
width: 100%;
|
||||
}
|
||||
.el-tabs__item {
|
||||
padding: 0;
|
||||
padding-right: 10px;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue