Merge branch 'mw2' of http://61.161.152.110:10101/r/electronic-map into sl

src/views/Decision/Decision1.vue

@@ -82,7 +82,7 @@
 									<td style="width: 50px;">
 										{{tableDataEnd.index}}
 									</td>
-									<td>
+									<td style="width:150px">
 										{{tableDataEnd.name}}
 									</td>
 									<td>
@@ -100,7 +100,7 @@
 									<td>
 										{{tableDataEnd.jhjx}}
 									</td>
-									<td>
+									<td style="width:80px">
 										{{tableDataEnd.sl}}
 									</td>
 									<td>
@@ -152,6 +152,7 @@
 						{
 							name: "名称",
 							field: "name",
+							width:'150px',
 							is_num: false,
 							is_light: false,
 						},
@@ -193,6 +194,7 @@
 						{
 							name: "受累",
 							field: "sl",
+							width:'80px',
 							is_num: false,
 							is_light: false,
 							sortable: true

src/views/Decision/Decision1Mx.vue

@@ -69,7 +69,7 @@
 				<el-row :type="'flex'" class="content">
 					<el-col :span="10" class="pd-r-8">
 						<toolbar-panel title="风机绩效榜明细" :showLine="false">
-							<bar-line-chart :height="'calc(100vh - 200px)'" :bardata="bardata" :lineData="lineData"
+							<bar-line-chart :height="'calc(100vh - 250px)'" :bardata="bardata" :lineData="lineData"
 								:color="barColor" lineName="理论发电量" />
 						</toolbar-panel>
 					</el-col>
@@ -82,7 +82,7 @@
 											<td>
 												{{tableDataEnd.index}}
 											</td>
-											<td>
+											<td style="width:150px">
 												{{tableDataEnd.name}}
 											</td>
 											<td>
@@ -173,6 +173,7 @@
 						{
 							name: "名称",
 							field: "name",
+							width: '150px',
 							is_num: false,
 							is_light: false,
 						},
@@ -302,7 +303,8 @@
 				value5: "",
 				barColor: [partten.getColor("purple"), partten.getColor("green"), partten.getColor("pink"), partten
 					.getColor("red"), partten.getColor("orange"), partten.getColor("grayl"), partten.getColor(
-					"yellow"), partten.getColor("gray"), partten.getColor("blue"), partten.getColor("cyan"), partten
+						"yellow"), partten.getColor("gray"), partten.getColor("blue"), partten.getColor("cyan"),
+					partten
 					.getColor("brown"), partten.getColor("mauve")
 				],
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
@@ -493,33 +495,54 @@
 			mxClick() {
 				this.$router.push("/decision/decision1")
 			},
-			formatJson (filterVal, jsonData) {
-			  return jsonData.map(v => filterVal.map(j => v[j]));
+			formatJson(filterVal, jsonData) {
+				return jsonData.map(v => filterVal.map(j => v[j]));
 			},
-			exportExcel () {
-			  let that = this;
-			  const { export_json_to_excel } = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
-			  let tHeader = []; // 上面设置Excel的表格第一行的标题       
-			  let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
-			
-			  that.tableData.column.forEach(ele => {
-			      tHeader.push(ele.name);
-			      filterVal.push(ele.field);
-			  });
-			
-			  var list = [];
-			  that.tableData.data.forEach((i,index) =>{
-				  list.push(i);
-			  })
-			  list.push(that.tableDataEnd)
-			  const data = that.formatJson(filterVal, list);
-			  export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
+			exportExcel() {
+				let that = this;
+				const {
+					export_json_to_excel
+				} = require('@tools/excel/Export2Excel.js'); // 注意这个Export2Excel路径      
+				let tHeader = []; // 上面设置Excel的表格第一行的标题       
+				let filterVal = []; // 上面的index、nickName、name是tableData里对象的属性key值
+
+				that.tableData.column.forEach(ele => {
+					tHeader.push(ele.name);
+					filterVal.push(ele.field);
+				});
+
+				var list = [];
+				that.tableData.data.forEach((i, index) => {
+					list.push(i);
+				})
+				list.push(that.tableDataEnd)
+				const data = that.formatJson(filterVal, list);
+				export_json_to_excel(tHeader, data, '导出的Excel'); // 最后一个是表名字
 			},
 		}
 	};
 </script>
 
 <style lang="less">
+	.contentMx::-webkit-scrollbar {
+		width: 200px;
+		height: 20px;
+	}
+
+	.contentMx::-webkit-scrollbar-track-piece {
+		background-color: rgba(255, 255, 255, 0.05);
+		-webkit-border-radius: 4px;
+	}
+
+	.contentMx::-webkit-scrollbar-thumb {
+		background-color: fade(@gray, 75);
+		-webkit-border-radius: 4px;
+		outline: none;
+		outline-offset: 0px;
+		border: none;
+	}
+
+
 	.decision-page-1 {
 		.com-panel .panel-title {
 			line-height: 3.4259vh;
@@ -557,7 +580,7 @@
 			overflow: auto;
 
 			tbody {
-				height: calc(100vh - 24.5vh);
+				height: calc(100vh - 31.5vh);
 			}
 
 			td {

src/views/HealthControl/Health6.vue

@@ -71,11 +71,11 @@
         <MultipleLineChart :list="statusData" :units="['']" :height="'250px'" />
       </panel>
       <div class="selections">
-        <div class="item" @click="changeStatus('1')" :class="{ active: status === '1' }">
-          <span>良好</span>
+        <div class="item" @click="changeStatus('1')" :class="{ green: status === '1' }">
+          良好
         </div>
-        <div class="item" @click="changeStatus('2')" :class="{ active: status === '2' }">
-          <span>注意</span>
+        <div class="item" @click="changeStatus('2')" :class="{ green: status === '2' }">
+          注意
         </div>
       </div>
     </div>
@@ -84,7 +84,7 @@
 
 <script>
 import BarLineChart from "../../components/chart/combination/bar-line-chart.vue";
-import MultipleLineChart from "../../components/chart/line/multiple-line-chart.vue";
+import MultipleLineChart from "../../components/chart/line/double-line-chart.vue";
 import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 import Col from "../../components/coms/grid/col.vue";
 import Row from "../../components/coms/grid/row.vue";
@@ -216,20 +216,19 @@ export default {
           let statusData = [];
 
           const time = res.data.time;
-
           for (let key in res.data) {
             if (key !== "name" && key !== "time") {
               let item = res.data[key];
-
+				
               let statusItem = {
                 title: res.data.name[0][key],
-                yAxisIndex: 0,
+				smooth:true,
                 value: [],
               };
 
               time.forEach((text, index) => {
                 statusItem.value.push({
-                  text: res.data.name[0][key],
+                  text: text,
                   value: item[index],
                 });
               });
@@ -268,27 +267,31 @@ export default {
       top: 0;
       width: 50%;
       justify-content: flex-end;
-
+color: @gray;
       .item {
-        flex: 0 0 80px;
-        text-align: center;
-        line-height: 33px;
-        margin-right: 8px;
-        color: @font-color;
-        font-size: @fontsize-s;
-        background: fade(@gray, 20);
-        border: 1px solid fade(@gray, 20);
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-
+		  margin-right: 15px;
+		  cursor: pointer;
+        // flex: 0 0 80px;
+        // text-align: center;
+        // line-height: 33px;
+        // margin-right: 8px;
+        // color: @font-color;
+        // font-size: @fontsize-s;
+        // background: fade(@gray, 20);
+        // border: 1px solid fade(@gray, 20);
+        // display: flex;
+        // justify-content: center;
+        // align-items: center;
+        // cursor: pointer;
+		.green{
+			color: @green;
+		}
         &:hover,
         &.active {
-          background: fade(@green, 20);
-          border: 1px solid @green;
+          // background: fade(@green, 20);
+          // border: 1px solid @green;
           color: @green;
-          cursor: pointer;
+          // cursor: pointer;
 
           i svg use {
             fill: @green;
@@ -348,7 +351,6 @@ export default {
         display: flex;
         height: 32px;
         align-items: center;
-
         .dot {
           width: 8px;
           height: 8px;

src/views/NewPages/personnel.vue

@@ -326,7 +326,7 @@ export default {
         const url = require(`@assets/person/${v}.jpg`);
         return url;
       } catch (error) {
-        return require("@assets/logo.png");
+        return require("@assets/userhead.jpg");
       }
     },
     clickBtn(btn, index) {