Merge remote-tracking branch 'origin/master'

@@ -19,10 +19,7 @@
     padding: 0px; 
     list-style: none;
   }
-  
   .cesium-viewer-toolbar, .cesium-viewer-animationContainer, .cesium-viewer-bottom, .cesium-viewer-fullscreenContainer {
       display: none !important;
   }
-
-
 </style>

@@ -60,6 +60,16 @@
                     <el-color-picker v-model="noColor"></el-color-picker>
                 </div>
             </div>
+            <div class="func-btn">
+                <div class="btn-wrapper add-bg" @click="startAnalysis">
+                    <img style="width: 20px; height: 20px; margin: 0 5px 0 44px" src="../assets/icon_开始分析.png" alt="">
+                    <span>开始绘制</span>
+                </div>
+                <div class="btn-wrapper" @click="stopAnalysis" style="margin-left: 30px;">
+                    <img style="width: 20px; height: 20px;margin: 0 5px 0 26px" src="../assets/icon_清除分析结果.png" alt="">
+                    <span>清除绘制结果</span>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -81,7 +91,6 @@
                 noColor: 'rgba(255, 69, 0, 0.68)', // 不可见区域颜色
 
                 isXmbj: true,
-                // isAnalysis: true
             }
         },
         mounted() {},
@@ -92,12 +101,8 @@
             handleChange() {
 
             },
-            startAnalysis() {
-                // this.isAnalysis = true;
-            },
-            stopAnalysis() {
-                // this.isAnalysis = false;            
-            },
+            startAnalysis() {},
+            stopAnalysis() {},
             handleIsXmbj(flag) {
                 this.isXmbj = flag;
             }
@@ -237,7 +242,7 @@
         display: flex;
         justify-content: space-around;
         text-align: center;
-        padding: 30px 0px;
+        padding: 15px 0 0 0;
     }
 
     .demonstration {

@@ -20,14 +20,14 @@
 
             <div class="func-input">
                 <span>开始时间</span>
-                <el-time-picker  style="margin:0 12px; width: 245px;" v-model="staTime"
-                    :picker-options="pickerOptions" placeholder="选择开始时间">
+                <el-time-picker style="margin:0 12px; width: 245px;" v-model="staTime" :picker-options="pickerOptions"
+                    placeholder="选择开始时间">
                 </el-time-picker>
             </div>
             <div class="func-input">
                 <span>结束时间</span>
-                <el-time-picker  style="margin:0 12px; width: 245px;" v-model="endTime"
-                    :picker-options="pickerOptions" placeholder="选择结束时间">
+                <el-time-picker style="margin:0 12px; width: 245px;" v-model="endTime" :picker-options="pickerOptions"
+                    placeholder="选择结束时间">
                 </el-time-picker>
             </div>
 
@@ -82,12 +82,12 @@
         components: {},
         data() {
             return {
-                isCF: true, // 春分
-                isXZ: false, // 夏至
-                isQF: false, // 秋分
-                isLD: false, // 立冬
-                isDZ: false, // 冬至
-                keepTqArr: ['isCF', 'isXZ', 'isQF', 'isLD', 'isDZ'],
+                // isCF: true, // 春分
+                // isXZ: false, // 夏至
+                // isQF: false, // 秋分
+                // isLD: false, // 立冬
+                // isDZ: false, // 冬至
+                // keepTqArr: ['isCF', 'isXZ', 'isQF', 'isLD', 'isDZ'],
 
                 anslysisTime: '',
                 timeS: 30, // 时间间隔
@@ -103,7 +103,7 @@
                     //     label: this.$createElement('strong', '50%')
                     // }
                 },
-                pickerOptions: {  // 时间选择器 时间范围限制
+                pickerOptions: { // 时间选择器 时间范围限制
                     selectableRange: '00:00:00 - 23:59:59'
                 },
                 staTime: '', // 开始时间
@@ -177,7 +177,6 @@
     .box {
         background: rgba(4, 10, 10, 0.58);
         box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5);
-        /* filter: blur(10px); */
         height: 100px;
         position: absolute;
         width: 100%;
@@ -217,7 +216,6 @@
     .func-input {
         display: flex;
         align-items: center;
-        /* justify-content: space-between; */
         padding: 18px 24px 0px 24px;
         font-size: 18px;
         cursor: pointer;

@@ -12,7 +12,6 @@ import 'element-ui/lib/theme-chalk/index.css';
 
 Vue.use(ElementUI);
 
-
 Vue.prototype.$echarts = echarts;
 Vue.prototype.config = config;
 Vue.prototype.commons = commons;

@@ -25,12 +25,12 @@
                 @roundSee='EroundSee'
                 @horizon='Ehorizon'
                 @allSee='EallSee'
-                
                 @ymAnslysis='EymAnslysis'
                 @tjxAnslysis='EtjxAnslysis'
                 @visualField='EvisualField'
                 @yyAnslysis='EyyAnslysis'
                 @kgAnalusis='EkgAnalusis'
+
                 :enlarge='enlarge'
                 :narrow='narrow'
                 :coordinate='coordinate'