Browse Source

添加发电量

mw_666 3 years ago
parent
commit
cef48d168f

+ 9 - 1
src/views/Decision/Decision2.vue

@@ -113,7 +113,7 @@
 	import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 	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";
+	import Table from "./table.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
@@ -363,6 +363,7 @@
 
 											dataTab.push({ //表格
 												index: index + 1,
+												fdl:item.fdl,
 												name: item.name,
 												zhpm: item.zhpm,
 												gzssdl: item.gzssdl,
@@ -406,6 +407,13 @@
 						},
 						{
 							name: "",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							display:"none",
+						},
+						{
+							name: "",
 							field: "check",
 							is_num: false,
 							is_light: false,

+ 10 - 2
src/views/Decision/Decision2Cjdb.vue

@@ -88,7 +88,7 @@
 	import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 	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";
+	import Table from "./table.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
@@ -343,6 +343,7 @@
 											that.tableIdArr.push(item.id);
 											dataTab.push({ //表格
 												index: index + 1,
+												fdl:item.fdl,
 												name: item.name,
 												zhpm: item.zhpm,
 												gzssdl: item.gzssdl,
@@ -386,6 +387,13 @@
 						},
 						{
 							name: "",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							display:"none",
+						},
+						{
+							name: "",
 							field: "check",
 							is_num: false,
 							is_light: false,
@@ -648,10 +656,10 @@
 							that.tableIdArr.push(item.id);
 							dataTab.push({ //表格
 								index: index + 1,
+								fdl: item.fdl,
 								name: item.name,
 								zhpm: item.zhpm,
 								fdlpm: item.fdlpm,
-								fdl: item.fdl,
 								gzssdlpm: item.gzssdlpm,
 								gzssdl: item.gzssdl,
 								jxssdlpm: item.jxssdlpm,

+ 9 - 1
src/views/Decision/Decision2Cndb.vue

@@ -78,7 +78,7 @@
 	import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 	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";
+	import Table from "./table.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
@@ -328,6 +328,7 @@
 
 											dataTab.push({ //表格
 												index: index + 1,
+												fdl:item.fdl,
 												name: item.name,
 												zhpm: item.zhpm,
 												gzssdl: item.gzssdl,
@@ -369,6 +370,13 @@
 						},
 						{
 							name: "",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							display:"none",
+						},
+						{
+							name: "",
 							field: "check",
 							is_num: false,
 							is_light: false,

+ 9 - 1
src/views/Decision/Decision2Xldb.vue

@@ -108,7 +108,7 @@
 	import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 	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";
+	import Table from "./table.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
@@ -367,6 +367,7 @@
 
 											dataTab.push({ //表格
 												index: index + 1,
+												fdl:item.fdl,
 												name: item.name,
 												zhpm: item.zhpm,
 												gzssdl: item.gzssdl,
@@ -410,6 +411,13 @@
 						},
 						{
 							name: "",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							display:"none",
+						},
+						{
+							name: "",
 							field: "check",
 							is_num: false,
 							is_light: false,

+ 9 - 1
src/views/Decision/Decision2Xmdb.vue

@@ -98,7 +98,7 @@
 	import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 	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";
+	import Table from "./table.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	export default {
@@ -355,6 +355,7 @@
 
 											dataTab.push({ //表格
 												index: index + 1,
+												fdl:item.fdl,
 												name: item.name,
 												zhpm: item.zhpm,
 												gzssdl: item.gzssdl,
@@ -398,6 +399,13 @@
 						},
 						{
 							name: "",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							display:"none",
+						},
+						{
+							name: "",
 							field: "check",
 							is_num: false,
 							is_light: false,

+ 9 - 1
src/views/Decision/Decision3.vue

@@ -117,7 +117,7 @@
 	import DualPieChart from "../../components/chart/pie/dual-pie-chart.vue";
 	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";
+	import Table from "./table.vue";
 	import ToolbarPanel from "../../components/coms/panel/toolbar-panel.vue";
 	import Dayinfo from "./dayinfo.vue";
 	
@@ -150,6 +150,13 @@
 						},
 						{
 							name: "",
+							field: "fdl",
+							is_num: false,
+							is_light: false,
+							display:"none",
+						},
+						{
+							name: "",
 							field: "check",
 							is_num: false,
 							is_light: false,
@@ -960,6 +967,7 @@
 
 							dataTab.push({ //表格
 								index: index + 1,
+								fdl:item.fdl,
 								name: item.name,
 								zhpm: item.zhpm,
 								gzssdl: item.gzssdl,

+ 2 - 2
src/views/Decision/table.vue

@@ -2,7 +2,7 @@
   <table class="com-table">
     <thead>
       <tr>
-        <th v-for="(col, index) of data.column" :key="index" :class="{ light: col.is_light }" :style="{ width: col.width }" @click="onSort(col)">
+        <th v-for="(col, index) of data.column" :key="index" :class="{ light: col.is_light }" :style="{ width: col.width , display : col.display }" @click="onSort(col)">
           {{ col.name }}
         </th>
       </tr>
@@ -13,7 +13,7 @@
           <td
             v-for="(col, i) of data.column"
             :key="i"
-            :style="{ width: col.width }"
+            :style="{ width: col.width , display : col.display}"
             :class="{ light: hoverRow == row || hoverCol == col, num: col.is_num, 'always-light': col.is_light || row.is_light }"
             @mouseenter="hover(row, col)"
             @mouseleave="leave()"