From 0d626ae57149d5ed40a32bd8b808ca6069aa6d5e Mon Sep 17 00:00:00 2001 From: gaosp <gaosp> Date: 星期日, 14 一月 2024 16:35:08 +0800 Subject: [PATCH] update --- src/container/maintenance/index.vue | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/container/maintenance/index.vue b/src/container/maintenance/index.vue index 539be65..e861d9e 100644 --- a/src/container/maintenance/index.vue +++ b/src/container/maintenance/index.vue @@ -1,7 +1,7 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed - * @LastEditTime: 2024-01-13 22:13:21 + * @LastEditTime: 2024-01-14 16:13:57 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/maintenance/index.vue --> <template> @@ -16,18 +16,18 @@ <div class="item"> <span>璁惧鍚嶇О</span> <el-select class="item-value" v-model="queryInfo.machineName" placeholder="璇烽�夋嫨"> - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> + <el-option v-for="item in machineList" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </div> - <div class="item"> + <!-- <div class="item"> <span>璁惧鍨嬪彿</span> <el-input class="item-value" v-model="queryInfo.type"></el-input> </div> <div class="item"> <span>璁惧瑙勬牸</span> <el-input class="item-value" v-model="queryInfo.specification"></el-input> - </div> + </div> --> <div class="item"> <span>浣跨敤閮ㄩ棬</span> <el-select class="item-value" v-model="queryInfo.department"> @@ -35,10 +35,10 @@ </el-option> </el-select> </div> - <div class="item"> + <!-- <div class="item"> <span>瀹夎浣嶇疆</span> <el-input class="item-value" v-model="queryInfo.location"></el-input> - </div> + </div> --> <div class="item"> <span>璁″垝寮�濮嬫棩鏈�</span> <el-date-picker class="item-value" v-model="queryInfo.planStartDate" align="right" type="date" placeholder="閫夋嫨鏃ユ湡"> @@ -65,8 +65,8 @@ align="center" width="55"> </el-table-column> --> - <el-table-column align="center" label="缁熶竴缂栧彿" prop="uuid"> - </el-table-column> + <!-- <el-table-column align="center" label="缁熶竴缂栧彿" prop="uuid"> + </el-table-column> --> <el-table-column align="center" label="璁惧鍚嶇О" width="150" :show-overflow-tooltip="true" prop="machineName"> </el-table-column> <el-table-column align="center" label="璁惧鍨嬪彿" prop="type"> @@ -113,12 +113,13 @@ </el-table-column> </template> </List> - <DailyMAddD ref="dailyMAddD" @reflash="submitForm" :departmentlist="departmentlist"></DailyMAddD> + <DailyMAddD ref="dailyMAddD" @reflash="submitForm" :style="navName" :departmentlist="departmentlist" :machineList="machineList" :userList="userList"></DailyMAddD> </div> </template> <script> import List from '../list/index.vue' import { getUseDpts,getRequest } from '@/api/Api' +import { userList } from '@/api/MdcApi' import DailyMAddD from './dailyMAdd.vue' export default { components: { @@ -134,7 +135,8 @@ data() { return { departmentlist: [], - options: [], + userList: [], + machineList: [], queryInfo: { uuid: '', machineName: '', @@ -163,6 +165,15 @@ } }) }) + getRequest('machineList', { + }).then(res => { + this.machineList = res.data.list + console.log(res) + }) + getRequest('userList', { + }).then(res => { + this.userList = res.data.list + }) }, query() { this.$refs.list.pageQuery(this.queryInfo) -- Gitblit v1.9.3