bug修复
This commit is contained in:
		
							parent
							
								
									938efea6b4
								
							
						
					
					
						commit
						f2a731f9e8
					
				| 
						 | 
					@ -1,6 +1,13 @@
 | 
				
			||||||
<template>
 | 
					<template>
 | 
				
			||||||
    <div class="app-container">
 | 
					    <div class="app-container">
 | 
				
			||||||
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 | 
					        <el-form
 | 
				
			||||||
 | 
					            :model="queryParams"
 | 
				
			||||||
 | 
					            ref="queryForm"
 | 
				
			||||||
 | 
					            size="small"
 | 
				
			||||||
 | 
					            :inline="true"
 | 
				
			||||||
 | 
					            v-show="showSearch"
 | 
				
			||||||
 | 
					            label-width="68px"
 | 
				
			||||||
 | 
					        >
 | 
				
			||||||
            <el-form-item prop="deviceName">
 | 
					            <el-form-item prop="deviceName">
 | 
				
			||||||
                <el-input
 | 
					                <el-input
 | 
				
			||||||
                    v-model="queryParams.deviceName"
 | 
					                    v-model="queryParams.deviceName"
 | 
				
			||||||
| 
						 | 
					@ -71,15 +78,15 @@
 | 
				
			||||||
            <el-table-column label="装备类目" align="center" prop="typeName" width="250px" sortable>
 | 
					            <el-table-column label="装备类目" align="center" prop="typeName" width="250px" sortable>
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                    <span
 | 
					                    <span
 | 
				
			||||||
                >{{ scope.row.firstName }} <span v-show="scope.row.firstName">></span>
 | 
					                        >{{ scope.row.firstName }} <span v-show="scope.row.firstName">></span> {{ scope.row.secondName
 | 
				
			||||||
                {{ scope.row.secondName }}<span v-show="scope.row.secondName">></span
 | 
					                        }}<span v-show="scope.row.secondName">></span>{{ scope.row.thirdName }}</span
 | 
				
			||||||
                >{{ scope.row.thirdName }}</span
 | 
					 | 
				
			||||||
                    >
 | 
					                    >
 | 
				
			||||||
                </template>
 | 
					                </template>
 | 
				
			||||||
            </el-table-column>
 | 
					            </el-table-column>
 | 
				
			||||||
            <el-table-column label="装备型号" align="center" prop="typeName" sortable />
 | 
					            <el-table-column label="装备型号" align="center" prop="typeName" sortable />
 | 
				
			||||||
            <el-table-column label="所属公司" align="center" prop="companyName" sortable />
 | 
					            <el-table-column label="所属公司" align="center" prop="companyName" sortable />
 | 
				
			||||||
      <el-table-column label="上架时间" align="center" prop="createTime" sortable/>
 | 
					            <!-- <el-table-column label="上架时间" align="center" prop="createTime" sortable/> -->
 | 
				
			||||||
 | 
					            <el-table-column label="创建时间" align="center" prop="createTime" sortable />
 | 
				
			||||||
            <el-table-column label="更新时间" align="center" prop="updateTime" sortable />
 | 
					            <el-table-column label="更新时间" align="center" prop="updateTime" sortable />
 | 
				
			||||||
        </el-table>
 | 
					        </el-table>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -90,15 +97,13 @@
 | 
				
			||||||
            :limit.sync="queryParams.pageSize"
 | 
					            :limit.sync="queryParams.pageSize"
 | 
				
			||||||
            @pagination="getList"
 | 
					            @pagination="getList"
 | 
				
			||||||
        />
 | 
					        />
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<script>
 | 
					<script>
 | 
				
			||||||
