ソースを参照

皮带能效分析时间选择显示数据修改,工况分析的参数可调整,ui界面改为自适应。

jie 2 年 前
コミット
4f2bccb75d

+ 3 - 0
public/static/config.js

@@ -0,0 +1,3 @@
+window.config = {
+    efficiency:[ { name: '额定负载', xAxis: 0.8 },{ name: '额定负载',xAxis: 1.2 },{ name: '效率',yAxis: 0.7 },{ name: '效率',yAxis: 1 }]
+}

+ 2 - 0
src/store/index.js

@@ -9,6 +9,8 @@ export default new Vuex.Store({
     ip:"http://49.235.67.21/",
     name: "",
     title: "主界面",
+    // efficiency: window.config.efficiency,
+    efficiency: [ { name: '额定负载', xAxis: 0.8 },{ name: '额定负载',xAxis: 1.2 },{ name: '效率',yAxis: 0.7 },{ name: '效率',yAxis: 1 }]
 
   },
   mutations: {

+ 12 - 11
src/views/app_beam_tube_inspection/dataBoardtest.vue

@@ -31,12 +31,13 @@
         </el-col>
         <el-col :span="8">
           <div class="center_center">
-            <div class="title2" style="width: 100%;margin-left: 255px;padding-top: 0px;">工况分析</div>
-            <albox style="margin-left: 420px;margin-top: -38px; color: gray;width:160px;"></albox> <!--算法框-->
-            <div class="title2" style="width: 100%;font-size: 19px;margin-top: -20px;">区域状态:<span style="color: #f3db5c;font-size: 16px">{{work.info}}</span>
-              <sandian style="margin-top: -38px;z-index: 1;"></sandian>
-              <div class="title2"style="color:white;width:  100%;font-size: 19px;z-index: 2;margin-top: -130px;margin-left: 120px;">工况1&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp合理工作区</div>
-              <div class="title2"style="color:white;width:  100%;font-size: 19px;z-index: 2;margin-top: 5px;margin-left: 120px;">工况2&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp工况3&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp工况4</div>
+            <div class="title2" style="width: 100%;margin-left: 225px;padding-top: 0px;font-size: 19px;color: #4ADEFE;font-weight: 350;">工况分析</div>
+            <albox style="margin-left: 67%;margin-top: -38px; color: gray;width:32%;"></albox> <!--算法框-->
+            <div class="title2" style="width: 100%;font-size: 18px;margin-top: -20px;">区域状态:<span style="color: #f3db5c;font-size: 14px">{{work.info}}</span>
+<!--              <sandian style="margin-top: -38px;z-index: 1;"></sandian>-->
+              <sandian style="margin-top: -7%;margin-left: -4%;z-index: 1;"></sandian>
+              <div class="title2"style="color:white;width:  100%;font-size: 18px;z-index: 2;margin-top: -130px;margin-left: 92px;">工况1&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp合理工作区</div>
+              <div class="title2"style="color:white;width:  100%;font-size: 18px;z-index: 2;margin-top: 5px;margin-left: 92px;">工况2&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp工况3&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp工况4</div>
 <!--              <test></test>-->
 <!--              <sandian></sandian>-->
 <!--              <radartu></radartu>-->
@@ -248,7 +249,7 @@
           <span class="title">皮带</span>
           <br><br><br><br><br><br>
          <div class="video1">
-          <m3u8></m3u8>
+          <m3u8 style="width: 251px;height: 136px;margin-left: -5%;"></m3u8>
          </div>
         </div>
 
@@ -439,13 +440,13 @@ export default {
 
   height: 40px;
   width: 5%;
-  font-size: 18px;  //20
+  font-size: 17px;  //20
   line-height: 2;
   padding: 5px;
   font-weight: 500;
   color: #4adefe;
   margin-left: 20px;
-  margin-top: 25px;
+  margin-top: 35px;
 }
 .title2 {
   //border-bottom: #5ddcf8 1px solid;
@@ -455,7 +456,7 @@ export default {
   font-size: 22px;
   line-height: 2;
   padding: 5px;
-  font-weight: 500;
+  font-weight: 500; //500
   color: #4adefe;
   margin-left: 20px;
 }
@@ -499,7 +500,7 @@ export default {
     color: #4adefe;
     display: flex;
     /* flex-direction: column; */
-    font-size: 18px;  //18   //16
+    font-size: 16px;  //18   //16
     position: relative;
     margin-top: -10px;
     line-height: 32px;   //30

+ 45 - 26
src/views/app_beam_tube_inspection/picture/dangqian.vue

@@ -1,7 +1,9 @@
 <template>
   <div>
-    <div ref="testLine" style="width: 600px; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> <!--算法框-->
+<!--    <div ref="testLine" style="width: 600px; height: 230px"></div>-->
+    <div ref="testLine" style="width: 100%; height: 230px"></div>
+<!--    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> &lt;!&ndash;算法框&ndash;&gt;-->
+    <timeselect @getMsg="chooseDate" style="margin-left: 80%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>
@@ -25,6 +27,10 @@ export default {
   },
   data() {
     return {
+      interval0: null,
+      interval1: null,
+      interval2: null,
+      interval3: null,
       chooseDatetime: "0",
       currentChartId: 1,
       count: 0,
@@ -106,7 +112,8 @@ export default {
             axisLabel: {
               color: "#fff",
               fontSize: 11,
-              // rotate: 30,
+              rotate: 30,
+              padding: [0,-20,0,0],
             },
             axisTick: { show: false },
             boundaryGap: false,
@@ -117,7 +124,7 @@ export default {
           text: this.title,
           // left: 100,
           // top: 10,
-          padding: [15, 162],
+          padding: [15, 142],
           // x:'center',
           // y:'top',
           // textAlign:'center',
@@ -125,7 +132,7 @@ export default {
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",
-            fontSize: 22,
+            fontSize: 19,  //22
           },
         },
         series: [
@@ -213,19 +220,22 @@ export default {
       this.chooseDatetime = value;
       this.count = 0;
       switch (value) {
-        case "0":
+        case "0":       //半小时
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
-            var xData=[];
-            var data1 = [];
+            var xData=[];       //横坐标
+            var data1 = [];     //纵坐标
             let now =new Date();
-            let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            let time = now.getTime()   //获取当前时间
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(0.8, 1.0));
-              time = time-1000*60*30;   //间隔30分钟
+              time = time-1000*60;   //间隔1分钟
             }
             first = 0;
           }
@@ -240,7 +250,7 @@ export default {
             ],
           });
 
-          let interval = setInterval(() => {
+          this.interval0 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -255,21 +265,24 @@ export default {
                 },
               ],
             });
-          }, 1000*60*30);
+          }, 1000*60);
           break;
-        case "1":
+        case "1":      //1小时
+          clearInterval(this.interval0);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()    //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(0.8, 1.0));
-              time = time-1000*60*60;   //间隔60分钟
+              time = time-1000*60*2;   //间隔2分钟
             }
             first = 0;
           }
@@ -284,7 +297,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval1 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -299,22 +312,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60);
+          }, 1000*60*2);
           break;
         case "2":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 25; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(0.8, 1.0));
-              time = time-1000*60*60*24;   //
+              time = time-1000*60*60;   //间隔1小时
             }
             first = 0;
           }
@@ -329,7 +345,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval2 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -345,22 +361,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24);
+          }, 1000*60*60);
           break;
         case "3":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 22; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(0.8, 1.0));
-              time = time-1000*60*60*24*7;   //
+              time = time-1000*60*60*8;   //间隔8小时
             }
             first = 0;
           }
@@ -375,7 +394,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval3 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -391,7 +410,7 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24*7);
+          }, 1000*60*60*8);
           break;
       }
     },

+ 39 - 21
src/views/app_beam_tube_inspection/picture/dunmei.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div ref="testLine" style="width: 600px; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> <!--算法框-->
+    <div ref="testLine" style="width: 100%; height: 230px"></div>
+    <timeselect @getMsg="chooseDate" style="margin-left: 80%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>
@@ -25,6 +25,10 @@ export default {
   },
   data() {
     return {
+      interval0: null,
+      interval1: null,
+      interval2: null,
+      interval3: null,
       chooseDatetime: "0",
       currentChartId: 1,
       count: 0,
@@ -112,6 +116,8 @@ export default {
               color: "#fff",
               fontSize: 11,
               // rotate: 30,
+              rotate: 30,
+              padding: [0,-20,0,0],
             },
             axisTick: { show: false },
             boundaryGap: false,
@@ -122,7 +128,7 @@ export default {
           text: this.title,
           // left: 100,
           // top: 10,
-          padding: [15, 243],
+          padding: [15, 210],
           // x:'center',
           // y:'top',
           // textAlign:'center',
@@ -130,7 +136,7 @@ export default {
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",
-            fontSize: 22,
+            fontSize: 19,
           },
         },
         series: [
@@ -219,18 +225,21 @@ export default {
       this.count = 0;
       switch (value) {
         case "0":
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*30;   //间隔30分钟
+              time = time-1000*60;   //间隔1分钟
             }
             first = 0;
           }
@@ -245,7 +254,7 @@ export default {
             ],
           });
 
-          let interval = setInterval(() => {
+          this.interval0 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -260,21 +269,24 @@ export default {
                 },
               ],
             });
-          }, 1000*60*30);
+          }, 1000*60);
           break;
         case "1":
+          clearInterval(this.interval0);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
-            let time = now.getTime()    //分钟
-            for (let i = 0; i < 5; i++) {
+            let time = now.getTime()
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*60;   //间隔60分钟
+              time = time-1000*60*2;   //间隔2分钟
             }
             first = 0;
           }
@@ -289,7 +301,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval1 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -304,22 +316,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60);
+          }, 1000*60*2);
           break;
         case "2":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 25; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*60*24;   //
+              time = time-1000*60*60;   //间隔1小时
             }
             first = 0;
           }
@@ -334,7 +349,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval2 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -350,22 +365,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24);
+          }, 1000*60*60);
           break;
         case "3":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 22; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*60*24*7;   //
+              time = time-1000*60*60*8;   //间隔8小时
             }
             first = 0;
           }
@@ -380,7 +398,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval3 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -396,7 +414,7 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24*7);
+          }, 1000*60*60*8);
           break;
       }
     },

+ 38 - 20
src/views/app_beam_tube_inspection/picture/fuzai.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div ref="testLine" style="width: 600px; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> <!--算法框-->
+    <div ref="testLine" style="width: 100%; height: 230px"></div>
+    <timeselect @getMsg="chooseDate" style="margin-left: 80%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
 
 <!--    230-->
   </div>
@@ -25,6 +25,10 @@ export default {
   },
   data() {
     return {
+      interval0: null,
+      interval1: null,
+      interval2: null,
+      interval3: null,
       chooseDatetime: "0",
       currentChartId: 1,
       count: 0,
@@ -112,6 +116,8 @@ export default {
               color: "#fff",
               fontSize: 11,
               // rotate: 30,
+              rotate: 30,
+              padding: [0,-20,0,0],
             },
             axisTick: { show: false },
             boundaryGap: false,
@@ -122,7 +128,7 @@ export default {
           text: this.title,
           // left: 100,
           // top: 10,
-          padding: [15, 264],
+          padding: [15, 230],
           // x:'center',
           // y:'top',
           // textAlign:'center',
@@ -130,7 +136,7 @@ export default {
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",
-            fontSize: 22,
+            fontSize: 19,
           },
         },
         series: [
@@ -219,18 +225,21 @@ export default {
       this.count = 0;
       switch (value) {
         case "0":
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*30;   //间隔30分钟
+              time = time-1000*60;   //间隔1分钟
             }
             first = 0;
           }
@@ -245,7 +254,7 @@ export default {
             ],
           });
 
-          let interval = setInterval(() => {
+          this.interval0= setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -260,21 +269,24 @@ export default {
                 },
               ],
             });
-          }, 1000*60*30);
+          }, 1000*60);
           break;
         case "1":
+          clearInterval(this.interval0);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()    //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*60;   //间隔60分钟
+              time = time-1000*60*2;   //间隔2分钟
             }
             first = 0;
           }
@@ -289,7 +301,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval1 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -304,22 +316,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60);
+          }, 1000*60*2);
           break;
         case "2":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 25; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*60*24;   //
+              time = time-1000*60*60;   //间隔1小时
             }
             first = 0;
           }
@@ -334,7 +349,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval2 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -350,22 +365,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24);
+          }, 1000*60*60);
           break;
         case "3":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 22; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(900, 1600));
-              time = time-1000*60*60*24*7;   //
+              time = time-1000*60*60*8;   //间隔8小时
             }
             first = 0;
           }
@@ -380,7 +398,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval3 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -396,7 +414,7 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24*7);
+          }, 1000*60*60*8);
           break;
       }
     },

+ 5 - 87
src/views/app_beam_tube_inspection/picture/sandian.vue

@@ -12,91 +12,7 @@ export default {
   props: {
     rowData: {
       default: () => {
-        // return [
-        //     [1000,1000],
-        //   {
-        //     name: "效率",
-        //     value: -30,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: -38,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 44,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 50,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 35,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 30,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: -25,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 20,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 12,
-        //   },
-        //   {
-        //     name: "效率",
-        //     value: 15,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: 60,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: -15,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: 30,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: -21,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: -22,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: 23,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: 8,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: 56,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: 31,
-        //   },
-        //   {
-        //     name: "负载",
-        //     value: -3,
-        //   },
-        // ];
         return [
-
         ];
       },
     },
@@ -115,6 +31,7 @@ export default {
   },
   data() {
     return {
+      efficiency: this.$store.state.efficiency,
       chartInstance: null,
       staffData: [],
       revenueData: [],
@@ -201,7 +118,7 @@ export default {
             // symbolSize: function(data) {
             //   return (Math.abs(data[1]) + Math.abs(data[0])) / 2;
             // },
-            symbolSize:20,
+            symbolSize:10,
             markLine: {
               // itemStyle:{
               //   label:{
@@ -215,7 +132,8 @@ export default {
               lineStyle: {
                 type: 'solid'
               },
-              data: [ { name: '额定负载', xAxis: 0.8 },{ name: '额定负载',xAxis: 1.2 },{ name: '效率',yAxis: 0.7 },{ name: '效率',yAxis: 1 }]
+              data: this.efficiency,
+              // data: [ { name: '额定负载', xAxis: 0.8 },{ name: '额定负载',xAxis: 1.2 },{ name: '效率',yAxis: 0.7 },{ name: '效率',yAxis: 1 }]
             },
             label: {
               show: false,
@@ -265,7 +183,7 @@ export default {
 
 <style lang="less" scoped>
 .bubble-chart {
-  width: 530px;
+  width: 500px;
   height: 200px;
 
   .bubble {

+ 34 - 19
src/views/app_beam_tube_inspection/picture/shuru.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div ref="testLine" style="width: 600px; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> <!--算法框-->
+    <div ref="testLine" style="width: 100%; height: 230px"></div>
+    <timeselect @getMsg="chooseDate" style="margin-left: 80%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>
@@ -25,6 +25,10 @@ export default {
   },
   data() {
     return {
+      interval0: null,
+      interval1: null,
+      interval2: null,
+      interval3: null,
       chooseDatetime: "0",
       currentChartId: 1,
       count: 0,
@@ -112,6 +116,8 @@ export default {
               color: "#fff",
               fontSize: 11,
               // rotate: 30,
+              rotate: 30,
+              padding: [0,-20,0,0],
             },
             axisTick: { show: false },
             boundaryGap: false,
@@ -122,7 +128,7 @@ export default {
           text: this.title,
           // left: 100,
           // top: 10,
-          padding: [15, 243],
+          padding: [15, 210],
           // x:'center',
           // y:'top',
           // textAlign:'center',
@@ -130,7 +136,7 @@ export default {
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",
-            fontSize: 22,
+            fontSize: 19,
           },
         },
         series: [
@@ -219,18 +225,21 @@ export default {
       this.count = 0;
       switch (value) {
         case "0":
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(1200, 1700));
-              time = time-1000*60*30;   //间隔30分钟
+              time = time-1000*60;   //间隔1分钟
             }
             first = 0;
           }
@@ -260,7 +269,7 @@ export default {
                 },
               ],
             });
-          }, 1000*60*30);
+          }, 1000*60);
           break;
         case "1":
           var first = 1;
@@ -269,12 +278,12 @@ export default {
             var data1 = [];
             let now =new Date();
             let time = now.getTime()    //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(1200, 1700));
-              time = time-1000*60*60;   //间隔60分钟
+              time = time-1000*60*2;   //间隔2分钟
             }
             first = 0;
           }
@@ -289,7 +298,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval0 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -304,22 +313,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60);
+          }, 1000*60*2);
           break;
         case "2":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 25; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(1200, 1700));
-              time = time-1000*60*60*24;   //
+              time = time-1000*60*60;   //间隔1小时
             }
             first = 0;
           }
@@ -334,7 +346,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval2 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -350,22 +362,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24);
+          }, 1000*60*60);
           break;
         case "3":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 22; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(1200, 1700));
-              time = time-1000*60*60*24*7;   //
+              time = time-1000*60*60*8;   //间隔8小时
             }
             first = 0;
           }
@@ -380,7 +395,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval3 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -396,7 +411,7 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24*7);
+          }, 1000*60*60*8);
           break;
       }
     },

+ 38 - 20
src/views/app_beam_tube_inspection/picture/xiaolv.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div ref="testLine" style="width: 600px; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> <!--算法框-->
+    <div ref="testLine" style="width: 100%; height: 230px"></div>
+    <timeselect @getMsg="chooseDate" style="margin-left: 80%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>
@@ -25,6 +25,10 @@ export default {
   },
   data() {
     return {
+      interval0: null,
+      interval1: null,
+      interval2: null,
+      interval3: null,
       chooseDatetime: "0",
       currentChartId: 1,
       count: 0,
@@ -107,6 +111,8 @@ export default {
               color: "#fff",
               fontSize: 11,
               // rotate: 30,
+              rotate: 30,
+              padding: [0,-20,0,0],
             },
             axisTick: { show: false },
             boundaryGap: false,
@@ -117,7 +123,7 @@ export default {
           text: this.title,
           // left: 100,
           // top: 10,
-          padding: [15, 264],
+          padding: [15, 230],
           // x:'center',
           // y:'top',
           // textAlign:'center',
@@ -125,7 +131,7 @@ export default {
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",
-            fontSize: 22,
+            fontSize: 19,
           },
         },
         series: [
@@ -214,18 +220,21 @@ export default {
       this.count = 0;
       switch (value) {
         case "0":
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(0.9, 1.0));
-              time = time-1000*60*30;   //间隔30分钟
+              time = time-1000*60;   //间隔1分钟
             }
             first = 0;
           }
@@ -240,7 +249,7 @@ export default {
             ],
           });
 
-          let interval = setInterval(() => {
+          this.interval0 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -255,21 +264,24 @@ export default {
                 },
               ],
             });
-          }, 1000*60*30);
+          }, 1000*60);
           break;
         case "1":
+          clearInterval(this.interval0);
+          clearInterval(this.interval2);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()    //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 31; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               xData.unshift(now1.toLocaleTimeString().replace(/^\D*/, ''))
               data1.push(this.getRandomNumWithDecimals(0.9, 1.0));
-              time = time-1000*60*60;   //间隔60分钟
+              time = time-1000*60*2;   //间隔2分钟
             }
             first = 0;
           }
@@ -284,7 +296,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval1 = setInterval(() => {
             xData.shift();
             xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
             data1.shift();
@@ -299,22 +311,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60);
+          }, 1000*60*2);
           break;
         case "2":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval3);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 25; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(0.9, 1.0));
-              time = time-1000*60*60*24;   //
+              time = time-1000*60*60;   //间隔1小时
             }
             first = 0;
           }
@@ -329,7 +344,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval2 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -345,22 +360,25 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24);
+          }, 1000*60*60);
           break;
         case "3":
+          clearInterval(this.interval0);
+          clearInterval(this.interval1);
+          clearInterval(this.interval2);
           var first = 1;
           if(first){
             var xData=[];
             var data1 = [];
             let now =new Date();
             let time = now.getTime()   //分钟
-            for (let i = 0; i < 5; i++) {
+            for (let i = 0; i < 22; i++) {
               let now1 = now.setTime(time);
               now1 = new Date(now1)
               let x = this.convertToDate(now1)
               xData.unshift(x)
               data1.push(this.getRandomNumWithDecimals(0.9, 1.0));
-              time = time-1000*60*60*24*7;   //
+              time = time-1000*60*60*8;   //间隔8小时
             }
             first = 0;
           }
@@ -375,7 +393,7 @@ export default {
             ],
           });
 
-          interval = setInterval(() => {
+          this.interval3 = setInterval(() => {
             xData.shift();
             let now =new Date();
             xData.push(this.convertToDate(now))
@@ -391,7 +409,7 @@ export default {
                 },
               ],
             });
-          }, 1000*60*60*24*7);
+          }, 1000*60*60*8);
           break;
       }
     },

+ 4 - 4
src/views/app_beam_tube_inspection/tiemselect.vue

@@ -19,16 +19,16 @@ export default {
     return {
       options: [{
         value: '0',
-        label: '半小时'
+        label: '半小时'
       }, {
         value: '1',
-        label: '一小时'
+        label: '一小时'
       }, {
         value: '2',
-        label: '一天'
+        label: '一天'
       }, {
         value: '3',
-        label: '一周'
+        label: '一周'
       }, ],
       value: '0'
     }