Merge branch 'master' of http://192.168.4.125:32792/04787/smart-power-ui
This commit is contained in:
commit
5439921adb
|
@ -11,6 +11,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
port= 9988
|
port= 9988
|
||||||
|
|
||||||
# 服务端地址
|
# 服务端地址
|
||||||
// target = http://192.168.18.135:8899
|
target = http://192.168.18.134:8899
|
||||||
target = http://192.168.18.139:8899
|
//target = http://192.168.18.139:8899
|
||||||
// target = http://192.168.18.136:8899
|
// target = http://192.168.18.136:8899
|
||||||
|
|
|
@ -72,6 +72,8 @@
|
||||||
@sort-change="sortChange">
|
@sort-change="sortChange">
|
||||||
<el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
|
<el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
|
||||||
<!-- <el-table-column label="审核节点ID" align="center" prop="nodeId" /> -->
|
<!-- <el-table-column label="审核节点ID" align="center" prop="nodeId" /> -->
|
||||||
|
<el-table-column label="项目名称" align="left" prop="projectName"/>
|
||||||
|
<el-table-column label="项目地址" align="left" prop="projectAddress"/>
|
||||||
<el-table-column label="设备名称" align="left" prop="deviceName" />
|
<el-table-column label="设备名称" align="left" prop="deviceName" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
sortable="custom"
|
sortable="custom"
|
||||||
|
|
|
@ -102,8 +102,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
v-hasPermi="['iot:maintenance:add']"
|
v-hasPermi="['iot:maintenance:add']"
|
||||||
>新增</el-button
|
>新增</el-button>
|
||||||
>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
|
@ -131,6 +130,8 @@
|
||||||
:index="indexFormatter"
|
:index="indexFormatter"
|
||||||
width="80px"
|
width="80px"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
|
<el-table-column label="项目名称" align="left" prop="projectName" />
|
||||||
|
<el-table-column label="项目地址" align="left" prop="projectAddress" />
|
||||||
<el-table-column label="设备名称" align="left" prop="deviceName" />
|
<el-table-column label="设备名称" align="left" prop="deviceName" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="故障类型"
|
label="故障类型"
|
||||||
|
|
|
@ -2,6 +2,21 @@
|
||||||
<div class="maintennce-details" v-loading="loading">
|
<div class="maintennce-details" v-loading="loading">
|
||||||
<el-divider content-position="left">工单信息</el-divider>
|
<el-divider content-position="left">工单信息</el-divider>
|
||||||
<div class="info-wrap">
|
<div class="info-wrap">
|
||||||
|
<el-row :gutter="20">
|
||||||
|
<el-col :span="12">
|
||||||
|
<div class="item-block">
|
||||||
|
<span>项目名称:</span>
|
||||||
|
<span>{{ workDetails.projectName }}</span>
|
||||||
|
</div>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<div class="item-block">
|
||||||
|
<span>项目地址:</span>
|
||||||
|
<span>{{ workDetails.projectAddress }}</span>
|
||||||
|
</div>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<div class="item-block">
|
<div class="item-block">
|
||||||
|
|
Loading…
Reference in New Issue