|
@@ -13,7 +13,7 @@
|
|
|
<SvgIcon svgid="svg-wind-site"></SvgIcon>
|
|
|
</span>
|
|
|
</div>
|
|
|
- <div
|
|
|
+ <!-- <div
|
|
|
class="panel-item-gf-right curStyle"
|
|
|
@click="changeShow( panelData.first.category)"
|
|
|
>
|
|
@@ -21,6 +21,15 @@
|
|
|
<div class="panel-item-gf-down">
|
|
|
{{ sourceMap[panelData.first.key] || "---" }}
|
|
|
</div>
|
|
|
+ </div> -->
|
|
|
+ <div
|
|
|
+ class="panel-item-gf-right curStyle"
|
|
|
+ @click="tabChange(panelData.first.category)"
|
|
|
+ >
|
|
|
+ <div class="panel-item-gf-up">{{ panelData.first.text }}</div>
|
|
|
+ <div class="panel-item-gf-down">
|
|
|
+ {{ sourceMap[panelData.first.key] || "---" }}
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="header-info">
|
|
@@ -30,7 +39,7 @@
|
|
|
:key="index"
|
|
|
:class="data.color"
|
|
|
>
|
|
|
- <div
|
|
|
+ <!-- <div
|
|
|
class="panel-item-left curStyle"
|
|
|
@click="changeShow(data.category,data.fjZT)"
|
|
|
>
|
|
@@ -43,9 +52,35 @@
|
|
|
}}</span>
|
|
|
<span v-else>{{ sourceMap[data.key] || "---" }}</span>
|
|
|
</div>
|
|
|
+ </div> -->
|
|
|
+ <div
|
|
|
+ class="panel-item-left curStyle"
|
|
|
+ @click="tabChange(data.category)"
|
|
|
+ >
|
|
|
+ <div class="panel-item-li">
|
|
|
+ <span>{{ data.name }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="panel-item-li">
|
|
|
+ <span v-if="data.calcStr && sourceMap">{{
|
|
|
+ calcGfStr(data.calcStr) || "---"
|
|
|
+ }}</span>
|
|
|
+ <span v-else>{{ sourceMap[data.key] || "---" }}</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="panel-item-right curStyle">
|
|
|
- <div class="panel-item-ri" @click="changeShow(data.category1,data.fjZT1)">
|
|
|
+ <!-- <div class="panel-item-ri" @click="changeShow(data.category1,data.fjZT1)">
|
|
|
+ <span>
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="'svg-icon-' + data.color"
|
|
|
+ >
|
|
|
+ <SvgIcon :svgid="data.nameIcon"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ {{ data.text1 }}</span
|
|
|
+ >
|
|
|
+ <span>{{ sourceMap[data.key1] || "---" }}</span>
|
|
|
+ </div> -->
|
|
|
+ <div class="panel-item-ri" @click="tabChange(data.category1)">
|
|
|
<span>
|
|
|
<i
|
|
|
class="svg-icon svg-icon-sm"
|
|
@@ -57,7 +92,8 @@
|
|
|
>
|
|
|
<span>{{ sourceMap[data.key1] || "---" }}</span>
|
|
|
</div>
|
|
|
- <div class="panel-item-ri" @click="changeShow(data.category2,data.fjZT2)">
|
|
|
+
|
|
|
+ <div class="panel-item-ri" @click="tabChange(data.category2)">
|
|
|
<span>
|
|
|
<i
|
|
|
class="svg-icon svg-icon-sm"
|
|
@@ -69,6 +105,18 @@
|
|
|
</span>
|
|
|
<span>{{ sourceMap[data.key2] || "---" }}</span>
|
|
|
</div>
|
|
|
+ <!-- <div class="panel-item-ri" @click="changeShow(data.category2,data.fjZT2)">
|
|
|
+ <span>
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="'svg-icon-' + data.color"
|
|
|
+ >
|
|
|
+ <SvgIcon :svgid="data.numIcon"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ {{ data.text2 }}
|
|
|
+ </span>
|
|
|
+ <span>{{ sourceMap[data.key2] || "---" }}</span>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -97,77 +145,147 @@
|
|
|
</div>
|
|
|
<div class="panel-body">
|
|
|
<!-- 接入风机 -->
|
|
|
- <div
|
|
|
- class="card"
|
|
|
- v-for="(cItem, cIndex) in pItem"
|
|
|
- :key="cIndex"
|
|
|
- v-show="cItem.isShow"
|
|
|
- :class="cItem.color"
|
|
|
- @click="goDetails(cItem)"
|
|
|
- >
|
|
|
- <div class="card-panel">
|
|
|
- <div class="card-left">
|
|
|
- <div class="tag">{{ cItem.wtnum }}</div>
|
|
|
- <div class="icon">
|
|
|
- <span
|
|
|
- class="svg-icon svg-icon-sm"
|
|
|
- :class="
|
|
|
- cItem.color == 'black'
|
|
|
- ? 'svg-icon-black'
|
|
|
- : cItem.color == 'gray'
|
|
|
- ? 'svg-icon-gray'
|
|
|
- : 'svg-icon-write'
|
|
|
- "
|
|
|
- >
|
|
|
- <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
|
|
|
- </span>
|
|
|
+ <div v-for="(cItem, cIndex) in pItem" :key="cIndex">
|
|
|
+ <div
|
|
|
+ class="card"
|
|
|
+ v-if="cItem.fjzt == this.currentFjzt"
|
|
|
+ :class="cItem.color"
|
|
|
+ @click="goDetails(cItem)"
|
|
|
+ >
|
|
|
+ <div class="card-panel">
|
|
|
+ <div class="card-left">
|
|
|
+ <div class="tag">{{cItem.fjzt}} {{ cItem.wtnum }}</div>
|
|
|
+ <div class="icon">
|
|
|
+ <span
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color == 'black'
|
|
|
+ ? 'svg-icon-black'
|
|
|
+ : cItem.color == 'gray'
|
|
|
+ ? 'svg-icon-gray'
|
|
|
+ : 'svg-icon-write'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
|
|
|
+ </span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="card-right">
|
|
|
+ <div class="num">
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color != 'red'
|
|
|
+ ? 'svg-icon-' + cItem.color
|
|
|
+ : 'svg-icon-white'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon svgid="svg-W"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ <span>{{ cItem.fs }}</span>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div class="num">
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color != 'red'
|
|
|
+ ? 'svg-icon-' + cItem.color
|
|
|
+ : 'svg-icon-white'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon svgid="svg-P"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ <span>{{ cItem.gl }}</span>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div class="num">
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color != 'red'
|
|
|
+ ? 'svg-icon-' + cItem.color
|
|
|
+ : 'svg-icon-white'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon svgid="svg-R"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ <span>{{ cItem.fdjzs.toFixed(2) }}</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="card-right">
|
|
|
- <div class="num">
|
|
|
- <i
|
|
|
- class="svg-icon svg-icon-sm"
|
|
|
- :class="
|
|
|
- cItem.color != 'red'
|
|
|
- ? 'svg-icon-' + cItem.color
|
|
|
- : 'svg-icon-white'
|
|
|
- "
|
|
|
- >
|
|
|
- <SvgIcon svgid="svg-W"></SvgIcon>
|
|
|
- </i>
|
|
|
- <span>{{ cItem.fs }}</span>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="card"
|
|
|
+ v-else-if="this.currentFjzt == 100"
|
|
|
+ :class="cItem.color"
|
|
|
+ @click="goDetails(cItem)"
|
|
|
+ >
|
|
|
+ <div class="card-panel">
|
|
|
+ <div class="card-left">
|
|
|
+ <div class="tag">{{ cItem.wtnum }}</div>
|
|
|
+ <div class="icon">
|
|
|
+ <span
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color == 'black'
|
|
|
+ ? 'svg-icon-black'
|
|
|
+ : cItem.color == 'gray'
|
|
|
+ ? 'svg-icon-gray'
|
|
|
+ : 'svg-icon-write'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon :svgid="mapping[cItem.color]"></SvgIcon>
|
|
|
+ </span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+ <div class="card-right">
|
|
|
+ <div class="num">
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color != 'red'
|
|
|
+ ? 'svg-icon-' + cItem.color
|
|
|
+ : 'svg-icon-white'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon svgid="svg-W"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ <span>{{ cItem.fs }}</span>
|
|
|
+ </div>
|
|
|
|
|
|
- <div class="num">
|
|
|
- <i
|
|
|
- class="svg-icon svg-icon-sm"
|
|
|
- :class="
|
|
|
- cItem.color != 'red'
|
|
|
- ? 'svg-icon-' + cItem.color
|
|
|
- : 'svg-icon-white'
|
|
|
- "
|
|
|
- >
|
|
|
- <SvgIcon svgid="svg-P"></SvgIcon>
|
|
|
- </i>
|
|
|
- <span>{{ cItem.gl }}</span>
|
|
|
- </div>
|
|
|
+ <div class="num">
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color != 'red'
|
|
|
+ ? 'svg-icon-' + cItem.color
|
|
|
+ : 'svg-icon-white'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon svgid="svg-P"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ <span>{{ cItem.gl }}</span>
|
|
|
+ </div>
|
|
|
|
|
|
- <div class="num">
|
|
|
- <i
|
|
|
- class="svg-icon svg-icon-sm"
|
|
|
- :class="
|
|
|
- cItem.color != 'red'
|
|
|
- ? 'svg-icon-' + cItem.color
|
|
|
- : 'svg-icon-white'
|
|
|
- "
|
|
|
- >
|
|
|
- <SvgIcon svgid="svg-R"></SvgIcon>
|
|
|
- </i>
|
|
|
- <span>{{ cItem.fdjzs.toFixed(2) }}</span>
|
|
|
+ <div class="num">
|
|
|
+ <i
|
|
|
+ class="svg-icon svg-icon-sm"
|
|
|
+ :class="
|
|
|
+ cItem.color != 'red'
|
|
|
+ ? 'svg-icon-' + cItem.color
|
|
|
+ : 'svg-icon-white'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <SvgIcon svgid="svg-R"></SvgIcon>
|
|
|
+ </i>
|
|
|
+ <span>{{ cItem.fdjzs.toFixed(2) }}</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+
|
|
|
<!-- 待机 -->
|
|
|
<!-- <div
|
|
|
class="card"
|
|
@@ -772,6 +890,7 @@ export default {
|
|
|
sourceMap: {}, // 核心数据
|
|
|
fillCategory: null, // 过滤条件
|
|
|
fillFjzt: null, // 过滤条件
|
|
|
+ currentFjzt: 100,
|
|
|
fjStatus: "all",
|
|
|
fjArr: [],
|
|
|
fjNum: 0,
|
|
@@ -805,126 +924,126 @@ export default {
|
|
|
icon: "svg-photovoltaic",
|
|
|
text: "接入风场",
|
|
|
key: "fcjrnum",
|
|
|
- category:'jrfj_FDC'
|
|
|
+ category: "jrfj_FDC",
|
|
|
},
|
|
|
datas: [
|
|
|
{
|
|
|
color: "green",
|
|
|
name: "待机",
|
|
|
- category:'dj_FDC',
|
|
|
+ category: "dj_FDC",
|
|
|
fjZT: 0,
|
|
|
nameIcon: "svg-standby",
|
|
|
calcStr: ["fcdjnum", "fcsdtjnum"],
|
|
|
numIcon: "svg-manual",
|
|
|
text1: "待风",
|
|
|
- category1:'df_FDC',
|
|
|
- fjZT1:0,
|
|
|
+ category1: "df_FDC",
|
|
|
+ fjZT1: 0,
|
|
|
key1: "fcdjnum",
|
|
|
text2: "手动停机",
|
|
|
- category2:'sd_FDC',
|
|
|
- fjZT2:1,
|
|
|
+ category2: "sd_FDC",
|
|
|
+ fjZT2: 1,
|
|
|
key2: "fcsdtjnum",
|
|
|
},
|
|
|
{
|
|
|
color: "blue",
|
|
|
name: "运行",
|
|
|
- category:'yx_FDC',
|
|
|
+ category: "yx_FDC",
|
|
|
fjZT: 2,
|
|
|
nameIcon: "svg-normal-power",
|
|
|
calcStr: ["fczcfdnum", "fcqxjclnum"],
|
|
|
numIcon: "svg-drop-output",
|
|
|
text1: "正常发电",
|
|
|
- category1:'zcfd_FDC',
|
|
|
- fjZT1:2,
|
|
|
+ category1: "zcfd_FDC",
|
|
|
+ fjZT1: 2,
|
|
|
key1: "fczcfdnum",
|
|
|
text2: "降出力运行",
|
|
|
- category2:'jcl_FDC',
|
|
|
- fjZT2:3,
|
|
|
+ category2: "jcl_FDC",
|
|
|
+ fjZT2: 3,
|
|
|
key2: "fcqxjclnum",
|
|
|
},
|
|
|
{
|
|
|
color: "pink",
|
|
|
name: "限电",
|
|
|
- category:'xd_FDC',
|
|
|
- fjZT: 5,
|
|
|
+ category: "xd_FDC",
|
|
|
+ fjZT: 4,
|
|
|
nameIcon: "svg-limit-power",
|
|
|
calcStr: ["fcxdjclnum", "fcxdtjnum"],
|
|
|
numIcon: "svg-downtime",
|
|
|
text1: "限电降出力",
|
|
|
- category1:'fcxdjcl_FDC',
|
|
|
- fjZT1:4,
|
|
|
+ category1: "jclxd_FDC",
|
|
|
+ fjZT1: 4,
|
|
|
key1: "fcxdjclnum",
|
|
|
text2: "停机",
|
|
|
- category2:'fcxdtj_FDC',
|
|
|
- fjZT2:5,
|
|
|
+ category2: "fcxdtj_FDC",
|
|
|
+ fjZT2: 5,
|
|
|
key2: "fcxdtjnum",
|
|
|
},
|
|
|
{
|
|
|
color: "red",
|
|
|
name: "故障",
|
|
|
- category:'gz_FDC',
|
|
|
+ category: "gz_FDC",
|
|
|
fjZT: 6,
|
|
|
nameIcon: "svg-gz-downtime",
|
|
|
calcStr: ["fcgztjnum", "fccnsltjnum"],
|
|
|
numIcon: "svg-field-involved",
|
|
|
text1: "故障停机",
|
|
|
- category1:'fcgztj_FDC',
|
|
|
- fjZT1:6,
|
|
|
+ category1: "fcgztj_FDC",
|
|
|
+ fjZT1: 6,
|
|
|
key1: "fcgztjnum",
|
|
|
text2: "场内受累",
|
|
|
- category2:'fccnsltj_FDC',
|
|
|
- fjZT2:7,
|
|
|
+ category2: "fccnsltj_FDC",
|
|
|
+ fjZT2: 7,
|
|
|
key2: "fccnsltjnum",
|
|
|
},
|
|
|
{
|
|
|
color: "orange",
|
|
|
name: "检修",
|
|
|
- category:'jx_FDC',
|
|
|
+ category: "jx_FDC",
|
|
|
fjZT: 8,
|
|
|
nameIcon: "svg-jx-downtime",
|
|
|
calcStr: ["fcjxtjnum", "fccnsljxnum"],
|
|
|
numIcon: "svg-field-involved",
|
|
|
text1: "检修停机",
|
|
|
- category1:'fcjxtj_FDC',
|
|
|
- fjZT1:8,
|
|
|
+ category1: "fcjxtj_FDC",
|
|
|
+ fjZT1: 8,
|
|
|
key1: "fcjxtjnum",
|
|
|
text2: "产内受累",
|
|
|
- category2:'fccnsljx_FDC',
|
|
|
- fjZT2:9,
|
|
|
+ category2: "cnsl_FDC",
|
|
|
+ fjZT2: 9,
|
|
|
key2: "fccnsljxnum",
|
|
|
},
|
|
|
{
|
|
|
color: "write",
|
|
|
name: "受累",
|
|
|
- category:'sl_FDC',
|
|
|
+ category: "sl_FDC",
|
|
|
fjZT: 10,
|
|
|
calcStr: ["fcdwslnum", "fchjslnum"],
|
|
|
nameIcon: "svg-intranet-involvement",
|
|
|
numIcon: "svg-environment",
|
|
|
text1: "电网",
|
|
|
- category1:'fcdwsl_FDC',
|
|
|
- fjZT1:10,
|
|
|
+ category1: "fcdwsl_FDC",
|
|
|
+ fjZT1: 10,
|
|
|
key1: "fcdwslnum",
|
|
|
text2: "环境",
|
|
|
- category2:'fchjsl_FDC',
|
|
|
- fjZT2:11,
|
|
|
+ category2: "fchjsl_FDC",
|
|
|
+ fjZT2: 11,
|
|
|
key2: "fchjslnum",
|
|
|
},
|
|
|
{
|
|
|
color: "gray",
|
|
|
name: "离线",
|
|
|
- category:'lx_FDC',
|
|
|
- fjZT:12,
|
|
|
+ category: "lx_FDC",
|
|
|
+ fjZT: 12,
|
|
|
nameIcon: "svg-offline",
|
|
|
key: "fclxnum",
|
|
|
numIcon: "svg-unknown",
|
|
|
text1: "离线",
|
|
|
- category1:'fclx_FDC',
|
|
|
- fjZT1:12,
|
|
|
+ category1: "fclx_FDC",
|
|
|
+ fjZT1: 12,
|
|
|
key1: "fclxnum",
|
|
|
text2: "未知",
|
|
|
- category2:'fcwz_FDC',
|
|
|
- fjZT2:13,
|
|
|
+ category2: "fcwz_FDC",
|
|
|
+ fjZT2: 13,
|
|
|
key2: "fcwznum",
|
|
|
},
|
|
|
],
|
|
@@ -1057,7 +1176,7 @@ export default {
|
|
|
case 12: // 离线
|
|
|
return "gray";
|
|
|
case 13: // 未知
|
|
|
- return "gray"
|
|
|
+ return "gray";
|
|
|
}
|
|
|
// switch (fjzt) {
|
|
|
// case 0: // 待机
|
|
@@ -1103,7 +1222,7 @@ export default {
|
|
|
// return "gray";
|
|
|
// case 19: // 未知
|
|
|
// return "gray";
|
|
|
-
|
|
|
+
|
|
|
// }
|
|
|
},
|
|
|
|
|
@@ -1119,7 +1238,7 @@ export default {
|
|
|
// console.log('pval:',pVal)
|
|
|
// let djArr = pVal.filter((v, i, a) => {
|
|
|
// return v.fjzt == 0;
|
|
|
-
|
|
|
+
|
|
|
// });
|
|
|
// console.log("djArr:", djArr);
|
|
|
// // this.sourceMap.fjmap=djArr;
|
|
@@ -1162,21 +1281,70 @@ export default {
|
|
|
// console.log("fjarr:", that.fjArr);
|
|
|
// }
|
|
|
// },
|
|
|
-
|
|
|
+ tabChange(category) {
|
|
|
+ let that = this;
|
|
|
+ if (category.includes("jrfj")) {
|
|
|
+ that.currentFjzt = 100;
|
|
|
+ } else if (category.includes("dj")) {
|
|
|
+ that.currentFjzt = 0;
|
|
|
+ } else if (category.includes("df")) {
|
|
|
+ that.currentFjzt = 0;
|
|
|
+ } else if (category.includes("sd")) {
|
|
|
+ that.currentFjzt = 1;
|
|
|
+ } else if (category.includes("yx")) {
|
|
|
+ that.currentFjzt = 2;
|
|
|
+ } else if (category.includes("zcfd")) {
|
|
|
+ that.currentFjzt = 2;
|
|
|
+ } else if (category.includes("jcl")) {
|
|
|
+ that.currentFjzt = 3;
|
|
|
+ } else if (category.includes("xd")) {
|
|
|
+ that.currentFjzt = 4;
|
|
|
+ }
|
|
|
+ else if (category.includes("jclxd")) {
|
|
|
+ that.currentFjzt = 4;
|
|
|
+ }
|
|
|
+ else if (category.includes("fcxdtj")) {
|
|
|
+ that.currentFjzt = 5;
|
|
|
+ } else if (category.includes("gz")) {
|
|
|
+ that.currentFjzt = 6;
|
|
|
+ } else if (category.includes("fcgztj")) {
|
|
|
+ that.currentFjzt = 6;
|
|
|
+ } else if (category.includes("fccnsltj")) {
|
|
|
+ that.currentFjzt = 7;
|
|
|
+ } else if (category.includes("jx")) {
|
|
|
+ that.currentFjzt = 8;
|
|
|
+ } else if (category.includes("fcjxtj")) {
|
|
|
+ that.currentFjzt = 8;
|
|
|
+ } else if (category.includes("cnsl")) {
|
|
|
+ that.currentFjzt = 9;
|
|
|
+ } else if (category.includes("sl")) {
|
|
|
+ that.currentFjzt = 10;
|
|
|
+ } else if (category.includes("fcdwsl")) {
|
|
|
+ that.currentFjzt = 10;
|
|
|
+ } else if (category.includes("fchjsl")) {
|
|
|
+ that.currentFjzt = 11;
|
|
|
+ } else if (category.includes("lx")) {
|
|
|
+ that.currentFjzt = 12;
|
|
|
+ } else if (category.includes("fclx")) {
|
|
|
+ that.currentFjzt = 12;
|
|
|
+ } else if (category.includes("fcwz")) {
|
|
|
+ that.currentFjzt = 13;
|
|
|
+ }
|
|
|
+ },
|
|
|
//切换显示种类
|
|
|
- changeShow(category, fjzt, skipFill) {
|
|
|
+ changeShow(category, fjzt, skipFill) {
|
|
|
if (!skipFill) {
|
|
|
- console.log('!skipFill:',!skipFill)
|
|
|
+ // console.log("!skipFill:", !skipFill);
|
|
|
if (this.fillCategory === category) {
|
|
|
- console.log('fillCategory:',this.fillCategory)
|
|
|
- console.log('fillFjzt:',this.fillFjzt)
|
|
|
+ // console.log("fillCategory:", this.fillCategory);
|
|
|
+ // console.log("fillFjzt:", this.fillFjzt);
|
|
|
this.fillCategory = null;
|
|
|
this.fillFjzt = null;
|
|
|
} else {
|
|
|
this.fillCategory = category;
|
|
|
this.fillFjzt = fjzt;
|
|
|
- console.log('fillCategory:',this.fillCategory)
|
|
|
- console.log('fillFjz:',this.fillFjzt)
|
|
|
+ console.log("fillCategory:", this.fillCategory);
|
|
|
+ console.log("fillFjz:", this.fillFjzt);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1239,10 +1407,10 @@ export default {
|
|
|
}
|
|
|
|
|
|
that.sourceMap = sourceMap;
|
|
|
- console.log('sourceMap:',that.sourceMap)
|
|
|
+ // console.log("sourceMap:", that.sourceMap);
|
|
|
if (that.fillCategory) {
|
|
|
- console.log("thatfillcategory:", that.fillCategory);
|
|
|
- console.log('fillFjzt:',this.fillFjzt)
|
|
|
+ // console.log("thatfillcategory:", that.fillCategory);
|
|
|
+ // console.log("fillFjzt:", this.fillFjzt);
|
|
|
that.changeShow(that.fillCategory, that.fillFjzt, true);
|
|
|
}
|
|
|
} else {
|