Commit 35ecca54 authored by mahui's avatar mahui

init

parent f1a05e3b
...@@ -82,10 +82,12 @@ ...@@ -82,10 +82,12 @@
} }
function mapShow(coordinate, item, callBack) { function mapShow(coordinate, item, callBack) {
const now = Date.now(); const now = Date.now();
let str = `<img src="${item.showImage}" />`; let str = `<div style="width:230px;margin-left: 10px;margin-bottom: 5px">`;
str += `<div style="width:220px;height: 100px;background: url('${item.showImage}') no-repeat 100% center/cover"></div>`;
str += `<p style="font-weight: 700">${item.name}${typeChange(item.type)}</p>`; str += `<p style="font-weight: 700">${item.name}${typeChange(item.type)}</p>`;
str += `<p>位置:${item.address}</p>`; str += `<p>位置:${item.address}</p>`;
str += `<p id="${now}" style="color: #3396fb;cursor: pointer" onclick="">查看详情<span class="icon-4"></span></p>`; str += `<p id="${now}" style="color: #3396fb;cursor: pointer" onclick="">查看详情<span class="icon-4"></span></p>`;
str += `</div>`;
const url = require(`@/assets/img/type-${item.type}.png`); const url = require(`@/assets/img/type-${item.type}.png`);
let myIcon = new BMapGL.Icon(url, new BMapGL.Size(51, 76), { let myIcon = new BMapGL.Icon(url, new BMapGL.Size(51, 76), {
// 指定定位位置。 // 指定定位位置。
...@@ -101,8 +103,6 @@ ...@@ -101,8 +103,6 @@
let marker = new BMapGL.Marker(coordinate, {icon: myIcon}); let marker = new BMapGL.Marker(coordinate, {icon: myIcon});
state.map.addOverlay(marker); // 将标注添加到地图中 state.map.addOverlay(marker); // 将标注添加到地图中
const infoOpts = { const infoOpts = {
width : 235, // 信息窗口宽度
height: 210, // 信息窗口高度
title : '' , // 信息窗口标题 title : '' , // 信息窗口标题
message:"", message:"",
offset:new BMapGL.Size(0, -50) offset:new BMapGL.Size(0, -50)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="body-one base" v-if="tab=='base'"> <div class="body-one base" v-if="tab=='base'">
<div class="poster"> <div class="poster">
<div class="blur-mask" :style="`background-image:url('${detail.showImage}')`"></div> <div class="blur-mask" :style="`background-image:url('${detail.showImage}')`"></div>
<div class="banner"> <div class="banner" v-if="showBanner">
<el-carousel :interval="5000" arrow="never" style="height: 480px;" <el-carousel :interval="5000" arrow="never" style="height: 480px;"
@change="(val)=>{detail.index=val}"> @change="(val)=>{detail.index=val}">
<el-carousel-item style="height: 480px;" v-for="item in detail.poster" :key="item"> <el-carousel-item style="height: 480px;" v-for="item in detail.poster" :key="item">
...@@ -249,6 +249,7 @@ ...@@ -249,6 +249,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="logo">@浙江丹靓环境工程有限公司</div>
<transition name="el-zoom-in-bottom"> <transition name="el-zoom-in-bottom">
<order-detail v-model="show" v-if="show" :order_id="order_id"></order-detail> <order-detail v-model="show" v-if="show" :order_id="order_id"></order-detail>
</transition> </transition>
...@@ -284,6 +285,7 @@ ...@@ -284,6 +285,7 @@
yewei:0.7, yewei:0.7,
type:1 type:1
}, },
showBanner:false,
tabs: [ tabs: [
{ {
name: '点位基本信息', name: '点位基本信息',
...@@ -415,6 +417,9 @@ ...@@ -415,6 +417,9 @@
if(res.data.image){ if(res.data.image){
state.detail.poster = res.data.image.split(',') state.detail.poster = res.data.image.split(',')
} }
nextTick(()=>{
state.showBanner = true;
})
Object.assign(state.detail,{...res.data}); Object.assign(state.detail,{...res.data});
if(state.detail.type==1){ if(state.detail.type==1){
state.tabs.find(one=>one.value=='process').show = true; state.tabs.find(one=>one.value=='process').show = true;
...@@ -700,7 +705,7 @@ ...@@ -700,7 +705,7 @@
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
background-color: #ebedef; background-color: #ebedef;
padding: 20px; padding: 20px 20px 0 20px;
.body-one { .body-one {
flex: 1; flex: 1;
...@@ -1031,6 +1036,13 @@ ...@@ -1031,6 +1036,13 @@
} }
} }
} }
.logo{
padding: 10px 20px;
background-color: #ebedef;
font-size: 12px;
text-align: right;
color: #777;
}
} }
</style> </style>
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<el-row :class="[isShadowBg?'shadowBg':'']" @click="changeShadow()" /> <el-row :class="[isShadowBg?'shadowBg':'']" @click="changeShadow()" />
<el-aside class="main-cont main-left"> <el-aside class="main-cont main-left">
<div class="tilte" :style="{background: backgroundColor}"> <div class="tilte" :style="{background: backgroundColor}">
<img alt class="logoimg" :src="$GIN_VUE_ADMIN.appLogo"> <!--<img alt class="logoimg" :src="$GIN_VUE_ADMIN.appLogo">-->
<div v-if="isSider" class="tit-text" :style="{color:textColor}">{{ $GIN_VUE_ADMIN.appName }}</div> <div v-if="isSider" class="tit-text" :style="{color:textColor}">公厕监管后台</div>
</div> </div>
<Aside class="aside" /> <Aside class="aside" />
</el-aside> </el-aside>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</el-col> </el-col>
<el-col :xs="12" :lg="9" :md="9" :sm="14" :xl="9"> <el-col :xs="12" :lg="9" :md="9" :sm="14" :xl="9">
<div class="right-box"> <div class="right-box">
<Search /> <!--<Search />-->
<el-dropdown> <el-dropdown>
<div class="dp-flex justify-content-center align-items height-full width-full"> <div class="dp-flex justify-content-center align-items height-full width-full">
<span class="header-avatar" style="cursor: pointer"> <span class="header-avatar" style="cursor: pointer">
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="login_panel"> <div class="login_panel">
<div class="login_panel_form"> <div class="login_panel_form">
<div class="login_panel_form_title"> <div class="login_panel_form_title">
<img <!--<img-->
class="login_panel_form_title_logo" <!--class="login_panel_form_title_logo"-->
:src="$GIN_VUE_ADMIN.appLogo" <!--:src="$GIN_VUE_ADMIN.appLogo"-->
alt <!--alt-->
> <!--&gt;-->
<p class="login_panel_form_title_p">{{ $GIN_VUE_ADMIN.appName }}</p> <p class="login_panel_form_title_p">公厕监管后台</p>
</div> </div>
<el-form <el-form
ref="loginForm" ref="loginForm"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment