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

src/components/Viewer/smViewer.scss

@@ -31,7 +31,7 @@
 .cesiumbtn {
     position: absolute;
     right: 15px;
-    top: 18px;
+    top: 7px;
     color: #51E9FF;
     font-size: 20px;
     z-index: 98;

src/views/cockpit/common/BarGraph3D.vue

@@ -42,8 +42,6 @@ export default {
     //方法集合
     methods: {
         init_3DBarGraph_echart(legendData, xdata, result) {
-            console.log("asdasd");
-            
             const _this = this;
             _this.chart = echarts.init(this.$refs.BarGraph3D);
             // Mock数据

src/views/cockpit/gdbh.vue

@@ -644,7 +644,7 @@ export default {
 }
 
 .gdbh {
-  top: 10px !important;
+  top: 1px !important;
 
 
   .content {

src/views/cockpit/hysy.vue

@@ -36,7 +36,7 @@
                     </div>
                 </div>
             </div>
-            <BarGraph3D ref="hysy_bar_graph" />
+            <BarGraph3D class="hysy_bar_graph" ref="hysy_bar_graph" />
         </div>
     </div>
 </template>
@@ -642,4 +642,8 @@ export default {
         color: #68f4fb;
     }
 }
+
+.hysy_bar_graph {
+    margin-left: 5rem;
+}
 </style>

src/views/cockpit/stxf.vue

@@ -180,7 +180,6 @@ export default {
         tzje: xmjz_num.toFixed(2),
 
       }
-      console.log(this.sdata.tdzz,'----')
 
       this.$refs.stxf_echart_tdzz.setOptions(arr);
 

src/views/cockpit/tdsy.vue

@@ -240,7 +240,6 @@ export default {
       //     { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
       //   ]
       // }
-      // console.log('mockData1: ', mockData1);
 
       const color = [
         [{ offset: 0, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(249, 180, 71, 0.8)' }, { offset: 1, color: 'rgba(249, 180, 71, 0.8)' }],
@@ -393,7 +392,6 @@ export default {
 
         tooltip, legend, xAxis, yAxis, series, grid, dataZoom, backgroundColor: 'rgba(0, 0, 0, 0)'
       }
-      console.log(series, ' series')
 
       myChart.setOption(option);
 

src/views/cockpitNew1/bjxm.vue

@@ -213,7 +213,6 @@ export default {
                 show: false,
                 position: "inner", // 数值显示在内部
                 formatter: (params) => {
-                  console.log(params);
                   return `${params.name}` + ":" + +params.value + "个";
                 },
               },

src/views/cockpitNew1/gkzb.vue

@@ -157,7 +157,6 @@ export default {
         id: '4602'
       };
       let obj_kfbjmj_data = await cockpitInfo(obj_kfbjmj);
-      console.log('obj_kfbjmj_data: ', obj_kfbjmj_data);
 
       let obj_gdbhmb = {
         jscType: 'jsc_gkzb_ztgu_gdbhmb',

static/css/index.css

@@ -213,7 +213,7 @@ div::-webkit-scrollbar-track {
 .el-textarea>textarea {
   color: #fff !important;
   background-color: rgba(4, 28, 50, 0.5) !important;
-  border: 1px solid rgba(15, 122, 200, 0.4) !important;
+  /* border: 1px solid rgba(15, 122, 200, 0.4) !important; */
 }
 
 .el-input .el-input-group__append {