2022-12-15 update

1. 增加api type参数
2. affected fault maintain  增加white-space: nowrap

.gitignore

@@ -0,0 +1,2 @@
+/node_modules
+/dist

src/api/index.js

@@ -80,7 +80,7 @@ const points=(data)=>{
 const faultrecord=(data)=>{
     return request({
         baseURL: process.env.VUE_APP_APIs,
-        url:`ghost/faultrecord?wpid=${data.wpid}&wtid=${data.wtid}&begin=${data.begin}&end=${data.end}&faulttype=${data.faulttype}`,
+        url:`ghost/faultrecord?wpid=${data.wpid}&wtid=${data.wtid}&begin=${data.begin}&end=${data.end}&faulttype=${data.faulttype}&type=${data.type}`,
         method:"get"
     })
 }
@@ -111,7 +111,7 @@ const faultrecordDel=(data)=>{
 const mainrecord=(data)=>{
     return request({
         baseURL: process.env.VUE_APP_APIs,
-        url:`ghost/mainrecord?wpid=${data.wpid}&wtid=${data.wtid}&begin=${data.begin}&end=${data.end}`,
+        url:`ghost/mainrecord?wpid=${data.wpid}&wtid=${data.wtid}&begin=${data.begin}&end=${data.end}&type=${data.type}`,
         method:"get"
     })
 }
@@ -158,7 +158,7 @@ const getslStatus = (data)=>{
 const involved = (data)=>{
     return request({
         baseURL: process.env.VUE_APP_APIs,
-        url:`ghost/involved?wpid=${data.wpid}&begin=${data.begin}&end=${data.end}`,
+        url:`ghost/involved?wpid=${data.wpid}&begin=${data.begin}&end=${data.end}&type=${data.type}`,
         method:"get"
     })
 }

src/views/entry/affected.vue

@@ -2,14 +2,14 @@
     <div>
         <div class="title-list">
             <div class="search">
-                <div class="date">风场:</div>
+                <div class="date" style="white-space: nowrap">风场:</div>
                 <el-select class="inputs" v-model="selectValue" placeholder="请选择" @change="handleChange">
                     <el-option v-for="item in stationList" :key="item.name" :label="item.aname" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
             <div class="query-item">
-                <div class="lable">开始日期：</div>
+                <div class="lable" style="white-space: nowrap">开始日期：</div>
                 <div class="search-input">
                     <el-date-picker v-model="timeValue" type="datetimerange" range-separator="至"
                         start-placeholder="开始日期" end-placeholder="结束日期">
@@ -17,13 +17,20 @@
                 </div>
             </div>
             <div class="search">
-                <div class="date">类型:</div>
+                <div class="date" style="white-space: nowrap">类型:</div>
                 <el-select class="inputs" clearable v-model="typeStatus" placeholder="请选择">
                     <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
-            <div class="query-actions">
+            <div class="search">
+                <div class="date" style="white-space: nowrap">内报/外报:</div>
+                <el-select class="inputs" clearable v-model="nwb" placeholder="请选择">
+                    <el-option v-for="item in reportList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="query-actions" style="white-space:nowrap">
                 <button class="button" @click="getDatas">查询</button>
                 <button class="button" @click="add">新增</button>
                 <button class="button" @click="exportExcel">导出</button>
@@ -41,6 +48,8 @@
                 </el-table-column>
                 <el-table-column label="损失电量" prop="powerloss" align="center" sortable>
                 </el-table-column>
+                <el-table-column label="损失电量" prop="impactcapacity" align="center" sortable>
+                </el-table-column>
                 <el-table-column label="受累时长" prop="faultduration" align="center" sortable>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
@@ -79,11 +88,24 @@
                         </el-date-picker>
                     </div>
                 </div>
-                <div class="lists" style="margin-bottom: 40px">
+                <div class="lists">
                     <div class="rows">
                         <div class="rows-name">损失电量:</div>
                         <el-input class="rows-inputs" v-model="sendData.ssdl" placeholder="请输入损失电量"></el-input>
                     </div>
+                    <div class="rows">
+                        <div class="rows-name">影响容量:</div>
+                        <el-input-number class="rows-inputs rows-inputs-number" :controls="false" controls-position="right" v-model="sendData.yxrl" placeholder="请输入影响容量"></el-input-number>
+                    </div>
+                </div>
+                <div class="lists" style="margin-bottom: 40px">
+                    <div class="rows">
+                        <div class="rows-name">内报/外报:</div>
+                        <el-select class="inputs" clearable v-model="sendData.nwb" placeholder="请选择">
+                            <el-option v-for="item in reportList" :key="item.id" :label="item.name" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </div>
                 </div>
                 <div class="lists" v-if="!isEdit">
                     <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
@@ -156,6 +178,7 @@ export default {
             ],
             selectValue: '',
             typeStatus: '',
+            nwb: '',
             lineList: [
                 {
                     "id": "WNS01_XL",
@@ -202,21 +225,31 @@ export default {
                     "name": "天气受累"
                 }
             ],
-            tableList: [
+            reportList: [
                 {
-                    "id": "1",
-                    "projectid": "1",
-                    "projectname": "1",
-                    "wpid": "WNS_FDC",
-                    "wpname": "1",
-                    "lineid": "1",
-                    "linename": "1",
-                    "begindate": "2022-10-31T16:00:00.000+0000",
-                    "enddate": "2022-10-31T16:00:00.000+0000",
-                    "faulttype": "cngz",
-                    "powerloss": 1,
-                    "faultduration": 1
+                    id: '内报',
+                    name: '内报'
                 },
+                {
+                    id: '外报',
+                    name: '外报'
+                }
+            ],
+            tableList: [
+                // {
+                //     "id": "1",
+                //     "projectid": "1",
+                //     "projectname": "1",
+                //     "wpid": "WNS_FDC",
+                //     "wpname": "1",
+                //     "lineid": "1",
+                //     "linename": "1",
+                //     "begindate": "2022-10-31T16:00:00.000+0000",
+                //     "enddate": "2022-10-31T16:00:00.000+0000",
+                //     "faulttype": "cngz",
+                //     "powerloss": 1,
+                //     "faultduration": 1
+                // },
             ],
             dialogVisible: false,
             sendData: {
@@ -225,6 +258,8 @@ export default {
                 lines: [],
                 ssdl: '',
                 type: '',
+                yxrl: null,
+                nwb: '',
                 wpid: this.selectValue,
                 stationName: this.stationList?.find(val => val.code === this.selectValue).aname,
             },
@@ -294,6 +329,7 @@ export default {
                 wpid: this.selectValue,
                 begin: new Date(this.timeValue[0]).getTime(),
                 end: new Date(this.timeValue[1]).getTime(),
+                type: this.nwb,
             }).then(res => {
                 if (res.data) {
                     res.data.data.forEach(item => {
@@ -313,6 +349,8 @@ export default {
                 ],
                 ssdl: '',
                 type: '',
+                yxrl: null,
+                nwb: '',
                 wpid: this.selectValue,
                 stationName: this.stationList.find(val => val.code === this.selectValue).aname,
             }
@@ -325,6 +363,8 @@ export default {
                 let pairs = this.tableList.find(val => val.id === this.sendData.id)
                 pairs.powerloss = this.sendData.ssdl
                 pairs.faulttype = this.sendData.type
+                pairs.impactcapacity = this.sendData.yxrl
+                pairs.type = this.sendData.nwb
                 api.involvedEdit(pairs).then(res => {
                     if (res.data) {
                         this.$message({
@@ -350,6 +390,8 @@ export default {
                 pairs.end = this.sendData.enddate
                 pairs.ssdl = this.sendData.ssdl
                 pairs.type = this.sendData.type
+                pairs.yxrl = this.sendData.yxrl
+                pairs.nwb = this.sendData.nwb
                 console.log(pairs);
                 api.involvedAdd(pairs).then(res => {
                     if (res.data) {
@@ -370,6 +412,8 @@ export default {
                 enddate: val.enddate,
                 ssdl: val.powerloss,
                 type: val.faulttype,
+                yxrl: val.impactcapacity,
+                nwb: val.nwb,
                 wpid: this.selectValue,
                 stationName: this.stationList.find(val => val.code === this.selectValue).aname,
             }
@@ -505,6 +549,9 @@ export default {
 
     .rows-inputs {
         width: 220px;
+        &.rows-inputs-number /deep/ .el-input__inner {
+            text-align: left!important;
+        }
     }
 }
 

src/views/entry/fault.vue

@@ -7,21 +7,21 @@
                     :show-all-levels="false"></el-cascader>
             </div> -->
             <div class="search">
-                <div class="date">风场:</div>
+                <div class="date" style="white-space: nowrap">风场:</div>
                 <el-select class="inputs" v-model="selectValue" placeholder="请选择" @change="handleChange()">
                     <el-option v-for="item in stationList" :key="item.aname" :label="item.aname" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
             <div class="search">
-                <div class="date">机组:</div>
+                <div class="date" style="white-space: nowrap">机组:</div>
                 <el-select class="inputs" clearable v-model="groupId" placeholder="请选择">
                     <el-option v-for="item in groupList" :key="item.code" :label="item.code" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
             <div class="query-item">
-                <div class="lable">开始日期：</div>
+                <div class="lable" style="white-space: nowrap">开始日期：</div>
                 <div class="search-input">
                     <el-date-picker v-model="timeValue" type="datetimerange" range-separator="至"
                         start-placeholder="开始日期" end-placeholder="结束日期">
@@ -29,13 +29,20 @@
                 </div>
             </div>
             <div class="search">
-                <div class="date">类型:</div>
+                <div class="date" style="white-space: nowrap">类型:</div>
                 <el-select class="inputs" clearable v-model="typeStatus" placeholder="请选择">
                     <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.name">
                     </el-option>
                 </el-select>
             </div>
-            <div class="query-actions">
+            <div class="search">
+                <div class="date" style="white-space: nowrap">内报/外报:</div>
+                <el-select class="inputs" clearable v-model="nwb" placeholder="请选择">
+                    <el-option v-for="item in reportList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="query-actions" style="white-space:nowrap">
                 <button class="button" @click="getDatas">查询</button>
                 <button class="button" @click="add">新增</button>
                 <button class="button" @click="exportExcel">导出</button>
@@ -258,25 +265,36 @@ export default {
                 },
             ],
             tableList: [
+                // {
+                //     "id": "9686572cc51048e09b731ab05a231ec4",
+                //     "projectid": "GJY01_GC",
+                //     "projectname": "平鲁高家堰一期工程",
+                //     "wpid": "GJY_FDC",
+                //     "wpname": "高家堰风电场",
+                //     "wtid": "GJY01_001",
+                //     "wtname": "#01",
+                //     "begindate": 1661476154000,
+                //     "enddate": 1661562554000,
+                //     "faulttype": "变频器",
+                //     "faultphenomenon": "FDDF",
+                //     "defecteliminating": "DFDDF",
+                //     "processingresults": "DFFDF",
+                //     "powerloss": 2.2,
+                //     "faultduration": 24.0,
+                //     "impactcapacity": 48000.0,
+                //     "type": "DF"
+                // },
+            ],
+            nwb: '',
+            reportList: [
                 {
-                    "id": "9686572cc51048e09b731ab05a231ec4",
-                    "projectid": "GJY01_GC",
-                    "projectname": "平鲁高家堰一期工程",
-                    "wpid": "GJY_FDC",
-                    "wpname": "高家堰风电场",
-                    "wtid": "GJY01_001",
-                    "wtname": "#01",
-                    "begindate": 1661476154000,
-                    "enddate": 1661562554000,
-                    "faulttype": "变频器",
-                    "faultphenomenon": "FDDF",
-                    "defecteliminating": "DFDDF",
-                    "processingresults": "DFFDF",
-                    "powerloss": 2.2,
-                    "faultduration": 24.0,
-                    "impactcapacity": 48000.0,
-                    "type": "DF"
+                    id: '内报',
+                    name: '内报'
                 },
+                {
+                    id: '外报',
+                    name: '外报'
+                }
             ],
             resultsList: [
                 {
@@ -349,6 +367,7 @@ export default {
                 begin: new Date(this.timeValue[0]).getTime(),
                 end: new Date(this.timeValue[1]).getTime(),
                 faulttype: this.typeStatus,
+                type: this.nwb
             }).then(res => {
                 if (res.data) {
                     res.data.data.forEach(item => {

src/views/entry/maintain.vue

@@ -2,28 +2,35 @@
     <div>
         <div class="title-list">
             <div class="search">
-                <div class="date">风场:</div>
+                <div class="date" style="white-space: nowrap">风场:</div>
                 <el-select class="inputs" v-model="selectValue" placeholder="请选择" @change="handleChange()">
                     <el-option v-for="item in stationList" :key="item.aname" :label="item.aname" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
             <div class="search">
-                <div class="date">机组:</div>
+                <div class="date" style="white-space: nowrap">机组:</div>
                 <el-select class="inputs" clearable v-model="groupId" placeholder="请选择">
                     <el-option v-for="item in groupList" :key="item.code" :label="item.code" :value="item.id">
                     </el-option>
                 </el-select>
             </div>
             <div class="query-item">
-                <div class="lable">开始日期：</div>
+                <div class="lable" style="white-space: nowrap">开始日期：</div>
                 <div class="search-input">
                     <el-date-picker v-model="timeValue" type="datetimerange" range-separator="至"
                         start-placeholder="开始日期" end-placeholder="结束日期">
                     </el-date-picker>
                 </div>
             </div>
-            <div class="query-actions">
+            <div class="search">
+                <div class="date" style="white-space: nowrap">内报/外报:</div>
+                <el-select class="inputs" clearable v-model="nwb" placeholder="请选择">
+                    <el-option v-for="item in reportList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="query-actions" style="white-space:nowrap">
                 <button class="button" @click="getDatas">查询</button>
                 <button class="button" @click="add">新增</button>
                 <button class="button" @click="exportExcel">导出</button>
@@ -254,6 +261,17 @@ export default {
                     name: '外报'
                 }
             ],
+            nwb: '',
+            reportList: [
+                {
+                    id: '内报',
+                    name: '内报'
+                },
+                {
+                    id: '外报',
+                    name: '外报'
+                }
+            ],
             dialogVisible: false,
             sendData: {
                 begindate: '',
@@ -309,6 +327,7 @@ export default {
                 wtid: this.groupId,
                 begin: new Date(this.timeValue[0]).getTime(),
                 end: new Date(this.timeValue[1]).getTime(),
+                type: this.nwb
             }).then(res => {
                 if (res.data) {
                     res.data.data.forEach(item => {