修改样式；值际操作指令list的合并单元格未完成，数据已填充

src/router/index.js

@@ -120,18 +120,22 @@ const routes = [
       name: 'decision2Xldb',
       component: () => import(/* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
     },
-  
   {
-    path: '/decision/decision3',
+    path: '/decision/decision3',//性能对标
     name: 'decision3',
     component: () => import(/* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
   },
   {
-    path: '/decision/decision4',
+    path: '/decision/decision4',//值际对标
     name: 'decision4',
     component: () => import(/* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
   },
   {
+    path: '/decision/decision4czzl',//操作指令统计
+    name: 'decision4czzl',
+    component: () => import(/* webpackChunkName: "decision4czzl" */ '../views/Decision/Decision4Czzl.vue'),
+  },
+  {
     path: '/health',
     name: 'health',
     component: () => import('../views/HealthControl/Health.vue'),

src/views/Decision/Decision2.vue

@@ -56,11 +56,12 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-		<toolbar-panel title="风机绩效榜" :showLine="false">
 		
 		<div v-show="detailShow==1">
+			<toolbar-panel title="风机绩效榜" :showLine="false"></toolbar-panel>
 			<div class="mg-b-16">
 				<div class="project-table">
 					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
@@ -99,7 +100,6 @@
 				</panel>
 			</el-col>
 		</el-row>
-		</toolbar-panel>
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -953,6 +953,9 @@
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back(){
+				this.detailShow = 1;
 			}
 		}
 	};

src/views/Decision/Decision2Cjdb.vue

@@ -36,44 +36,45 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-		<toolbar-panel title="场际对标" :showLine="false">
-			<div v-show="detailShow==1">
-				<div class="mg-b-16">
-					<div class="project-table">
-						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
-					</div>
-				</div>
-				<el-row class="mg-b-16">
-					<el-col :span="12">
-						<panel title="发电量占比">
-							<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
-						</panel>
-					</el-col>
-					<el-col :span="12">
-						<panel title="各场站损失电量占比">
-							<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
-						</panel>
-					</el-col>
-				</el-row>
-				<div>
-					<panel title="损失电量分析">
-						<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-							:units='["(万KWh)"]' />
-					</panel>
+		<div v-show="detailShow==1">
+			<toolbar-panel title="场际对标" :showLine="false"></toolbar-panel>
+			<div class="mg-b-16">
+				<div class="project-table">
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
-			<el-row :type="'flex'" class="content" v-show="detailShow==2">
-				<el-col :span="24" class="pd-l-8">
-					<panel :title="'风机对标列表明细'" :showLine="false">
-						<div class="project-table">
-							<Table :data="tableDataDetail"></Table>
-						</div>
+			<el-row class="mg-b-16">
+				<el-col :span="12">
+					<panel title="发电量占比">
+						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+					</panel>
+				</el-col>
+				<el-col :span="12">
+					<panel title="各场站损失电量占比">
+						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
 					</panel>
 				</el-col>
 			</el-row>
-		</toolbar-panel>
+			<div>
+				<panel title="损失电量分析">
+					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+						:units='["(万KWh)"]' />
+				</panel>
+			</div>
+		</div>
+		<el-row :type="'flex'" class="content" v-show="detailShow==2">
+			<el-col :span="24" class="pd-l-8">
+				<panel :title="'风机对标列表明细'" :showLine="false">
+					<div class="project-table">
+						<Table :data="tableDataDetail"></Table>
+					</div>
+				</panel>
+			</el-col>
+		</el-row>
+
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -879,6 +880,9 @@
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};

src/views/Decision/Decision2Cndb.vue

@@ -36,34 +36,35 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-		<toolbar-panel title="场内对标" :showLine="false">
-			<div v-show="detailShow==1">
-				<div class="mg-b-16">
-					<div class="project-table">
-						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
-					</div>
+		<div v-show="detailShow==1">
+			<toolbar-panel title="场内对标" :showLine="false"></toolbar-panel>
+			<div class="mg-b-16">
+				<div class="project-table">
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
-				<el-row :type="'flex'" class="content">
-					<el-col :span="24" class="pd-l-8">
-						<panel title="损失电量分析">
-							<multiple-bar-chart height="400px" :list="analyis" :customerTooltip="true"
-								@tooltip="tooltip" :units='["(万KWh)"]' />
-						</panel>
-					</el-col>
-				</el-row>
 			</div>
-			<el-row :type="'flex'" class="content" v-show="detailShow==2">
+			<el-row :type="'flex'" class="content">
 				<el-col :span="24" class="pd-l-8">
-					<panel :title="'风机对标列表明细'" :showLine="false">
-						<div class="project-table">
-							<Table :data="tableDataDetail"></Table>
-						</div>
+					<panel title="损失电量分析">
+						<multiple-bar-chart height="400px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+							:units='["(万KWh)"]' />
 					</panel>
 				</el-col>
 			</el-row>
-		</toolbar-panel>
+		</div>
+		<el-row :type="'flex'" class="content" v-show="detailShow==2">
+			<el-col :span="24" class="pd-l-8">
+				<panel :title="'风机对标列表明细'" :showLine="false">
+					<div class="project-table">
+						<Table :data="tableDataDetail"></Table>
+					</div>
+				</panel>
+			</el-col>
+		</el-row>
+
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -839,6 +840,9 @@
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};

src/views/Decision/Decision2Xldb.vue

@@ -56,44 +56,45 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-		<toolbar-panel title="线路对标" :showLine="false">
-			<div v-show="detailShow==1">
-				<div class="mg-b-16">
-					<div class="project-table">
-						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
-					</div>
-				</div>
-				<el-row class="mg-b-16">
-					<el-col :span="12">
-						<panel title="发电量占比">
-							<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
-						</panel>
-					</el-col>
-					<el-col :span="12">
-						<panel title="各场站损失电量占比">
-							<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
-						</panel>
-					</el-col>
-				</el-row>
-				<div>
-					<panel title="损失电量分析">
-						<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-							:units='["(万KWh)"]' />
-					</panel>
+		<div v-show="detailShow==1">
+			<toolbar-panel title="线路对标" :showLine="false"></toolbar-panel>
+			<div class="mg-b-16">
+				<div class="project-table">
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
-			<el-row :type="'flex'" class="content" v-show="detailShow==2">
-				<el-col :span="24" class="pd-l-8">
-					<panel :title="'风机对标列表明细'" :showLine="false">
-						<div class="project-table">
-							<Table :data="tableDataDetail"></Table>
-						</div>
+			<el-row class="mg-b-16">
+				<el-col :span="12">
+					<panel title="发电量占比">
+						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+					</panel>
+				</el-col>
+				<el-col :span="12">
+					<panel title="各场站损失电量占比">
+						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
 					</panel>
 				</el-col>
 			</el-row>
-		</toolbar-panel>
+			<div>
+				<panel title="损失电量分析">
+					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+						:units='["(万KWh)"]' />
+				</panel>
+			</div>
+		</div>
+		<el-row :type="'flex'" class="content" v-show="detailShow==2">
+			<el-col :span="24" class="pd-l-8">
+				<panel :title="'风机对标列表明细'" :showLine="false">
+					<div class="project-table">
+						<Table :data="tableDataDetail"></Table>
+					</div>
+				</panel>
+			</el-col>
+		</el-row>
+
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -968,6 +969,9 @@
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};

src/views/Decision/Decision2Xmdb.vue

@@ -46,44 +46,45 @@
 				<button class="btn green">搜索</button>
 				<button class="btn" @click="dbfx">对标分析</button>
 				<button class="btn">导出</button>
+				<button class="btn" v-show="detailShow==2" @click="back">返回</button>
 			</div>
 		</div>
-		<toolbar-panel title="项目对标" :showLine="false">
-			<div v-show="detailShow==1">
-				<div class="mg-b-16">
-					<div class="project-table">
-						<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
-					</div>
-				</div>
-				<el-row class="mg-b-16">
-					<el-col :span="12">
-						<panel title="发电量占比">
-							<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
-						</panel>
-					</el-col>
-					<el-col :span="12">
-						<panel title="各场站损失电量占比">
-							<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
-						</panel>
-					</el-col>
-				</el-row>
-				<div>
-					<panel title="损失电量分析">
-						<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
-							:units='["(万KWh)"]' />
-					</panel>
+		<div v-show="detailShow==1">
+			<toolbar-panel title="项目对标" :showLine="false"></toolbar-panel>
+			<div class="mg-b-16">
+				<div class="project-table">
+					<Table :data="tableData" :canScroll="false" ref="curRef"></Table>
 				</div>
 			</div>
-			<el-row :type="'flex'" class="content" v-show="detailShow==2">
-				<el-col :span="24" class="pd-l-8">
-					<panel :title="'风机对标列表明细'" :showLine="false">
-						<div class="project-table">
-							<Table :data="tableDataDetail"></Table>
-						</div>
+			<el-row class="mg-b-16">
+				<el-col :span="12">
+					<panel title="发电量占比">
+						<dual-pie-chart height="21.296vh" :innerData="innerFdl" :outerData="outerFdl" />
+					</panel>
+				</el-col>
+				<el-col :span="12">
+					<panel title="各场站损失电量占比">
+						<dual-pie-chart height="21.296vh" :innerData="innerCz" :outerData="outerCz" />
 					</panel>
 				</el-col>
 			</el-row>
-		</toolbar-panel>
+			<div>
+				<panel title="损失电量分析">
+					<multiple-bar-chart height="300px" :list="analyis" :customerTooltip="true" @tooltip="tooltip"
+						:units='["(万KWh)"]' />
+				</panel>
+			</div>
+		</div>
+		<el-row :type="'flex'" class="content" v-show="detailShow==2">
+			<el-col :span="24" class="pd-l-8">
+				<panel :title="'风机对标列表明细'" :showLine="false">
+					<div class="project-table">
+						<Table :data="tableDataDetail"></Table>
+					</div>
+				</panel>
+			</el-col>
+		</el-row>
+
 		<el-dialog title="对标排名分析" v-model="dialogVisible" width="70%" top="10vh" custom-class="modal"
 			:close-on-click-modal="false">
 			<dayinfo :radarValue="radarValue" :windNum="windNum" :windNum2="windNum2" :tabs="tabs"
@@ -918,6 +919,9 @@
 				this.$refs.curRef.clearCheckBox();
 				this.tableId = [];
 				this.checkLength = 0;
+			},
+			back() {
+				this.detailShow = 1;
 			}
 		}
 	};

src/views/Decision/Decision4.vue

@@ -1,301 +1,235 @@
 <template>
