Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/views/Customer/label.vue

@@ -89,6 +89,8 @@
           </span>
         </el-tree>
       </div>
+
+
       <el-dialog title="新增" :visible.sync="dialogFormVisible">
         <div
           v-if="amountintervalname == '意向面积'"
@@ -128,21 +130,21 @@
                 v-if="level == 0"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm.name" autocomplete="off"></el-input>
+                <el-input v-model="addForm.name"  maxlength="20" autocomplete="off"></el-input>
               </el-form-item>
               <el-form-item
                 label="二级名称:"
                 v-if="level == 2"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm.name" autocomplete="off"></el-input>
+                <el-input v-model="addForm.name"  maxlength="20" autocomplete="off"></el-input>
               </el-form-item>
               <el-form-item
                 label="三级名称:"
                 v-if="level == 3"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm.name" autocomplete="off"></el-input>
+                <el-input v-model="addForm.name"  maxlength="20" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -160,6 +162,9 @@
           <el-button type="primary" @click="checkDelete">确 定</el-button>
         </span>
       </el-dialog>
+
+
+
       <!--?编辑弹框?-->
       <el-dialog title="编辑" :visible.sync="isshowage">
         <div
@@ -168,7 +173,7 @@
         >
           <span>面积区间：</span>
           <span style="width: 100px"
-            ><el-input type="number" v-model="frosasd.name"></el-input
+            ><el-input type="number"  v-model="frosasd.name"></el-input
           ></span>
           <span style="margin-left: 6px">平方</span>
           <span style="margin-left: 12px; margin-right: 12px">~</span>
@@ -197,19 +202,11 @@
             类名：
           </div>
           <div>
-            <input
+            <el-input  maxlength="20"
               v-model="frosasd.name"
-              style="
-                width: 280px;
-                height: 30px;
-                line-height: 30px;
-                border-radius: 4px;
-                border: 1px solid #dcdfe6;
-                text-indent: 15px;
-                color: #606266;
-              "
+            
               type="text"
-            />
+            ></el-input>
           </div>
         </div>
 
@@ -255,7 +252,7 @@
                 v-if="level == 0"
                 :label-width="formLabelWidth"
               >
-                <el-input v-model="addForm2.name" autocomplete="off"></el-input>
+                <el-input style="width:300px;" v-model="addForm2.name"  maxlength="20"  autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>

src/views/Receive/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="box-center">
+
     <div class="topbox">
       <div class="topzuo">
           <div class="title" style="display: flex;">
@@ -403,7 +404,11 @@
               </div>
             </div>
           </div>
-          <div v-if="zhixingcenterindex==1" style="padding: 0px 10px 10px 10px;">
+
+
+
+
+          <div id="zxldiv" v-if="zhixingcenterindex==1" style="padding: 0px 10px 10px 10px;">
             <div style="margin-top:10px;" v-for="(item,index) in prohibitedlist" :key="index">{{index+1}}、{{item}}</div>
           </div>
       </div>
@@ -1356,10 +1361,20 @@ export default {
 #zxldiv{
   overflow-y: scroll;
   //  height: 100%;
-  height:calc(100vh - 426px);
+  height:calc(80vh - 242px);
 }
+.center2{
+  padding-left: 10px;
+  padding-right: 10px;
+   width: 100%;
+  //  height: 100%;
+  height:calc(80vh - 258px);
+  overflow-y: scroll;
+}
+
 .box-center {
   width: 100%;
+  height:100%;
   padding: 15px;
   min-width: 1200px;
   padding-bottom: 100px;
@@ -1385,14 +1400,7 @@ export default {
 }
 
 // 播放
-.center2{
-  padding-left: 10px;
-  padding-right: 10px;
-   width: 100%;
-  //  height: 100%;
-  height:calc(100vh - 426px);
-  overflow-y: scroll;
-}
+
 .text {
       width: 100%;
       font-size: 12px;
@@ -1608,6 +1616,7 @@ export default {
 
 .topbox{
   width: 100%;
+  height: 140px;
   display: flex;
   .topzuo{
     width:75% ;

src/views/Statistics/TrendAnalysis.vue

@@ -962,7 +962,8 @@ export default {
         },
         legend: {
           data: ['起始时间','对比时间'],
-            bottom: "10",
+              right: "10",
+          top:'10'
         },
         color:[
           '#2671E2',
@@ -1007,7 +1008,8 @@ export default {
         },
         legend: {
           data: ['起始时间'],
-            bottom: "10",
+              right: "10",
+          top:'10'
         },
         color:[
           '#2671E2',

src/views/Statistics/index.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="box-center" ref="boxcenter">
     <!-- 头 -->
-    <div class="app-titel">
+    <div class="app-top">
+    <div class="app-titel2" style="margin-bottom: 10px">
       <div class="titel-text" v-if="orgType!=3">
-        楼盘选择：
-        <el-select v-model="houseId" filterable @change="houseChange" placeholder="请选择">
+        楼盘选择： </div>
+      <div style="margin-left: 26px">
+          <el-select v-model="houseId" filterable @change="houseChange" placeholder="请选择">
           <el-option
             v-for="item in buildingoptions"
             :key="item.value"
@@ -14,7 +16,10 @@
           </el-option>
         </el-select>
       </div>
-       <div style="text-indent: 30px;">接待时间:</div>
+    </div>
+
+  <div class="app-titel2">
+ <div style="text-indent: 30px;">接待时间:</div>
       <div class="toptimeqhuan">
         <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
           今日
@@ -39,6 +44,8 @@
         >
         </el-date-picker>
       </div>
+  </div>
+
     </div>
 
     <!-- 中间 -->
@@ -408,7 +415,7 @@ export default {
   align-items: center;
   .titel-text {
     height: 100%;
-    font-size: 18px;
+    font-size: 16px;
     font-weight: 600;
     color: #32363d;
     line-height: 70px;
@@ -591,4 +598,43 @@ export default {
   line-height: 20px;
   font-size: 14px;
 }
+.app-top {
+  width: 100%;
+  background: #ffffff;
+  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
+  border-radius: 4px;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  .app-titel2 {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .titel-text {
+    height: 100%;
+    font-size: 16px;
+    font-weight: 600;
+    color: #32363d;
+    text-indent: 30px;
+  }
+  .toptimeqhuan {
+    width: 190px;
+    height: 32px;
+    background: #ffffff;
+    border-radius: 4px;
+    border: 1px solid #e0e0e0;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    margin-left: 20px;
+    cursor: pointer;
+  }
+  .toptimeqhuan div {
+    flex: 1;
+    text-align: center;
+    line-height: 32px;
+    font-size: 14px;
+  }
+}
+}
+
 </style>