Commit abbc0ce0 authored by 仇晓婷's avatar 仇晓婷

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents f66e689d 5f623415
<template> <template>
<div class="bm-lid"> <div class="bm-lid">
<div class="ad"> <div class="ad">
<FormRow></FormRow> <FormRow></FormRow>
<!-- <div class="count"> <!-- <div class="count">
<label>配属数量(列)</label> <label>配属数量(列)</label>
...@@ -120,11 +119,10 @@ export default { ...@@ -120,11 +119,10 @@ export default {
BmMarker, BmMarker,
BmInfoWindow, BmInfoWindow,
Menu, Menu,
FormRow FormRow,
}, },
data() { data() {
return { return {
center: { lng: 0, lat: 0 }, center: { lng: 0, lat: 0 },
marker: { marker: {
name: "北京", name: "北京",
...@@ -286,17 +284,22 @@ export default { ...@@ -286,17 +284,22 @@ export default {
height: calc(100vh - 100px); height: calc(100vh - 100px);
.ad { .ad {
position: absolute; position: absolute;
width: 98%; width: 100%;
left: 20px; left: 0;
top: 40px; right: 0;
border-radius: 5px; top: 10px;
height: 60px;
text-align: center; text-align: center;
z-index: 3; z-index: 3;
height: 100px; // height: 60px;
line-height: 100px; // padding: 0 150px;
background: white; // line-height: 60px;
.form-row { .form-row {
margin: 30px 160px; margin: 10px auto;
width: 80%;
border-radius: 5px;
background: white;
padding: 20px 40px 0 40px;
} }
// color: white; // color: white;
// .count { // .count {
...@@ -322,11 +325,11 @@ export default { ...@@ -322,11 +325,11 @@ export default {
// } // }
} }
.menu { .menu {
position: absolute; position: absolute;
width: 240px; width: 240px;
height: 700px; height: 700px;
background: white; background: white;
border-radius: 5px; border-radius: 5px;
bottom: 15px; bottom: 15px;
left: 20px; left: 20px;
z-index: 4; z-index: 4;
......
<template> <template>
<div class="mane-b"> <div class="form-row">
<Form ref="formInline" :model="formInline" class="form-row"> <Form ref="formInline" :model="formInline">
<Row :gutter="16"> <Row :gutter="16">
<Col span="4"> <Col span="4">
<FormItem prop="name"> <FormItem prop="name">
......
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