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

2024-01-29 

系统优化3
java8
fengyuan_yang 2 years ago
parent
09d2bb83e1
commit
5a857074b2
3 changed files with 22 additions and 136 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. 108
      src/views/modules/eam/com_eam_object_add_update.vue
  2. 17
      src/views/modules/eam/eamFamily.vue
  3. 33
      src/views/modules/eam/eam_device_list.vue

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

@ -1,110 +1,6 @@
<template>
<div class="customer-css">
<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="设备编码" prop="objectID" :rules="rules.objectIdType">-->
<!-- <el-input v-model="pageData.objectID" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="设备名称" prop="objectDesc" :rules="rules.objectDescType">-->
<!-- <el-input v-model="pageData.objectDesc" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item prop="locationID" :rules="rules.locationType">-->
<!-- <span slot="label" @click="getBaseList(26)"><a herf="#">区域编码</a></span>-->
<!-- <el-input v-model="pageData.locationID" style="width: 221px;"></el-input >-->
<!-- </el-form-item>-->
<!-- <el-form-item label="区域名称">-->
<!-- <el-input v-model="pageData.locationName" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item prop="familyID" :rules="rules.familyType">-->
<!-- <span slot="label" @click="getBaseList(27)"><a herf="#">分类编码</a></span>-->
<!-- <el-input v-model="pageData.familyID" style="width: 221px;" ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分类名称">-->
<!-- <el-input v-model="pageData.familyDesc" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item prop="groupID" :rules="rules.groupType">-->
<!-- <span slot="label" @click="getBaseList(28)"><a herf="#">分组编码</a></span>-->
<!-- <el-input v-model="pageData.groupID" style="width: 221px;" ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分组名称">-->
<!-- <el-input v-model="pageData.groupDesc" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item>-->
<!-- <span slot="label" @click="getBaseList(29)"><a herf="#">供应商编码</a></span>-->
<!-- <el-input v-model="pageData.supplierID" style="width: 221px;"></el-input >-->
<!-- </el-form-item>-->
<!-- <el-form-item label="供应商名称">-->
<!-- <el-input v-model="pageData.supplierName" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item>-->
<!-- <span slot="label" @click="getBaseList(30)"><a herf="#">制造商编码</a></span>-->
<!-- <el-input v-model="pageData.manufacturerID" style="width: 221px;" ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="制造商名称">-->
<!-- <el-input v-model="pageData.manufacturerName" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="序列号:">-->
<!-- <el-input v-model="pageData.seqNo" style="width: 221px;"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="购入日期:">-->
<!-- <el-date-picker v-model="pageData.purchessDate" value-format="yyyy-MM-dd HH:mm:ss" style="width: 221px;"></el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item>-->
<!-- <span slot="label" style="" @click="getBaseList(203)"><a herf="#">机台编码</a></span>-->
<!-- <el-input v-model="pageData.resourceID" style="width: 221px;" ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="机台名称">-->
<!-- <el-input v-model="pageData.resourceDesc" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item prop="deptID" :rules="rules.deptType">-->
<!-- <span slot="label" @click="getBaseList(204)"><a herf="#">所属部门编码</a></span>-->
<!-- <el-input v-model="pageData.deptID" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属部门名称">-->
<!-- <el-input v-model="pageData.deptName" disabled style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="在用" prop="active" :rules="rules.activeType">-->
<!-- <el-select v-model="pageData.active" style="width: 221px;">-->
<!-- <el-option label="是" value="Y"></el-option>-->
<!-- <el-option label="否" value="N"></el-option>-->
<!-- </el-select >-->
<!-- </el-form-item>-->
<!-- <el-form-item label="资产编号" >-->
<!-- <el-input v-model="pageData.assetNo" style="width: 221px;" ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="备注" >-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- v-model="pageData.assetRemark"-->
<!-- :rows="3"-->
<!-- resize='none'-->
<!-- maxlength="300"-->
<!-- show-word-limit-->
<!-- style="width: 456px;height: 60px">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<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">
@ -465,8 +361,8 @@ export default {
this.$set(this.pageData,'manufacturerName',val.ManufacturerName)
} else if (this.tagNo === 503) {
//设置参数
this.pageData.resourceID = val.resource_id
this.$set(this.pageData,'resourceDesc',val.resource_desc)
this.pageData.resourceID = val.ResourceID
this.$set(this.pageData,'resourceDesc',val.ResourceDesc)
} else if (this.tagNo === 204) {
//设置参数
this.pageData.deptID = val.department_id

17
src/views/modules/eam/eamFamily.vue
View File

@ -7,10 +7,10 @@
</span>
</div>
<el-row>
<el-row :gutter="5">
<!-- 树形结构 -->
<el-col :span="7" :style="{width: toolInstanceIdWidth + 'px'}">
<el-card style="width: 99%" :style="{height: height + 43 + 'px'}">
<el-col :span="5" :style="{height: this.height + 54 + 'px'}" style="display: block;overflow-y: scroll">
<el-card style="width: 99%" >
<div slot="header" style="margin-top: 3px">
<el-button size="mini" type="primary" @click="addTree">添加</el-button>
<el-button size="mini" type="info" @click="getTreeSelect" style="margin-right:10px">刷新</el-button>
@ -42,7 +42,7 @@
</el-card>
</el-col>
<!-- 数据 -->
<el-col :span="17" :style="{width: recordWidth + 'px'}">
<el-col :span="19">
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'BU'">
@ -226,8 +226,8 @@ export default {
totalPage: 0,
dataList: [],
dataListSelections: [],
toolInstanceIdWidth: 350,
recordWidth: 600,
toolInstanceIdWidth: 300,
recordWidth: 0,
searchData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
@ -446,10 +446,11 @@ export default {
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 190
this.height = window.innerHeight - 210
})
this.$nextTick(() => {
this.recordWidth = window.innerWidth - this.toolInstanceIdWidth - 270
// this.recordWidth = window.innerWidth - this.toolInstanceIdWidth - 255
this.recordWidth = "68vw"
})
},
methods: {

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

@ -7,24 +7,18 @@
</span>
</div>
<el-row>
<el-col :span="7" :style="{width: toolInstanceIdWidth + 'px'}" class="down-tree">
<!-- <fieldset class="customer-field" style="width: 98%; margin-top: 12px;" :style="{height: height + 30 + 'px'}">-->
<!-- <legend style="accent-color: #07141e;font-size: medium;font-weight: bold">设备分类</legend>-->
<el-row :gutter="15">
<el-col :span="5" :style="{height: this.height + 45 + 'px'}" style="display: block;overflow-y: scroll">
<el-tree
:data="treeData"
node-key="sonId"
:default-expand-all=false
@node-click="handleNodeClick"
:props="defaultProps"
>
:props="defaultProps">
</el-tree>
<!-- </fieldset>-->
</el-col>
<el-col :span="17" :style="{width: recordWidth + 'px'}">
<!-- <fieldset class="customer-field" style="width: 100%;">-->
<!-- <legend>列表</legend>-->
<el-col :span="19">
<el-form :inline="true" label-position="top">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
@ -120,7 +114,6 @@
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- </fieldset>-->
</el-col>
</el-row>
@ -918,7 +911,7 @@
limit: 10
},
pageIndex: 1,
pageSize: 100,
pageSize: 20,
totalPage: 0,
height: 200,
secondHeight: 200,
@ -3254,8 +3247,8 @@
active:'',
id:'',
},
toolInstanceIdWidth: 350,
recordWidth: 600,
toolInstanceIdWidth: 17,
recordWidth: 0,
treeData: [],
defaultProps: {
children: "familyList",
@ -3273,12 +3266,13 @@
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight / 2 - 30;
this.height = window.innerHeight / 2 - 10
/*第二个表格高度的动态调整*/
this.secondHeight = window.innerHeight / 2 - 190;
this.secondHeight = window.innerHeight - this.height - 235
})
this.$nextTick(() => {
this.recordWidth = window.innerWidth - this.toolInstanceIdWidth - 270
//this.recordWidth = window.innerWidth - this.toolInstanceIdWidth - 270
this.recordWidth = "68vw"
})
},
@ -4508,14 +4502,9 @@ padding: 0px !important;
}
.down-tree{
height: 470px;
display: block;
overflow-y: scroll;
}
</style>
Write Preview
Loading…
Cancel
Save