update 格式化

This commit is contained in:
2023-10-10 16:32:19 +08:00
parent 4babf55fec
commit 9c8a4032ca
3 changed files with 864 additions and 674 deletions

View File

@@ -8,7 +8,7 @@ charset = utf-8
# 缩进风格可选space、tab # 缩进风格可选space、tab
indent_style = space indent_style = space
# 缩进的空格数 # 缩进的空格数
indent_size = 2 indent_size = 4
# 结尾换行符可选lf、cr、crlf # 结尾换行符可选lf、cr、crlf
end_of_line = lf end_of_line = lf
# 在文件结尾插入新行 # 在文件结尾插入新行

File diff suppressed because it is too large Load Diff

View File

@@ -23,35 +23,38 @@
icon="el-icon-search" icon="el-icon-search"
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button <el-button
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
@click="resetQuery" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 切换运营商按钮 --> <!-- 切换运营商按钮 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<!-- <el-button <!-- <el-button
v-hasPermi="['pile:station:add']" v-hasPermi="['pile:station:add']"
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="click"
>批量修改站点</el-button>-->
<el-button
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="click" @click="handleAdd"
>批量修改站点</el-button>--> v-hasPermi="['pile:basic:batchAdd']"
<el-button >批量新增
type="primary" </el-button>
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['pile:basic:batchAdd']"
>批量新增</el-button>
</el-col> </el-col>
</el-row> </el-row>
@@ -60,7 +63,7 @@
:data="pileList" :data="pileList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="桩号" align="center" prop="sn"> <el-table-column label="桩号" align="center" prop="sn">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link <router-link
@@ -87,8 +90,8 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="接口数量" align="center" prop="gunNum" /> <el-table-column label="接口数量" align="center" prop="gunNum"/>
<el-table-column label="密钥" align="center" prop="secretKey" /> <el-table-column label="密钥" align="center" prop="secretKey"/>
<el-table-column label="电桩类型" align="center" prop="pileType"> <el-table-column label="电桩类型" align="center" prop="pileType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
@@ -102,7 +105,7 @@
align="center" align="center"
prop="merchantName" prop="merchantName"
/> />
<el-table-column label="充电站" align="center" prop="stationName" /> <el-table-column label="充电站" align="center" prop="stationName"/>
<el-table-column <el-table-column
label="注册时间" label="注册时间"
align="center" align="center"
@@ -119,35 +122,106 @@
/> />
<!-- 修改充电桩站点 --> <!-- 修改充电桩站点 -->
<el-dialog <!-- <el-dialog
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
width="45%" width="45%"
append-to-body append-to-body
:before-close="handleClose" :before-close="handleClose"
> >
<el-form ref="form" :model="updateData" label-width="120px"> <el-form ref="form" :model="updateData" label-width="120px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="已选择的桩"> <el-form-item label="已选择的桩">
<el-tag <el-tag
v-for="tag in updateData.pileSnList" v-for="tag in updateData.pileSnList"
:key="tag" :key="tag"
> >
{{ tag }} {{ tag }}
</el-tag> </el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="运营商">
<el-select
v-model="updateData.merchantId"
placeholder="请选择运营商"
@change="
changeSelectMerchant(updateData.merchantId)
"
>
<el-option
v-for="item in merchantList"
:key="item.merchantName"
:label="item.merchantName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="站点" prop="stationId">
<el-select
v-model="updateData.stationId"
placeholder="请选择站点"
filterable
>
<el-option
v-for="item in stationList"
:key="item.id"
:label="item.stationName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品型号" prop="modelId">
<el-select
v-model="updateData.modelId"
filterable
placeholder="请选择产品型号"
v-selectLoadMore="selectLoadMore"
>
<el-option
v-for="item in modelList"
:key="item.modelName"
:label="item.modelName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="枪口数量" prop="connectorNum">
<el-input
v-model="updateData.connectorNum"
placeholder="请输入枪口数量"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="batchUpdate"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>-->
<!-- 添加或修改设备管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<!-- <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运营商"> <el-form-item label="运营商" prop="merchantId">
<el-select <el-select
v-model="updateData.merchantId" v-model="form.merchantId"
placeholder="请选择运营商" placeholder="请选择运营商"
@change=" @change="changeSelectMerchant(form.merchantId)"
changeSelectMerchant(updateData.merchantId)
"
> >
<el-option <el-option
v-for="item in merchantList" v-for="item in merchantList"
@@ -161,9 +235,9 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="站点" prop="stationId"> <el-form-item label="站点" prop="stationId">
<el-select <el-select
v-model="updateData.stationId" v-model="form.stationId"
placeholder="请选择站点"
filterable filterable
placeholder="请选择站点"
> >
<el-option <el-option
v-for="item in stationList" v-for="item in stationList"
@@ -174,16 +248,50 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>-->
<el-row>
<el-col :span="12">
<el-form-item label="软件协议" prop="softwareProtocol">
<el-select
v-model="form.softwareProtocol"
placeholder="软件协议"
clearable
>
<el-option
v-for="dict in dict.type.software_protocol"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期" prop="productionDate">
<el-date-picker
clearable
v-model="form.productionDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择生产日期"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品型号" prop="modelId"> <el-form-item label="产品型号" prop="modelId">
<el-select <el-select
v-model="updateData.modelId"
filterable filterable
remote
v-model="form.modelId"
placeholder="请选择产品型号" placeholder="请选择产品型号"
v-selectLoadMore="selectLoadMore" v-selectLoadMore="selectLoadMore"
> >
<!-- :remote-method="remoteMethod" -->
<el-option <el-option
v-for="item in modelList" v-for="item in modelList"
:key="item.modelName" :key="item.modelName"
@@ -193,28 +301,67 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="桩类型" prop="modelId">
<el-select
v-model="form.chargerPileType"
placeholder="请选择桩类型"
>
<el-option label="运营桩" value="1"/>
<el-option label="个人桩" value="2"/>
</el-select>
</el-form-item>
<!--<el-form-item label="充电桩型号" prop="modelId">
<el-input v-model="form.modelId" placeholder="请输入充电桩型号"/>
</el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="枪口数量" prop="connectorNum"> <el-form-item label="枪口数量" prop="connectorNum">
<el-input <el-input
v-model="updateData.connectorNum" v-model="form.connectorNum"
placeholder="请输入枪口数量" placeholder="请输入枪口数量"
style="width: 220px"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产数量" prop="num">
<el-input
v-model="form.num"
placeholder="请输入生产数量"
style="width: 220px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
placeholder="请输入备注"
style="width: 95%"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="batchUpdate"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { batchUpdatePileList, listBasic } from "@/api/pile/basic"; import {batchAddBasic, batchUpdatePileList, listBasic, updateBasic} from "@/api/pile/basic";
import { getMerchantList } from "@/api/pile/merchant"; import {getMerchantList} from "@/api/pile/merchant";
import { getStationListByMerchantId } from "@/api/pile/station"; import {getStationListByMerchantId} from "@/api/pile/station";
import { listModel } from "@/api/pile/model"; import {listModel} from "@/api/pile/model";
export default { export default {
name: "PileList", name: "PileList",
@@ -230,6 +377,25 @@ export default {
total: 0, total: 0,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 表单参数
form: {},
// 表单校验
rules: {
softwareProtocol: [
{required: true, message: "请输入软件协议", trigger: "blur"},
],
productionDate: [
{required: true, message: "请选择生产日期", trigger: "blur"},
],
modelId: [
{required: true, message: "请输入产品型号", trigger: "blur"},
],
connectorNum: [
{required: true, message: "请输入枪口数量", trigger: "blur"},
],
num: [{required: true, message: "请输入生产数量", trigger: "blur"}],
remark: [{required: true, message: "请输入备注", trigger: "blur"}],
},
// 查询参数 // 查询参数
queryParams: { queryParams: {
stationId: null, stationId: null,
@@ -312,14 +478,35 @@ export default {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getPileList(); this.getPileList();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.getMerchantList(); this.getMerchantList();
this.title = "批量添加设备"; this.title = "批量添加设备";
this.open = true; this.open = true;
this.getModelList(); this.getModelList();
}, },
/** 提交按钮 */
submitForm() {
console.log("提交按钮", this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateBasic(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
batchAddBasic(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {