Merge branch 'dev' into trp_dev

src/components/content/badGasInfo/BadGasInfo.vue

@@ -2,6 +2,7 @@
   <div
     id="bad-gas-info"
     :style="{ backgroundImage: 'url(' + getImageUrl(bgImage) + ')' }"
+    @click="handleOpenChart"
   >
     <div class="title">有害气体</div>
     <div class="info-list">
@@ -9,7 +10,6 @@
         v-for="item in badGasList"
         :key="item.equipmentId"
         :gasInfo="item"
-        @click="handleOpenChart"
       />
     </div>
 
@@ -37,7 +37,6 @@
         <div class="right-bottom-icon"></div>
       </el-dialog>
     </div>
-    >>>>>>> 077ff6a0744d396411f6b0bd5f409d42997965e9
   </div>
 </template>
 
@@ -138,11 +137,12 @@ const initChart = () => {
     legend: {
       left: 0,
       textStyle: {
-        color: "#FFFFFF",
-        fontSize: 40,
+        color: '#60DDDE',
+        fontSize: 40
       },
-      // itemWidth: 20,
-      // itemHeight: 20
+      itemWidth: 30,
+      itemHeight: 30,
+      icon: "circle",
     },
     //离容器四侧的距离
     grid: {
@@ -156,6 +156,9 @@ const initChart = () => {
     tooltip: {
       show: true,
       trigger: "axis",
+      textStyle: {
+        fontSize: 40
+      }
     },
     //X轴
     xAxis: {
@@ -296,6 +299,7 @@ const initChart = () => {
 
 <style lang="scss" scoped>
 #bad-gas-info {
+  cursor: pointer;
   position: absolute;
   z-index: 100;
   width: 824px;

src/components/content/tunnelScene/sceneClass/demo.js

@@ -180,9 +180,12 @@ export default class Demo {
       this.camera,
       this.renderer.domElement
     );
-    this.orbitControls.object.position.set(-27.285, 16.356, -54.925);
-    //限制轨道控制器的视角变化
-    this.orbitControls.maxPolarAngle = Math.PI * (3 / 5);
+    //初始化轨道控制器
+    this.orbitControls.object.position.set(-29, 18, -50)
+    this.orbitControls.maxPolarAngle = Math.PI * (3.17 / 6);
+    this.orbitControls.minPolarAngle = Math.PI * (2 / 6);
+    this.orbitControls.minDistance = 19;
+    this.orbitControls.maxDistance = 87;
     // 监听控制器变化
     this.orbitControls.addEventListener("end", handleEndChange.bind(this));
     this.orbitControls.addEventListener("start", handleStartChange.bind(this));

src/components/content/usedEle/UsedEle.vue

@@ -1,6 +1,6 @@
 <template>
-  <div id="used-ele" :style="{ backgroundImage: 'url(' +getImageUrl(bgImage)+')' }">
-    <div class="content" @click="handleOpenChart">
+  <div id="used-ele" :style="{ backgroundImage: 'url(' +getImageUrl(bgImage)+')' }" @click="handleOpenChart">
+    <div class="content" >
       <div class="item">
         <div></div>
         <span>当月用电量：{{ electricityConsumptionMonthly }}v</span>
@@ -108,9 +108,12 @@ const initChart = () => {
     legend: {
       left: 0,
       textStyle: {
-        color: '#FFFFFF',
+        color: '#60DDDE',
         fontSize: 45
-      }
+      },
+      itemWidth: 30,
+      itemHeight:30,
+      icon: "circle",
     },
     //离容器四侧的距离
     grid: {
@@ -123,7 +126,10 @@ const initChart = () => {
     //提示框组件
     tooltip: {
       show: true,
-      trigger: 'axis'
+      trigger: 'axis',
+      textStyle: {
+        fontSize: 40
+      }
     },
     //X轴
     xAxis: {
@@ -176,6 +182,7 @@ const getImageUrl = (name) => {
   padding: 0!important;
 }
 #used-ele {
+  cursor: pointer;
   width: 830px;
   height: 90px;
   color: aliceblue;

src/components/content/windPressure/WindPressureList.vue

@@ -115,7 +115,10 @@ const initChart = () => {
     //提示框组件
     tooltip: {
       show: true,
-      trigger: 'axis'
+      trigger: 'axis',
+      textStyle: {
+        fontSize: 40
+      }
     },
     //X轴
     xAxis: {