提交修改

src/views/Equipment/equipmentDetailList.vue

@@ -596,7 +596,7 @@ export default {
       flag: false,
       page: {
         pageNum: 1,
-        pageSize: 30,
+        pageSize: 10,
         openTime: "",
         closeTime: "",
         houseName: "",
@@ -1581,9 +1581,8 @@ export default {
 <style lang='less' scoped>
 .box-center {
   width: 100%;
-  padding: 20px 15px;
+  padding: 5px 15px 20px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .toptimeqhuan {
@@ -1638,8 +1637,8 @@ export default {
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 8px;
-  margin-top: 20px;
-  padding: 18px;
+  margin-top: 15px;
+  padding: 15px;
 }
 
 .kapiannox {

src/views/Equipment/equipmentOnlineRecordList.vue

@@ -63,13 +63,13 @@
       >
         <span style="line-height: 40px" class="demonstration">领用人：</span>
         <div style="width: 200px">
-          <el-input maxlength="10" clearable v-model="page.accountName"></el-input>
+          <el-input maxlength="10" clearable placeholder="领用人" v-model="page.accountName"></el-input>
         </div>
         <span class="demonstration"  style="margin-left: 18px; line-height: 40px"
           >设备编号：</span
         >
         <div style="width: 200px">
-          <el-input maxlength="20" clearable v-model="page.imei"></el-input>
+          <el-input maxlength="20" placeholder="设备编号" clearable v-model="page.imei"></el-input>
         </div>
       </div>
       <div
@@ -97,7 +97,7 @@
     </div>
     <div class="tablebox" v-if="activeTotal == 0">
       <template>
-        <el-table :data="tableData" style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
+        <el-table :data="tableData" style="width: 100%"  :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
           <el-table-column prop="index" label="序号" width="100" align="center">
           </el-table-column>
           <el-table-column prop="imei" label="设备编号" align="center">
@@ -226,7 +226,7 @@
     </div>
     <div class="tablebox" v-if="activeTotal == 1">
       <template>
-        <el-table :data="tableData" style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
+        <el-table :data="tableData" style="width: 100%"  :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
           <el-table-column prop="index" label="序号" width="100" align="center">
           </el-table-column>
           <el-table-column prop="imei" label="设备编号" align="center">
@@ -297,7 +297,7 @@ export default {
       flag: false,
       page: {
         pageNum: 1,
-        pageSize: 30,
+        pageSize: 10,
         openTime: "",
         closeTime: "",
         houseName: "",

src/views/Scheduling/index.vue

@@ -22,7 +22,7 @@
         </div>
         <div class="label">顾问名：</div>
         <div>
-          <el-input maxlength="10" clearable v-model="name"></el-input>
+          <el-input maxlength="10" placeholder="顾问名" clearable v-model="name"></el-input>
         </div>
         <div class="label">工作状态：</div>
         <div>
@@ -644,9 +644,8 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 5px 15px 20px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 .cen-tab {
   width: 100%;

src/views/Statistics/BuildingContrast.vue

@@ -713,14 +713,14 @@ export default {
   position: fixed;    
   box-shadow: 0px 0px 10px 0px #dadada;
   z-index: 999;
-  margin-top: -16px;
+  margin-top: -10px;
 
   .titel-text {
     height: 100%;
-    font-size: 18px;
+    font-size: 16px;
     color: #32363d;
     line-height: 70px;
-    margin-left: 30px;
+    margin-left: 15px;
   }
 
   .toptimeqhuan {

src/views/Statistics/ConsultantBrand.vue

@@ -113,7 +113,7 @@
           <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
         </div>
       </div>
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%"  height="640">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             {{
@@ -650,7 +650,7 @@ export default {
       dateType: 2,
       tabFlag: 0,
       current: 1,
-      size: 30,
+      size: 10,
       total: 20,
       customtime: [],
       tablist: [],
@@ -1127,13 +1127,12 @@ export default {
     }
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 20px 15px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 .cen-tab {
   width: 100%;
-  padding: 15px;
+  padding: 0 15px 15px;
   background: #ffffff;
   margin-top: 15px;
 }

src/views/Statistics/MentoringAbility.vue

@@ -114,7 +114,7 @@
       </div>
     </div>
 
-    <div :style="{'margin-top':role != 3?'170px':'120px'}" v-if="consultantlistid">
+    <div :style="{'margin-top':role != 3?'150px':'110px'}" v-if="consultantlistid">
       <div class="app-box-san">
         <div class="zuo">
           <div class="title">
@@ -291,7 +291,7 @@
           </div>
         </div>
         <div style="padding:10px;background: #fff;">
-        <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
+        <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
           <el-table-column prop="statDate" label="日期" align="center">
             <template slot-scope="scope">
               {{
@@ -427,7 +427,7 @@ export default {
       customtime: [],
       tableData: [],
       current: 1,
-      size: 30,
+      size: 10,
       total: 20,
       statDateStart: "",
       statDateEnd: "",
@@ -1210,15 +1210,13 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 20px 15px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 .cen-tab {
   width: 99%;
-  // padding: 15px;
-  // background: #ffffff;
   margin-top: 15px;
+  padding-bottom: 15px;
 }
 .tophove {
   color: #ffffff;

src/views/Statistics/ReceptionOverview.vue

@@ -2057,7 +2057,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
-  margin-top: 110px;
+  margin-top: 100px;
   padding: 15px;
 }
 
@@ -2111,7 +2111,7 @@ export default {
   position: fixed;
   z-index: 999;
   box-shadow: 0px 0px 10px 0px #dadada;
-  margin-top: -16px;
+  margin-top: -10px;
 }
 
 .app-titel {

src/views/Statistics/ReceptionStatistical.vue

@@ -21,7 +21,7 @@
         </div>
       </div>
       <div class="app-titel">
-        <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
+        <div style="text-indent: 30px;">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
             近7天
@@ -236,7 +236,6 @@
     <el-dialog title="详情" :visible.sync="dialogVisible" width="80%">
       <div class="cen-tab">
         <el-table
-          max-height="300"
           :data="detailData"
           stripe
           style="width: 100%"
@@ -332,9 +331,9 @@ export default {
       current: 1,
       current1: 1,
       accountId: "",
-      size: 30,
+      size: 10,
       total: 20,
-      size1: 30,
+      size1: 10,
       total1: 20,
       customtime: [],
       tablist: [],
@@ -615,9 +614,8 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 5px 15px 20px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 .cen-tab {
   width: 100%;
@@ -646,8 +644,6 @@ export default {
       font-weight: 400;
       color: #32363d;
       line-height: 32px;
-      margin-left: 15px;
-      // min-width: 100px;
       text-align: right;
     }
     .titel-text {

src/views/Statistics/TheTeamCompared.vue

@@ -63,7 +63,7 @@
       </div>
     </div>
     <!-- 表格 -->
-    <div class="cen-tab" :style="{'margin-top':role != 3?'110px':'70px'}">
+    <div class="cen-tab" :style="{'margin-top':role != 3?'100px':'60px'}">
       <div style="overflow: auto">
         <table>
           <tbody>
@@ -945,9 +945,8 @@ tbody tr {
 
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 20px 15px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .cen-tab {
@@ -1159,7 +1158,7 @@ tbody tr {
   border-bottom: 1px solid #E0E0E0;
   text-align: center;
   line-height: 48px;
-  font-size: 16px;
+  font-size: 14px;
   color: #32363d;
 }
 

src/views/Statistics/TrendAnalysis.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top" style="display:flex;padding:10px 16px;flex-direction: column;">
-      <div class="app-titel" v-if="role != 3" style="width:27%;">
+      <div class="app-titel" v-if="role != 3" style="width:27%;margin-bottom: 15px;">
         <div class="titel-text">项目选择:</div>
         <div style="margin-left: 26px">
           <el-select v-model="houseId" placeholder="请选择" filterable @change="houseChange">
@@ -11,8 +11,8 @@
           </el-select>
         </div>
       </div>
-      <div style="display: flex;align-items: center;margin-top: 15px;">
-        <div class="titel-text" style="font-size: 14px;font-weight: 600;">筛选日期：</div>
+      <div style="display: flex;align-items: center">
+        <div class="titel-text">筛选日期：</div>
         <div style="margin-left: 16px;">
           <el-button :class="{ 'el-button--primary': timeType == 4 }" @click="tabtimetap(4)">近7天</el-button>
           <el-button :class="{ 'el-button--primary': timeType == 5 }" @click="tabtimetap(5)">近15天</el-button>
@@ -96,7 +96,7 @@
     </div>
 
     <!-- //卡片 -->
-    <div class="kapian-box" :style="{'margin-top':role != 3?'110px':'70px'}">
+    <div class="kapian-box" :style="{'margin-top':role != 3?'100px':'50px'}">
       <div class="kayi">
         <div class="shang">
           <div class="zuo">
@@ -1322,9 +1322,8 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 20px 15px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .table {
@@ -1521,7 +1520,7 @@ export default {
 
   .titel-text {
     height: 100%;
-    font-size: 14px;
+    font-size: 16px;
     color: #32363d;
   }
 

src/views/Statistics/index.vue

@@ -14,7 +14,7 @@
       </div>
 
       <div class="app-titel2">
-        <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
+        <div style="text-indent: 30px;">接待时间:</div>
         <div style="margin-left: 38px;">
           <!-- <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
             今日
@@ -52,7 +52,7 @@
     </div>
 
     <!-- 中间 -->
-    <div style="display: flex;justify-content: space-between" :style="{ 'margin-top': orgType != 3 ? '110px' : '70px' }">
+    <div style="display: flex;justify-content: space-between" :style="{ 'margin-top': orgType != 3 ? '110px' : '60px' }">
       <el-card style="width: 33%;display: flex;flex-direction: column;align-items: center;text-align: center">
         <div @click="goTo(1)">{{ efficient || '-' }}</div>
         <div @click="goTo(1)" style="margin-top: 10px">有效接待</div>
@@ -115,10 +115,16 @@
                   align-items: center;
                   justify-content: center;
                 ">
-                <img v-if="inde == 0" style="width: 30px; height: 30px" src="/img/ranking1.png" alt="" />
+                <span class="sequenceNum" :style="{
+              'background': inde + 1 == 1 ? 'linear-gradient(180deg, #FFA395 0%, #F54D3F 100%)' : inde + 1 == 2 ? 'linear-gradient(180deg, #FFBE70 0%, #FF981E 100%)' : inde + 1 == 3 ? 'linear-gradient(180deg, #FFE683 0%, #FFCC00 100%)' : '#E5F0FF',
+              'color': inde + 1 == 1 ? '#FFF' : inde + 1 == 2 ? '#FFF' : inde + 1 == 3 ? '#FFF' : '#333',
+              'box-shadow': inde + 1 == 1 ? '0px 0px 6px 1px #F54D3F' : inde + 1 == 2 ? '0px 0px 6px 1px #FF981E' : inde + 1 == 3 ? '0px 0px 6px 1px #FFCC00' : '#E5F0FF',
+           'border': inde + 1 == 1 ? '1px solid #FFCAC6' : inde + 1 == 2 ? '1px solid #FFD6AA' : inde + 1 == 3 ? '1px solid #FFEEAC' : 'none',
+             }">{{ inde + 1 }}</span>
+                <!-- <img v-if="inde == 0" style="width: 30px; height: 30px" src="/img/ranking1.png" alt="" />
                 <img v-else-if="inde == 1" style="width: 30px; height: 30px" src="/img/ranking2.png" alt="" />
                 <img v-else-if="inde == 2" style="width: 30px; height: 30px" src="/img/ranking3.png" alt="" />
-                <div v-else class="indeclass">{{ inde + 1 }}</div>
+                <div v-else class="indeclass">{{ inde + 1 }}</div> -->
               </div>
               <div v-if="index == 2">
                 {{ itcen.name + "-" + itcen.endName + "㎡" }}({{ itcen.total }})
@@ -414,9 +420,8 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding:20px 15px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .tophove {
@@ -588,10 +593,20 @@ export default {
 
 .table-cent {
   width: 100%;
-  height: 20px;
-  line-height: 20px;
+  height: 40px;
+  line-height: 40px;
   display: flex;
-  margin-top: 18px;
+  margin-top: 6px;
+}
+.sequenceNum {
+  display: flex;
+  width: 26px;
+  height: 24px;
+  justify-content: center;
+  align-items: center;
+  background: #E5F0FF;
+  border-radius: 15px;
+  color: #333333;
 }
 
 .table-cent>div:nth-of-type(1) {