import { getEquipmentTypeApi,getEquipmentListApi, } from "@/api/search/equipment";
 | 
					import { getEquipmentTypeApi, getEquipmentListApi } from '@/api/search/equipment'
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  name: "equipment",
 | 
					    name: 'equipment',
 | 
				
			||||||
    data() {
 | 
					    data() {
 | 
				
			||||||
        return {
 | 
					        return {
 | 
				
			||||||
            // 遮罩层
 | 
					            // 遮罩层
 | 
				
			||||||
| 
						 | 
					@ -106,7 +111,6 @@ export default {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            loadingTwo: false,
 | 
					            loadingTwo: false,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
            // 是否显示项目部Id
 | 
					            // 是否显示项目部Id
 | 
				
			||||||
            showName: false,
 | 
					            showName: false,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -135,7 +139,7 @@ export default {
 | 
				
			||||||
            teamTempList: [],
 | 
					            teamTempList: [],
 | 
				
			||||||
            warnList: [],
 | 
					            warnList: [],
 | 
				
			||||||
            // 弹出层标题
 | 
					            // 弹出层标题
 | 
				
			||||||
      title: "",
 | 
					            title: '',
 | 
				
			||||||
            // 是否显示弹出层
 | 
					            // 是否显示弹出层
 | 
				
			||||||
            open: false,
 | 
					            open: false,
 | 
				
			||||||
            // 日期选择器
 | 
					            // 日期选择器
 | 
				
			||||||
| 
						 | 
					@ -176,51 +180,49 @@ export default {
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            // 表单参数
 | 
					            // 表单参数
 | 
				
			||||||
            form: {},
 | 
					            form: {},
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    created() {
 | 
					    created() {
 | 
				
			||||||
    this.getTypeTreeData();
 | 
					        this.getTypeTreeData()
 | 
				
			||||||
    this.getList();
 | 
					        this.getList()
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    methods: {
 | 
					    methods: {
 | 
				
			||||||
        /** 查询树形列表 */
 | 
					        /** 查询树形列表 */
 | 
				
			||||||
        getTypeTreeData() {
 | 
					        getTypeTreeData() {
 | 
				
			||||||
      getEquipmentTypeApi().then(response => {
 | 
					            getEquipmentTypeApi().then((response) => {
 | 
				
			||||||
        this.deviceTypeTree = response.data;
 | 
					                this.deviceTypeTree = response.data
 | 
				
			||||||
      });
 | 
					            })
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /** 查询装备信息列表 */
 | 
					        /** 查询装备信息列表 */
 | 
				
			||||||
        async getList() {
 | 
					        async getList() {
 | 
				
			||||||
      this.loading = true;
 | 
					            this.loading = true
 | 
				
			||||||
            if (this.dateRange.length > 0) {
 | 
					            if (this.dateRange.length > 0) {
 | 
				
			||||||
                this.queryParams.startTime = this.dateRange[0]
 | 
					                this.queryParams.startTime = this.dateRange[0]
 | 
				
			||||||
                this.queryParams.endTime = this.dateRange[1]
 | 
					                this.queryParams.endTime = this.dateRange[1]
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
     await getEquipmentListApi(this.queryParams).then(response => {
 | 
					            await getEquipmentListApi(this.queryParams).then((response) => {
 | 
				
			||||||
                console.log('11111', response)
 | 
					                console.log('11111', response)
 | 
				
			||||||
        this.tableData = response.data.rows;
 | 
					                this.tableData = response.data.rows
 | 
				
			||||||
        this.total = response.data.total;
 | 
					                this.total = response.data.total
 | 
				
			||||||
        this.loading = false;
 | 
					                this.loading = false
 | 
				
			||||||
      });
 | 
					            })
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
        //打开班组施工页面
 | 
					        //打开班组施工页面
 | 
				
			||||||
        openTeam(row) {
 | 
					        openTeam(row) {
 | 
				
			||||||
          this.teamId = row.teamId;
 | 
					            this.teamId = row.teamId
 | 
				
			||||||
          this.title = "查看人员"
 | 
					            this.title = '查看人员'
 | 
				
			||||||
          this.showTeam = true;
 | 
					            this.showTeam = true
 | 
				
			||||||
          this.getListTeam();
 | 
					            this.getListTeam()
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //打开临时施工页面
 | 
					        //打开临时施工页面
 | 
				
			||||||
        openTeamTemp(row) {
 | 
					        openTeamTemp(row) {
 | 
				
			||||||
          this.teamId = row.teamId;
 | 
					            this.teamId = row.teamId
 | 
				
			||||||
          this.title = "查看临时人员"
 | 
					            this.title = '查看临时人员'
 | 
				
			||||||
          this.showTeamTemp = true;
 | 
					            this.showTeamTemp = true
 | 
				
			||||||
          this.getListTeamTemp();
 | 
					            this.getListTeamTemp()
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // 取消按钮
 | 
					        // 取消按钮
 | 
				
			||||||
| 
						 | 
					@ -242,18 +244,18 @@ export default {
 | 
				
			||||||
        // },
 | 
					        // },
 | 
				
			||||||
        /** 搜索按钮操作 */
 | 
					        /** 搜索按钮操作 */
 | 
				
			||||||
        handleQuery() {
 | 
					        handleQuery() {
 | 
				
			||||||
      this.queryParams.pageNum = 1;
 | 
					            this.queryParams.pageNum = 1
 | 
				
			||||||
      this.getList();
 | 
					            this.getList()
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        /** 重置按钮操作 */
 | 
					        /** 重置按钮操作 */
 | 
				
			||||||
        resetQuery() {
 | 
					        resetQuery() {
 | 
				
			||||||
      this.resetForm("queryForm");
 | 
					            this.resetForm('queryForm')
 | 
				
			||||||
      this.dateRange = [];
 | 
					            this.dateRange = []
 | 
				
			||||||
            this.deviceTypeList = []
 | 
					            this.deviceTypeList = []
 | 
				
			||||||
            this.queryParams.startTime = ''
 | 
					            this.queryParams.startTime = ''
 | 
				
			||||||
            this.queryParams.endTime = ''
 | 
					            this.queryParams.endTime = ''
 | 
				
			||||||
            this.queryParams.typeId = ''
 | 
					            this.queryParams.typeId = ''
 | 
				
			||||||
      this.handleQuery();
 | 
					            this.handleQuery()
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        //装备类目-change
 | 
					        //装备类目-change
 | 
				
			||||||
| 
						 | 
					@ -264,10 +266,9 @@ export default {
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                this.queryParams.typeId = ''
 | 
					                this.queryParams.typeId = ''
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
</script>
 | 
					</script>
 | 
				
			||||||
<style lang="scss" scoped>
 | 
					<style lang="scss" scoped>
 | 
				
			||||||
.uploadImg {
 | 
					.uploadImg {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue