Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/cockpitNew1/datePicker.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- value-format="yyyy-MM-dd" -->
   <el-date-picker v-model="dateValue" class="timePicker" type="daterange" :picker-options="pickerOptions"
-    value-format="yyyyMMdd" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false"
+    value-format="yyyyMMdd" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false"
     align="left" @change="dateChange">
   </el-date-picker>
 </template>
@@ -99,6 +99,7 @@ export default {
 
 .el-date-editor .el-range-separator {
   padding: 0;
+  height: 78%;
 }
 
 .el-date-editor .el-range__close-icon {

src/views/map3d.vue

@@ -67,11 +67,15 @@
           v-html="formattedTime"
         ></div>
       </div> -->
-      <i class="ai el-icon-chat-dot-round" @click="drawer = !drawer"></i>
+      <el-tooltip class="item" effect="dark" content="智能会话" placement="top">
+        <i class="ai el-icon-chat-dot-round" @click="drawer = !drawer"></i>
+      </el-tooltip>
       <div class="user">
         <span>admin</span>
-        <i style="width: 24px;height: 24px;background-image: url('/static/images/overview/icon_LogOut.png');"
+        <el-tooltip class="item" effect="dark" content="退出" placement="top">
+          <i style="width: 24px;height: 24px;background-image: url('/static/images/overview/icon_LogOut.png'); cursor: pointer;"
           @click="exit"></i>
+    </el-tooltip>
       </div>
     </div>
     <div class="routerContainer">
@@ -228,7 +232,7 @@ export default {
 .ai {
   position: absolute;
   right: 110px;
-  top: 27px;
+  top: 19px;
   color: cornflowerblue;
   font-size: 24px;
 }
@@ -237,7 +241,7 @@ export default {
   height: 40px;
   position: absolute;
   right: 10px;
-  top: 19px;
+  top: 10px;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -383,7 +387,7 @@ export default {
 .timeline {
   position: absolute;
   left: 11px;
-  top: 17px;
+  top: 10px;
   height: 38px;
   line-height: 60px;
   font-size: 14px;