-  <div class="decision-page-4">
-    <!-- 查询样式统一处理 样式在 assets/styles/form.less 文件中 -->
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select v-model="value1" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">项目：</div>
-          <div class="search-input">
-            <el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">线路：</div>
-          <div class="search-input">
-            <el-select v-model="value3" multiple placeholder="请选择" popper-class="select">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker v-model="value4" type="date" placeholder="选择日期" popper-class="date-select"> </el-date-picker>
-            <!-- <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="'svg-arrow-down'" />
-            </div> -->
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker v-model="value5" type="date" placeholder="选择日期" popper-class="date-select"> </el-date-picker>
-            <div class="unit svg-icon svg-icon-gray">
-              <svg-icon :svgid="''" />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions">
-        <button class="btn green">搜索</button>
-        <button class="btn">明细信息</button>
-        <button class="btn">导出</button>
-      </div>
-    </div>
-    <div class="actions mg-b-8">
-      <button class="btn green">风场</button>
-      <button class="btn">项目</button>
-      <button class="btn">集电线路</button>
-    </div>
-    <div class="mg-b-16">
-      <div class="project-table">
-        <Table :data="tableData"></Table>
-      </div>
-    </div>
-    <div>
-      <panel title=""> </panel>
-
-      <toolbar-panel :title="'日度损失电量分析'">
-        <template v-slot:tools>
-          <div class="tools">
-            <div class="tool-block">
-              <div class="legend bg-green"></div>
-              <div class="legend-text">理论功率</div>
-            </div>
-            <div class="tool-block">
-              <div class="legend bg-orange"></div>
-              <div class="legend-text">预测功率4小时</div>
-            </div>
-          </div>
-        </template>
-        <multiple-bar-chart height="240px" />
-      </toolbar-panel>
-    </div>
-  </div>
+	<div class="decision-page-4">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				
+				<div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value4" @change="BeginChange(value4)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value5" @change="EndChange(value5)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+						<div class="unit svg-icon svg-icon-gray">
+							<svg-icon :svgid="''" />
+						</div>
+					</div>
+				</div>
+				
+			</div>
+		</div>
+		
+		<div class="mg-b-16">
+			<div class="project-table">
+				<Table :data="tableData"></Table>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
-import SvgIcon from "../../components/coms/icon/svg-icon.vue";
-import Panel from "../../components/coms/panel/panel.vue";
-import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
-import Table from "../../components/coms/table/table.vue";
-export default {
-  components: { Panel, Table, SvgIcon, MultipleBarChart, ToolbarPanel },
-  data() {
-    return {
-      tableData: {
-        column: [
-          {
-            name: "",
-            field: "index",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "",
-            field: "check",
-            is_num: false,
-            is_light: false,
-            template: function() {
-              return "<input class='check' type='CheckBox' >";
-            },
-          },
-          {
-            name: "名称",
-            field: "name",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "理论发电量",
-            field: "lqf",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "SCADA发电量",
-            field: "yggl",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "风速",
-            field: "yyy",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "非计划检修",
-            field: "pcspp",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "计划检修",
-            field: "u1",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "受累",
-            field: "u2",
-            is_num: false,
-            is_light: true,
-          },
-          {
-            name: "限电",
-            field: "v1",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "性能",
-            field: "v2",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "风能率用率%",
-            field: "w1",
-            is_num: false,
-            is_light: false,
-          },
-        ],
-        data: [
-          {
-            index: 1,
-            name: "MG01-01",
-            lqf: "0.1000",
-            yggl: "0.1000",
-            yyy: "0.10",
-            pcspp: "0.1000",
-            u1: "0.1000",
-            u2: "0.1000",
-            v1: "0.1000",
-            v2: "0.1000",
-            w1: "0.1000",
-            w2: "0.1000",
-            zca: "0.1000",
-            zcb: "0.1000",
-            clx: "0.1000",
-            clx1: "0.1000",
-            clx2: "0.1000",
-            jc: "0.1000",
-            hh: "0.1000",
-            hj: "0.1000",
-            is_light: false,
-          },
-        ],
-      },
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
-      value1: [],
-      value2: [],
-      value3: [],
-      value4: "",
-      value5: "",
-    };
-  },
-  created() {
-    for (let i = 1; i < 50; i++) {
-      this.tableData.data.push(JSON.parse(JSON.stringify(this.tableData.data[0])));
-      this.tableData.data[i].index = i + 1;
-    }
-  },
-};
+	import MultipleBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
+	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
+	import Panel from "../../components/coms/panel/panel.vue";
+	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
+	import Table from "../../components/coms/table/table.vue";
+	export default {
+		components: {
+			Panel,
+			Table,
+			SvgIcon,
+			MultipleBarChart,
+			ToolbarPanel
+		},
+		data() {
+			return {
+				tableData: {
+					column: [{
+							name: "",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "值际",
+							field: "dutyname",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "理论发电量",
+							field: "theoreticalgeneratity",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "实际发电量",
+							field: "generatity",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "故障损失",
+							field: "faultloss",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "维护损失",
+							field: "mainloss",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "性能损失",
+							field: "performanceloss",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "限电损失",
+							field: "rationingloss",
+							is_num: false,
+							is_light: true,
+						},
+						{
+							name: "受累损失",
+							field: "involvesloss",
+							is_num: false,
+							is_light: false,
+						}
+					],
+					data: []
+				},
+				value4: "",
+				value5: "",
+			};
+		},
+		created() {
+			this.value4 = this.getTime(1);
+			this.value5 = this.getTime(2);
+			this.AjaxCommon();
+		},
+		methods: {
+			BeginChange(val) {
+				this.value4 = val;
+				this.AjaxCommon();
+			},
+			EndChange(val) {
+				this.value5 = val;
+				this.AjaxCommon();
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			AjaxCommon() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL : "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/zjwxssl",
+					data: {
+						beginDate: that.value4,
+						endDate: that.value5,
+					},
+					success(res) {
+						var data = [];
+						
+						res.data.forEach((item, index) => {
+							data.push({
+								index: index + 1,
+								dutyname: item.dutyname,
+								theoreticalgeneratity: item.theoreticalgeneratity,
+								generatity: item.generatity,
+								faultloss: item.faultloss,
+								mainloss: item.mainloss,
+								performanceloss: item.performanceloss,
+								rationingloss: item.rationingloss,
+								involvesloss: item.involvesloss,
+								is_light: false
+							})
+						})
+						that.tableData.data = data;
+					}
+				});
+			},
+		}
+	};
 </script>
 
 <style lang="less">
-.decision-page-4 {
-  .com-panel {
-    .panel-title {
-      color: @gray-l;
-    }
-    .tools {
-      display: flex;
+	.decision-page-4 {
+		.com-panel {
+			.panel-title {
+				color: @gray-l;
+			}
+
+			.tools {
+				display: flex;
+
+				.tool-block {
+					display: flex;
+					align-items: center;
+					margin-left: 0.741vh;
 
-      .tool-block {
-        display: flex;
-        align-items: center;
-        margin-left: 0.741vh;
+					.legend {
+						flex: auto;
+						width: 0.741vh;
+						height: 0.741vh;
+						margin-right: 0.741vh;
 
-        .legend {
-          flex: auto;
-          width: 0.741vh;
-          height: 0.741vh;
-          margin-right: 0.741vh;
+						&.long {
+							width: 2.963vh;
+							height: 0.37vh;
+						}
+					}
 
-          &.long {
-            width: 2.963vh;
-            height: 0.37vh;
-          }
-        }
+					.legend-text {
+						color: @gray-l;
+						font-size: @fontsize-s;
+					}
+				}
+			}
+		}
 
-        .legend-text {
-          color: @gray-l;
-          font-size: @fontsize-s;
-        }
-      }
-    }
-  }
+		.project-table {
+			overflow: auto;
+			height:90vh;
+			tbody {
+				// height: 100vh;
+			}
 
-  .project-table {
-    overflow: auto;
+			th,
+			td {
+				color: #b2bdc0;
 
-    tbody {
-      height: 400px;
-    }
+				&:nth-child(1) {
+					width: 50px;
+				}
 
-    th,
-    td {
-      color: #b2bdc0;
-      &:nth-child(1) {
-        width: 50px;
-      }
-      &:nth-child(2) {
-        width: 50px;
-      }
-    }
-  }
-}
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+	}
 </style>

src/views/Decision/Decision4Czzl.vue

@@ -0,0 +1,369 @@
+<template>
+	<div class="decision-page-4">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">开始日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value4" @change="BeginChange(value4)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">结束日期：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value5" @change="EndChange(value5)" type="date"
+							value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
+						</el-date-picker>
+						<div class="unit svg-icon svg-icon-gray">
+							<svg-icon :svgid="''" />
+						</div>
+					</div>
+				</div>
+
+			</div>
+		</div>
+
+		<div class="mg-b-16">
+			<div class="project-table">
+				<Table :data="tableData"></Table>
+			</div>
+		</div>
+
+		<el-dialog :title="'操作：' + tabsTit" v-model="dialogVisible" width="20%" top="10vh" custom-class="modal"
+			:close-on-click-modal="false">
+			<div class="health-day-info">
+				<div class="body">
+					<div class="left">
+						<table class="table-form">
+							<tr>
+								<td class="white">风机</td>
+								<td class="white">时间</td>
+							</tr>
+							<tr v-for="item in tabs">
+								<td class="white">{{item.wtid}}</td>
+								<td class="white">{{item.time.substr(0, 10)}}</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
+		</el-dialog>
+		<!-- 点击哪个显示哪个的操作记录 -->
+	</div>
+</template>
+
+<script>
+	import SvgIcon from "../../components/coms/icon/svg-icon.vue";
+	import Panel from "../../components/coms/panel/panel.vue";
+	import Table from "../../components/coms/table/table.vue";
+	export default {
+		components: {
+			Panel,
+			Table,
+			SvgIcon
+		},
+		data() {
+			let that = this;
+			return {
+				tableData: {
+					column: [{
+							name: "",
+							field: "index",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "值际",
+							field: "nameOfDuty",
+							is_num: false,
+							is_light: false,
+						},
+						{
+							name: "启动",
+							field: "startCount",
+							is_num: false,
+							is_light: false,
+							param: 1,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "停机",
+							field: "stopCount",
+							is_num: false,
+							is_light: false,
+							param: 2,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "复位",
+							field: "resetCount",
+							is_num: false,
+							is_light: false,
+							param: 3,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "维护",
+							field: "maintainCount",
+							is_num: false,
+							is_light: false,
+							param: 4,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "取消维护",
+							field: "unmaintainCount",
+							is_num: false,
+							is_light: false,
+							param: 5,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "挂牌检修",
+							field: "gpmaintainCount",
+							is_num: false,
+							is_light: true,
+							param: 6,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						},
+						{
+							name: "故障维修",
+							field: "gpfaultCount",
+							is_num: false,
+							is_light: false,
+							param: 7,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场内受累检修",
+							field: "gponsiteinvolvementMaintainCount",
+							is_num: false,
+							is_light: false,
+							param: 8,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场内受累故障",
+							field: "gponsiteinvolvementFaultCount",
+							is_num: false,
+							is_light: false,
+							param: 9,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场外受累电网",
+							field: "gpoffsiteaffectedgridCount",
+							is_num: false,
+							is_light: false,
+							param: 10,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "场外受累天气",
+							field: "gpweatherOutsideCount",
+							is_num: false,
+							is_light: false,
+							param: 11,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}, {
+							name: "取消挂牌",
+							field: "ungpCount",
+							is_num: false,
+							is_light: false,
+							param: 12,
+							click: function(event, data) {
+								that.ajaxClick(data.nameOfDuty, this.param)
+							}
+						}
+					],
+					data: []
+				},
+				value4: "",
+				value5: "",
+				dialogVisible: false,
+				tabs: [],
+				tabsTit: "",
+				tabsArr: ['启动', '停机', '复位', '维护', '取消维护', '挂牌检修', '故障维修', '场内受累检修', '场内受累故障', '场外受累电网', '场外受累天气', '取消挂牌'],
+			};
+		},
+		created() {
+			this.value4 = this.getTime(1);
+			this.value5 = this.getTime(2);
+			this.AjaxCommon();
+		},
+		methods: {
+			BeginChange(val) {
+				this.value4 = val;
+				this.AjaxCommon();
+			},
+			EndChange(val) {
+				this.value5 = val;
+				this.AjaxCommon();
+			},
+			getTime(val) { //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
+				var date = new Date();
+				var year = date.getFullYear(),
+					month = date.getMonth() + 1,
+					day = date.getDate();
+				month >= 1 && month <= 9 ? (month = '0' + month) : '';
+				day >= 0 && day <= 9 ? (day = '0' + day) : '';
+				var begin = year + '-' + month + '-01';
+				var end = year + '-' + month + '-' + day;
+				if (val == 1) {
+					return begin;
+				} else if (val == 2) {
+					return end;
+				}
+			},
+			AjaxCommon() {
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/zjlist",
+					data: {
+						beginDate: that.value4,
+						endDate: that.value5,
+					},
+					success(res) {
+						var data = [];
+						res.data.forEach((item, index) => {
+							data.push({
+								index: index + 1,
+								nameOfDuty: item.nameOfDuty,
+								startCount: item.startCount,
+								stopCount: item.stopCount,
+								resetCount: item.resetCount,
+								maintainCount: item.maintainCount,
+								unmaintainCount: item.unmaintainCount,
+								gpmaintainCount: item.gpmaintainCount,
+								gpfaultCount: item.gpfaultCount,
+								gponsiteinvolvementMaintainCount: item.gponsiteinvolvementMaintainCount,
+								gponsiteinvolvementFaultCount: item.gponsiteinvolvementFaultCount,
+								gpoffsiteaffectedgridCount: item.gpoffsiteaffectedgridCount,
+								gpweatherOutsideCount: item.gpweatherOutsideCount,
+								ungpCount: item.ungpCount,
+								is_light: false
+							})
+						})
+						that.tableData.data = data;
+					}
+				});
+			},
+			ajaxClick(dutyname, direct) {
+				var that = this;
+				that.tabsTit = that.tabsArr[direct - 1];
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/zjdrill",
+					data: {
+						beginDate: that.value4,
+						endDate: that.value5,
+						dutyname: dutyname,
+						direct: direct,
+					},
+					success(res) {
+						if(res.data.length){
+							that.tabs = res.data;
+						}else{
+							that.tabs=[{wtid:'暂无数据',time:'暂无数据'}];
+						}
+						that.dialogVisible = true;
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.decision-page-4 {
+		.com-panel {
+			.panel-title {
+				color: @gray-l;
+			}
+
+			.tools {
+				display: flex;
+
+				.tool-block {
+					display: flex;
+					align-items: center;
+					margin-left: 0.741vh;
+
+					.legend {
+						flex: auto;
+						width: 0.741vh;
+						height: 0.741vh;
+						margin-right: 0.741vh;
+
+						&.long {
+							width: 2.963vh;
+							height: 0.37vh;
+						}
+					}
+
+					.legend-text {
+						color: @gray-l;
+						font-size: @fontsize-s;
+					}
+				}
+			}
+		}
+
+		.project-table {
+			overflow: auto;
+			height: 90vh;
+
+			tbody {
+				// height: 100vh;
+			}
+
+			th,
+			td {
+				color: #b2bdc0;
+
+				&:nth-child(1) {
+					width: 50px;
+				}
+
+				&:nth-child(2) {
+					width: 50px;
+				}
+			}
+		}
+
+		.action {
+			text-decoration: underline;
+			color: @green;
+			cursor: pointer;
+		}
+
+		.health-day-info .left {
+			max-height: 75vh;
+			overflow: auto;
+		}
+		
+	}
+</style>

src/views/HealthControl/HealthDay.vue

@@ -101,21 +101,21 @@
 							},
 						},
 						{
-							name: "名称",
+							name: "风机编号",
 							field: "name",
 							is_num: false,
 							is_light: false,
 						},
 						{
-							name: "综合排名",
-							field: "zhpm",
+							name: "等级",
+							field: "dj",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "发电量排名",
-							field: "fdlpm",
+							name: "综合排名",
+							field: "zhpm",
 							is_num: false,
 							is_light: false,
 							sortable: true,
@@ -128,203 +128,102 @@
 							sortable: true,
 						},
 						{
-							name: "故障损失电量排名",
-							field: "gzssdlpm",
+							name: "理论发电量",
+							field: "llfdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "故障损失电量",
-							field: "gzssdl",
+							name: "平均风速",
+							field: "pjfs",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量排名",
-							field: "jxssdlpm",
+							name: "平均功率",
+							field: "pjgl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "检修损失电量",
-							field: "jxssdl",
+							name: "故障损失电量",
+							field: "gzssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量排名",
-							field: "xnssdlpm",
+							name: "限电损失电量",
+							field: "xdssdl",
 							is_num: false,
 							is_light: true,
 							sortable: true,
 						},
 						{
-							name: "性能损失电量",
-							field: "xnssdl",
+							name: "维护损失电量",
+							field: "whssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量排名",
-							field: "xdssdlpm",
+							name: "性能损失电量",
+							field: "xnssdl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},
 						{
-							name: "限电损失电量",
-							field: "xdssdl",
+							name: "利用小时数",
+							field: "lyxss",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量排名",
-							field: "slssdlpm",
+							name: "拟合优度",
+							field: "nhyd",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "受累损失电量",
-							field: "slssdl",
+							name: "设备可利用率",
+							field: "sbklyl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "风能利用率排名",
-							field: "fnlylpm",
+							name: "等效可用系数",
+							field: "dxkyxs",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "风能利用率(%)",
-							field: "fnlyl",
+							name: "有效风时数",
+							field: "yxfss",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						},{
-							name: "故障损失率排名",
-							field: "gzsslpm",
+							name: "平均切入风速",
+							field: "pjqrfs",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "故障损失率(%)",
-							field: "gzssl",
+							name: "静风频率",
+							field: "jfpl",
 							is_num: false,
 							is_light: false,
 							sortable: true,
 						}, {
-							name: "检修损失率排名",
-							field: "jxsslpm",
+							name: "功率一致性系数",
+							field: "glyzxxs",
 							is_num: false,
 							is_light: false,
 							sortable: true,
-						}, {
-							name: "检修损失率(%)",
-							field: "jxssl",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "弃风率排名",
-							field: "qflpm",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "弃风率(%)",
-							field: "qfl",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "性能损失率排名",
-							field: "xnsslpm",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "性能损失率(%)",
-							field: "xnssl",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "受累损失率排名",
-							field: "slsslpm",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "受累损失率(%)",
-							field: "slssl",
-							is_num: false,
-							is_light: false,
-							sortable: true,
-						}, {
-							name: "操作",
-							field: "cz",
-							is_num: false,
-							is_light: false,
-							template: function() {
-								return "<a class='action'>详情</a>";
-							},
-							click: function(event, data) {
-								var dataId = that.tableIdArr[data.index - 1];
-								// var that = this;
-								that.API.requestData({
-									method: "GET",
-									baseURL : "10.155.32.4:8034",
-									subUrl: "evaluation/details",
-									data: {
-										id: dataId,
-										beginDate: that.value4,
-										endDate: that.value5,
-										target: '',
-										sort: ''
-									},
-									success(res) {
-										var dataTab = [];
-										res.data.forEach((item, index) => {
-											that.tableIdArr.push(item.id);
-
-											dataTab.push({ //表格
-												index: index + 1,
-												name: item.name,
-												zhpm: item.zhpm,
-												gzssdl: item.gzssdl,
-												jxssdlpm: item.jxssdlpm,
-												jxssdl: item.jxssdl,
-												xnssdlpm: item.xnssdlpm,
-												xnssdl: item.xnssdl,
-												xdssdlpm: item.xdssdlpm,
-												xdssdl: item.xdssdl,
-												slssdlpm: item.slssdlpm,
-												slssdl: item.slssdl,
-												fnlylpm: item.fnlylpm,
-												fnlyl: item.fnlyl,
-												gzsslpm: item.gzsslpm,
-												gzssl: item.gzssl,
-												jxsslpm: item.jxsslpm,
-												jxssl: item.jxssl,
-												qflpm: item.qflpm,
-												qfl: item.qfl,
-												xnsslpm: item.xnsslpm,
-												xnssl: item.xnssl,
-												slsslpm: item.slsslpm,
-												slssl: item.slssl,
-												is_light: false
-											})
-										})
-										that.tableDataDetail.data = dataTab;
-									}
-								});
-							}
 						}
 					],
 					data: [],
@@ -355,10 +254,7 @@
 				that.API.requestData({
 					method: "GET",
 					baseURL : "10.155.32.4:8034",
-					subUrl: "evaluation/sourceList",
-					data: {
-						wpids: val
-					},
+					subUrl: "evaluation/modelMainList",
 					success(res) {
 						console.log(JSON.stringify(res))
 						that.MoKuai = res.data;
@@ -434,24 +330,24 @@
 							dataTab.push({ //表格
 								index: index + 1,
 								name: item.name,
+								dj: item.dj,
 								zhpm: item.zhpm,
-								fdlpm: item.fdlpm,
 								fdl: item.fdl,
-								gzssdlpm: item.gzssdlpm,
+								llfdl: item.llfdl,
+								pjfs: item.gzssdl,
+								pjgl: item.pjgl,
 								gzssdl: item.gzssdl,
-								jxssdlpm: item.jxssdlpm,
-								jxssdl: item.jxssdl,
-								xnssdlpm: item.xnssdlpm,
+								lyxss: item.lyxss,
+								whssdl: item.whssdl,
 								xnssdl: item.xnssdl,
-								xdssdlpm: item.xdssdlpm,
-								xdssdl: item.xdssdl,
-								slssdlpm: item.slssdlpm,
-								slssdl: item.slssdl,
-								fnlylpm: item.fnlylpm,
-								fnlyl: item.fnlyl,
-								gzsslpm: item.gzsslpm,
-								gzssl: item.gzssl,
-								jxsslpm: item.jxsslpm,
+								lyxss: item.lyxss,
+								nhyd: item.nhyd,
+								sbklyl: item.sbklyl,
+								dxkyxs: item.dxkyxs,
+								yxfss: item.yxfss,
+								pjqrfs: item.pjqrfs,
+								jfpl: item.jfpl,
+								glyzxxs: item.glyzxxs,
 								jxssl: item.jxssl,
 								qflpm: item.qflpm,
 								qfl: item.qfl,