Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
97c8ec72 by jikai
Options

Merge remote-tracking branch 'origin/master'

2 parents a6970079 8d140c8e
Inline Side-by-side
Showing 5 changed files with 24 additions and 25 deletions
...@@ -19,10 +19,7 @@ ...@@ -19,10 +19,7 @@
19 padding: 0px; 19 padding: 0px;
20 list-style: none; 20 list-style: none;
21 } 21 }
22
23 .cesium-viewer-toolbar, .cesium-viewer-animationContainer, .cesium-viewer-bottom, .cesium-viewer-fullscreenContainer { 22 .cesium-viewer-toolbar, .cesium-viewer-animationContainer, .cesium-viewer-bottom, .cesium-viewer-fullscreenContainer {
24 display: none !important; 23 display: none !important;
25 } 24 }
26
27
28 </style> 25 </style>
......
...@@ -60,6 +60,16 @@ ...@@ -60,6 +60,16 @@
60 <el-color-picker v-model="noColor"></el-color-picker> 60 <el-color-picker v-model="noColor"></el-color-picker>
61 </div> 61 </div>
62 </div> 62 </div>
63 <div class="func-btn">
64 <div class="btn-wrapper add-bg" @click="startAnalysis">
65 <img style="width: 20px; height: 20px; margin: 0 5px 0 44px" src="../assets/icon_开始分析.png" alt="">
66 <span>开始绘制</span>
67 </div>
68 <div class="btn-wrapper" @click="stopAnalysis" style="margin-left: 30px;">
69 <img style="width: 20px; height: 20px;margin: 0 5px 0 26px" src="../assets/icon_清除分析结果.png" alt="">
70 <span>清除绘制结果</span>
71 </div>
72 </div>
63 </div> 73 </div>
64 </div> 74 </div>
65 </template> 75 </template>
...@@ -81,7 +91,6 @@ ...@@ -81,7 +91,6 @@
81 noColor: 'rgba(255, 69, 0, 0.68)', // 不可见区域颜色 91 noColor: 'rgba(255, 69, 0, 0.68)', // 不可见区域颜色
82 92
83 isXmbj: true, 93 isXmbj: true,
84 // isAnalysis: true
85 } 94 }
86 }, 95 },
87 mounted() {}, 96 mounted() {},
...@@ -92,12 +101,8 @@ ...@@ -92,12 +101,8 @@
92 handleChange() { 101 handleChange() {
93 102
94 }, 103 },
95 startAnalysis() { 104 startAnalysis() {},
96 // this.isAnalysis = true; 105 stopAnalysis() {},
97 },
98 stopAnalysis() {
99 // this.isAnalysis = false;
100 },
101 handleIsXmbj(flag) { 106 handleIsXmbj(flag) {
102 this.isXmbj = flag; 107 this.isXmbj = flag;
103 } 108 }
...@@ -237,7 +242,7 @@ ...@@ -237,7 +242,7 @@
237 display: flex; 242 display: flex;
238 justify-content: space-around; 243 justify-content: space-around;
239 text-align: center; 244 text-align: center;
240 padding: 30px 0px; 245 padding: 15px 0 0 0;
241 } 246 }
242 247
243 .demonstration { 248 .demonstration {
......
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
20 20
21 <div class="func-input"> 21 <div class="func-input">
22 <span>开始时间</span> 22 <span>开始时间</span>
23 <el-time-picker style="margin:0 12px; width: 245px;" v-model="staTime" 23 <el-time-picker style="margin:0 12px; width: 245px;" v-model="staTime" :picker-options="pickerOptions"
24 :picker-options="pickerOptions" placeholder="选择开始时间"> 24 placeholder="选择开始时间">
25 </el-time-picker> 25 </el-time-picker>
26 </div> 26 </div>
27 <div class="func-input"> 27 <div class="func-input">
28 <span>结束时间</span> 28 <span>结束时间</span>
29 <el-time-picker style="margin:0 12px; width: 245px;" v-model="endTime" 29 <el-time-picker style="margin:0 12px; width: 245px;" v-model="endTime" :picker-options="pickerOptions"
30 :picker-options="pickerOptions" placeholder="选择结束时间"> 30 placeholder="选择结束时间">
31 </el-time-picker> 31 </el-time-picker>
32 </div> 32 </div>
33 33
...@@ -82,12 +82,12 @@ ...@@ -82,12 +82,12 @@
82 components: {}, 82 components: {},
83 data() { 83 data() {
84 return { 84 return {
85 isCF: true, // 春分 85 // isCF: true, // 春分
86 isXZ: false, // 夏至 86 // isXZ: false, // 夏至
87 isQF: false, // 秋分 87 // isQF: false, // 秋分
88 isLD: false, // 立冬 88 // isLD: false, // 立冬
89 isDZ: false, // 冬至 89 // isDZ: false, // 冬至
90 keepTqArr: ['isCF', 'isXZ', 'isQF', 'isLD', 'isDZ'], 90 // keepTqArr: ['isCF', 'isXZ', 'isQF', 'isLD', 'isDZ'],
91 91
92 anslysisTime: '', 92 anslysisTime: '',
93 timeS: 30, // 时间间隔 93 timeS: 30, // 时间间隔
...@@ -177,7 +177,6 @@ ...@@ -177,7 +177,6 @@
177 .box { 177 .box {
178 background: rgba(4, 10, 10, 0.58); 178 background: rgba(4, 10, 10, 0.58);
179 box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5); 179 box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5);
180 /* filter: blur(10px); */
181 height: 100px; 180 height: 100px;
182 position: absolute; 181 position: absolute;
183 width: 100%; 182 width: 100%;
...@@ -217,7 +216,6 @@ ...@@ -217,7 +216,6 @@
217 .func-input { 216 .func-input {
218 display: flex; 217 display: flex;
219 align-items: center; 218 align-items: center;
220 /* justify-content: space-between; */
221 padding: 18px 24px 0px 24px; 219 padding: 18px 24px 0px 24px;
222 font-size: 18px; 220 font-size: 18px;
223 cursor: pointer; 221 cursor: pointer;
......
...@@ -12,7 +12,6 @@ import 'element-ui/lib/theme-chalk/index.css'; ...@@ -12,7 +12,6 @@ import 'element-ui/lib/theme-chalk/index.css';
12 12
13 Vue.use(ElementUI); 13 Vue.use(ElementUI);
14 14
15
16 Vue.prototype.$echarts = echarts; 15 Vue.prototype.$echarts = echarts;
17 Vue.prototype.config = config; 16 Vue.prototype.config = config;
18 Vue.prototype.commons = commons; 17 Vue.prototype.commons = commons;
......
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
25 @roundSee='EroundSee' 25 @roundSee='EroundSee'
26 @horizon='Ehorizon' 26 @horizon='Ehorizon'
27 @allSee='EallSee' 27 @allSee='EallSee'
28
29 @ymAnslysis='EymAnslysis' 28 @ymAnslysis='EymAnslysis'
30 @tjxAnslysis='EtjxAnslysis' 29 @tjxAnslysis='EtjxAnslysis'
31 @visualField='EvisualField' 30 @visualField='EvisualField'
32 @yyAnslysis='EyyAnslysis' 31 @yyAnslysis='EyyAnslysis'
33 @kgAnalusis='EkgAnalusis' 32 @kgAnalusis='EkgAnalusis'
33
34 :enlarge='enlarge' 34 :enlarge='enlarge'
35 :narrow='narrow' 35 :narrow='narrow'
36 :coordinate='coordinate' 36 :coordinate='coordinate'
......