wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

java8
jiayang yue 9 months ago
parent
389d8ca0de fee34fffdb
commit
f5348702f4
2 changed files with 52 additions and 22 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. 52
      src/views/modules/eam/com_eam_object_add_update.vue
  2. 22
      src/views/modules/eam/eam_device_list.vue

52
src/views/modules/eam/com_eam_object_add_update.vue
View File

@ -3,7 +3,7 @@
<el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="960px" style="height: 662px;" class="customer-dialog">
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="pageData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 455px">
<el-select v-model="pageData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 150px">
<el-option
v-for = "i in userBuList"
:key = "i.buNo"
@ -20,7 +20,13 @@
<el-input v-model="pageData.objectID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="设备名称" prop="objectDesc" :rules="rules.objectDesc" style="margin-left: -10px">
<el-input v-model="pageData.objectDesc" style="width: 330px"></el-input>
<el-input v-model="pageData.objectDesc" style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="序列号" style="margin-left: -10px">
<el-input v-model="pageData.seqNo" style="width: 163px;"></el-input>
</el-form-item>
<el-form-item label="资产编号" style="margin-left: -10px">
<el-input v-model="pageData.assetNo" style="width: 163px;"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px">
@ -65,34 +71,38 @@
<el-input v-model="pageData.deptID" style="width: 120px"></el-input>
<el-input v-model="pageData.deptName" disabled style="width: 330px"></el-input>
</el-form-item>
<el-form-item label="在用" prop="active" :rules="rules.activeType">
<el-select v-model="pageData.active" style="width: 141px;">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select >
<el-form-item label="及时通知">
<el-select multiple collapse-tags v-model="pageData.mesTypeList" style="width: 151px;">
<el-option label="短信" value="A"></el-option>
<el-option label="邮件" value="B"></el-option>
<el-option label="随身机" value="C"></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准响应时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.standardResponseDuration" style="width: 142px;"></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.standardResponseDuration" style="width: 137px;"></el-input-number>
</el-form-item>
<el-form-item label="超时响应推送时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutResponseDuration" style="width: 142px;"></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutResponseDuration" style="width: 137px;"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
<el-form-item label="序列号:">
<el-input v-model="pageData.seqNo" style="width: 220px;"></el-input>
</el-form-item>
<el-form-item label="资产编号">
<el-input v-model="pageData.assetNo" style="width: 220px;"></el-input>
<el-form-item label="在用" prop="active" :rules="rules.activeType">
<el-select v-model="pageData.active" style="width: 220px;">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select >
</el-form-item>
<el-form-item label="购入日期">
<el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss" style="width: 141px;"></el-date-picker>
<el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss" style="width: 220px;"></el-date-picker>
</el-form-item>
<el-form-item label="循环时间(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.cycleTimeSend" style="width: 152px;"></el-input-number>
</el-form-item>
<el-form-item label="标准维修时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.standardMaintenanceDuration" style="width: 142px;"></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.standardMaintenanceDuration" style="width: 137px;"></el-input-number>
</el-form-item>
<el-form-item label="超时维修推送时长(m)">
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutMaintenanceDuration" style="width: 142px;"></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutMaintenanceDuration" style="width: 137px;"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
@ -109,7 +119,7 @@
</el-form>
<el-footer style="height:31px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="saveEamObject()">保存</el-button>
<el-button type="primary" @click="closeDialog">关闭</el-button>
<el-button type="primary" @click="visible = false">关闭</el-button>
</el-footer>
</el-dialog>
<!--列表的组件-->
@ -165,7 +175,10 @@ export default {
standardMaintenanceDuration: '',
timeOutMaintenanceDuration: '',
standardResponseDuration: '',
timeOutResponseDuration: ''
timeOutResponseDuration: '',
cycleTimeSend: undefined,
mesType: '',
mesTypeList: []
},
dataListLoading: false,
rules:{
@ -295,6 +308,7 @@ export default {
this.$message.warning("所属部门不能为空!");
return false
}
this.pageData.mesType = this.pageData.mesTypeList.join(',')
// 判断是否是新增标签自定义
if (this.pageData.addFlag === 'Y') {
this.insertEamObjectData()

22
src/views/modules/eam/eam_device_list.vue
View File

@ -68,6 +68,7 @@
highlight-current-row
@row-click="setCurrentRow"
@current-change="changeCurrentRow"
v-loading="searchLoading"
border
style="width: 100%;">
<el-table-column
@ -3294,6 +3295,7 @@
authUpdate: false,
authDelete: false,
menuId: this.$route.meta.menuId,
searchLoading: false
}
},
@ -3519,6 +3521,7 @@
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.searchLoading = true
getEamObjectList(this.searchData).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
@ -3530,7 +3533,12 @@
//设置选中行
this.$refs.eamObjectTable.setCurrentRow(this.dataList[0])
}
this.searchLoading = false
} else {
this.searchLoading = false
}
}).catch(() => {
this.searchLoading = false
})
},
@ -3711,7 +3719,10 @@
standardMaintenanceDuration: '',
timeOutMaintenanceDuration: '',
standardResponseDuration: '',
timeOutResponseDuration: ''
timeOutResponseDuration: '',
cycleTimeSend: undefined,
mesType: '',
mesTypeList: []
}
//打开组件 去做新增业务
this.$nextTick(() => {
@ -3736,8 +3747,13 @@
},
updateEamObjectModal (row) {
let currentData = row
currentData.addFlag = 'N'
let currentData = {
...row,
addFlag: 'N',
mesType: row.mesType,
mesTypeList: row.mesType == null || row.mesType === '' ? [] : row.mesType.split(','),
cycleTimeSend: row.cycleTimeSend == null || row.cycleTimeSend === '' ? undefined : row.cycleTimeSend,
}
//打开组件 去做新增业务
this.$nextTick(() => {
this.$refs.comAddUpdateEamObject.init(currentData)

Write Preview
Loading…
Cancel
Save