elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

feature
mk 3 years ago
parent
2005de6c6f 0ff881223e
commit
8c99a27e77
5 changed files with 62 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/assets/scss/modules/management/form.scss
  2. 14
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
  3. 4
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
  4. 2
      src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
  5. 44
      src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue

17
src/assets/scss/modules/management/form.scss
View File

@ -39,3 +39,20 @@
text-align: right;
padding-right: 12px;
}
/deep/.m-record {
h3 {
&::before {
display: inline-block;
width: 4px;
height: 12px;
background: #0056D6;
content: '';
/**
这个指为正的话 小方块就往上， 为负的话，小方块就往下
*/
vertical-align: 1px;
margin-right: 5px;
}
}
}

14
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue
View File

@ -1,9 +1,9 @@
<template>
<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
<el-dialog :visible.sync="dialogVisible" width="1370px" :before-close="handleCancle">
<span slot="title">
<span v-if="pageType=='add'">新增</span>
<span v-if="pageType=='edit'">修改</span>
<span v-if="pageType=='view'">查看</span>
<span v-if="pageType == 'add'">新增</span>
<span v-if="pageType == 'edit'">修改</span>
<span v-if="pageType == 'view'">查看</span>
</span>
<div>
<div class="dialog-h-content scroll-h">
@ -21,14 +21,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="场所规模" prop="scaleTotal">
<el-input-number
<el-input
type="number"
v-model="formData.scaleTotal"
:disabled="disabled"
class="u-item-width-normal"
size="small"
clearable
placeholder="请输入可容纳人数"
></el-input-number>
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -455,5 +456,4 @@ export default {
@import '@/assets/scss/modules/management/form-main.scss';
@import '@/assets/scss/modules/management/form.scss';
@import '@/assets/scss/modules/visual/a_customize.scss';
</style>

4
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue
View File

@ -23,8 +23,8 @@
</el-select>
</el-form-item>
<el-form-item label="场所规模" prop="scaleTotal">
<el-input-number v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入">
</el-input-number>
<el-input type="number" v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="所属组织" prop="gridId">
<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>

2
src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue
View File

@ -76,7 +76,7 @@
</template>
</el-table-column> -->
<el-table-column prop="imgList" label="图片列表" align="center" >
<el-table-column prop="imgList" label="图片列表" align="center">
<template slot-scope="scope">
<div v-if="scope.row.isEdit">
<el-upload

44
src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="g-main">
<div >
<div>
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<div>
@ -13,12 +13,11 @@
</el-select>
</el-form-item>
<el-form-item label="所处位置" prop="location">
<el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="负责人" prop="principalName">
<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
</el-form-item>
<el-row>
<el-col :span="24" align="right">
<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
@ -57,7 +56,7 @@
<!-- <el-table-column label="" fixed="left" type="selection" align="center" width="50" /> -->
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="equipmentName" align="center" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="equipmentCategoryName" align="center" width="100" label="设备类型"></el-table-column>
<el-table-column prop="equipmentCategoryName" align="center" width="140" label="设备类型"></el-table-column>
<el-table-column prop="agencyName" label="所属组织" min-width="100" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="location" label="所处位置" min-width="140" align="center" :show-overflow-tooltip="true" />
@ -69,9 +68,25 @@
<template slot-scope="scope">
<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
<el-button v-if="scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
<el-button v-if="!scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">待完善</el-button>
<el-button @click="handleDel(scope.row)" v-if="agencyId==scope.row.agencyId" type="text" size="small" class="">删除</el-button>
<el-button
v-if="scope.row.latitude && agencyId == scope.row.agencyId"
style="margin-right: 10px"
@click="handleAdd(scope.row, 'edit')"
size="small"
type="text"
>
编辑
</el-button>
<el-button
v-if="!scope.row.latitude && agencyId == scope.row.agencyId"
style="margin-right: 10px"
@click="handleAdd(scope.row, 'edit')"
size="small"
type="text"
>
待完善
</el-button>
<el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text" size="small" class="">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -89,8 +104,10 @@
</div>
</div>
</div>
<div >
<addForm v-if="dialogVisible" :dialogVisible="dialogVisible"
<div>
<addForm
v-if="dialogVisible"
:dialogVisible="dialogVisible"
:pageType="pageType"
:disabled="disabled"
:detailId="detailId"
@ -112,7 +129,8 @@ import axios from 'axios';
export default {
data() {
return {dialogVisible: false,
return {
dialogVisible: false,
importLoading: false,
disabled: false,
user: '',
@ -249,7 +267,6 @@ export default {
handleAdd(row, type) {
if (row.id) {
this.detailId = row.id;
}
this.pageType = type;
if (type == 'view') {
@ -257,9 +274,10 @@ export default {
} else {
this.disabled = false;
}
this.dialogVisible=true;
this.dialogVisible = true;
},
handleClose() {this.dialogVisible = false;
handleClose() {
this.dialogVisible = false;
this.pageType = 'list';
this.detailId = '';
this.getTableData();

Write Preview
Loading…
Cancel
Save