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

src/views/Equipment/equipmentDetailList.vue

@@ -1190,6 +1190,29 @@ export default {
         var option;
 
         option = {
+             color: [
+              "#66AFF5",
+              "#FABD2B",
+              "#6F8EDC",
+              "#FFCF8F",
+              "#F98120",
+              "#1CC99E",
+              "#9474FB",
+              "#657292",
+              "#7A6A99",
+              "#BF5D52",
+              "#EE6666",
+              "#77B7E4",
+              "#E6A065",
+              "#9D5139",
+              "#C1AA88",
+              "#F87F7A",
+              "#F6CF74",
+              "#7F5506",
+              "#88BB9B",
+              "#6E99AA",
+              "#5789D0",
+            ],
           tooltip: {
             trigger: "axis",
           },
@@ -1278,6 +1301,29 @@ export default {
         var myChart = echarts.init(chartDom);
         var option;
                 option = {
+                     color: [
+              "#66AFF5",
+              "#FABD2B",
+              "#6F8EDC",
+              "#FFCF8F",
+              "#F98120",
+              "#1CC99E",
+              "#9474FB",
+              "#657292",
+              "#7A6A99",
+              "#BF5D52",
+              "#EE6666",
+              "#77B7E4",
+              "#E6A065",
+              "#9D5139",
+              "#C1AA88",
+              "#F87F7A",
+              "#F6CF74",
+              "#7F5506",
+              "#88BB9B",
+              "#6E99AA",
+              "#5789D0",
+            ],
           tooltip: {
             trigger: "axis",
           },

src/views/Receive/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="box-center"  style="cursor:pointer;">
-
+    <div class="biaotibox">
+      <div>客户接待详情</div>
+      <div><i @click="gojianyi()" class="el-icon-close"></i></div>
+    </div>
     <div class="topbox">
       <div class="topzuo">
           <div class="title" style="display: flex;">
@@ -719,6 +722,9 @@ export default {
        this.aplayer.destroy()
   },
   methods: {
+    gojianyi(){
+      this.$router.go(-1);//返回上一层
+    },
     	//上一首
 			aplayerChange(str){
 				this.aplayer.destroy()
@@ -1398,14 +1404,30 @@ export default {
 #zxldiv{
   overflow-y: scroll;
   //  height: 100%;
-  height:calc(80vh - 242px);
+  height:calc(80vh - 270px);
+}
+.biaotibox{
+  width: 100%;
+  height: 40px;
+  display: flex;
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 30px;
+}
+.biaotibox>div:nth-of-type(1){
+  width: 50%;
+}
+.biaotibox>div:nth-of-type(2){
+  width: 50%;
+  font-size: 30px;
+  text-align: right;
 }
 .center2{
   padding-left: 10px;
   padding-right: 10px;
    width: 100%;
   //  height: 100%;
-  height:calc(80vh - 258px);
+  height:calc(80vh - 285px);
   overflow-y: scroll;
 }
 
@@ -1714,7 +1736,7 @@ export default {
   width: 100%;
   display: flex;
   margin-top: 18px;
-  height: calc(80vh - 150px);
+  height: calc(80vh - 178px);
   .topzuo{
     width:75% ;
     min-width: 700px;