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 +++-
src/container/ledger/index.vue | 32 ++++
src/api/Api.js | 10 +
src/container/component/index.vue | 11 +
src/container/maintenance/dailyMAdd.vue | 237 ++++++++++++++------------------------
5 files changed, 154 insertions(+), 167 deletions(-)
diff --git a/src/api/Api.js b/src/api/Api.js
index 0ee9a99..ec6ecc8 100644
--- a/src/api/Api.js
+++ b/src/api/Api.js
@@ -1,7 +1,7 @@
/*
* @Date: 2024-01-10 20:37:45
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-14 15:03:32
+ * @LastEditTime: 2024-01-14 16:17:20
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/api/Api.js
*/
import ajax from '@/utils/ajax'
@@ -25,6 +25,10 @@
accountQuery: {
url: '/account/remainings',
method: 'GET'
+ },
+ accountDel: {
+ url: '/account/delete',
+ method: 'POST'
},
componentQuery: {
url: '/component/pageQuery',
@@ -81,6 +85,10 @@
machineUpdate: {
url: '/machine/modify',
method: 'POST'
+ },
+ userList: {
+ url: '/user/list',
+ method: 'GET'
}
}
// 姝ｅ紡鐜閰嶇疆鍦板潃
diff --git a/src/container/component/index.vue b/src/container/component/index.vue
index 88983dc..115b671 100644
--- a/src/container/component/index.vue
+++ b/src/container/component/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-13 22:13:05
+ * @LastEditTime: 2024-01-14 15:36:44
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/component/index.vue
-->
<template>
@@ -64,7 +64,7 @@
</template>
<template slot="columns">
<el-table-column
- prop="date"
+ prop="machineId"
label="鏈哄簥鍚�"
width="180">
</el-table-column>
@@ -74,12 +74,15 @@
width="180">
</el-table-column>
<el-table-column
- prop="address"
+ prop="process"
label="宸ュ簭鍙�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="time"
label="鍔犲伐鏃堕棿">
+ <template slot-scope="scope">
+ <span>{{scope.row.time.slice(0,10)}}</span>
+ </template>
</el-table-column>
</template>
</List>
diff --git a/src/container/ledger/index.vue b/src/container/ledger/index.vue
index 209e42b..749b994 100644
--- a/src/container/ledger/index.vue
+++ b/src/container/ledger/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-13 22:13:17
+ * @LastEditTime: 2024-01-14 16:31:53
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue
-->
<template>
@@ -53,7 +53,8 @@
</div>
<div class="item">
<span>鎶曚骇鏃ユ湡</span>
- <el-date-picker class="item-value" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="queryInfo.productionDate" type="date" clearable placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
+ <el-date-picker class="item-value" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+ v-model="queryInfo.productionDate" type="date" clearable placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
</div>
<div class="item">
<span>鐢熶骇鍘傚</span>
@@ -128,6 +129,7 @@
<el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row)">缂栬緫</el-button>
+ <el-button type="text" size="small" @click="del(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -139,7 +141,7 @@
</template>
<script>
import ManageAddUpdate from './Manage-add-update'
-import { getUseDpts } from '@/api/Api'
+import { getUseDpts, getRequest } from '@/api/Api'
import List from '../list/index.vue'
export default {
components: {
@@ -218,7 +220,7 @@
query() {
this.$refs.list.pageQuery(this.queryInfo)
},
- reset () {
+ reset() {
Object.keys(this.queryInfo).forEach(key => {
this.queryInfo[key] = ''
})
@@ -237,6 +239,26 @@
addOrUpdateHandle(row) {
this.row = row
this.addOrUpdateVisible = true
+ },
+ del(row) {
+ this.$confirm('纭畾瑕佹案涔呭垹闄ゆ椤�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ getRequest('accountDel', { ids: [row.id].join(',') }).then(res => {
+ this.$message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛锛�'
+ })
+ this.submitForm()
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ })
+ })
+ })
}
},
}
@@ -250,9 +272,11 @@
border: 1px solid #435F9E;
}
}
+
.el-button--mini {
background: transparent;
}
+
.el-button--primary {
background-color: transparent;
}
diff --git a/src/container/maintenance/dailyMAdd.vue b/src/container/maintenance/dailyMAdd.vue
index 13ae2c0..3213798 100644
--- a/src/container/maintenance/dailyMAdd.vue
+++ b/src/container/maintenance/dailyMAdd.vue
@@ -7,37 +7,17 @@
:visible.sync="dialogVisibleAdd" class="role-select">
<!-- 鏌ヨ琛ㄥ崟 -->
<el-form :model="dataForm" ref="dataForm" label-width="150px" style="margin-top:10px;">
- <el-row :gutter="20">
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="缁熶竴缂栧彿" prop="uuid">
- <el-input type="text" v-model="dataForm.uuid" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
+ <el-row :gutter="24">
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="璁惧鍚嶇О" prop="machineName">
- <el-select v-model="dataForm.machineName" placeholder="---璇烽�夋嫨---">
+ <el-select v-model="dataForm.machineId" placeholder="---璇烽�夋嫨---">
<el-option
- v-for="item in machineName"
+ v-for="item in machineList"
:key="item.id"
- :label="item.label"
- :value="item.value">
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
- </el-form-item>
- </el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="璁惧鍨嬪彿" prop="type">
- <el-input size="mini" type="text" v-model="dataForm.type"></el-input>
- </el-form-item>
- </el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="璁惧瑙勬牸" prop="specification">
- <el-input size="mini" type="text" v-model="dataForm.specification" @input="getMachineInfo"></el-input>
- </el-form-item>
- </el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="瀹夎鍦扮偣" prop="location">
- <el-input size="mini" type="text" v-model="dataForm.location"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
@@ -56,32 +36,12 @@
<el-form-item label="淇濆吇鑰�" prop="maintainPerson">
<el-select v-model="dataForm.maintainPerson" placeholder="---璇烽�夋嫨---" clearable >
<el-option
- v-for="item in maintainPerson"
+ v-for="item in userList"
:key="item.id"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
- </el-form-item>
- </el-col>
- <!-- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="淇濆吇鍛ㄦ湡" prop="maintainPeriod">
- <el-input size="mini" type="text" v-model="dataForm.maintainPeriod"></el-input>
- </el-form-item>
- </el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="鎶曚骇鏃ユ湡" prop="productionDate">
- <el-input size="mini" type="text" v-model="dataForm.productionDate"></el-input>
- </el-form-item>
- </el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="鐢熶骇鍘傚" prop="manufacturer">
- <el-input size="mini" type="text" v-model="dataForm.manufacturer"></el-input>
- </el-form-item>
- </el-col> -->
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="璁″垝鐘舵��" prop="planStatus">
- <el-input size="mini" type="text" v-model="dataForm.planStatus" readonly></el-input>
</el-form-item>
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
@@ -97,32 +57,36 @@
</el-form-item>
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
+ <el-form-item label="淇濆吇鍐呭涓庡瓨鍦ㄩ棶棰�" prop="detail">
+ <el-input size="mini" type="text" v-model="dataForm.detail"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
+ </el-col>
+ <el-col :xs="24":sm="10":md="10":lg="10":xl="10">
<el-form-item label="璁″垝寮�濮嬫棩鏈�" prop="planStartDate">
<el-date-picker
format="yyyy 骞� MM 鏈� dd 鏃�"
value-format="yyyy-MM-dd"
v-model="dataForm.planStartDate"
range-separator="鑷�"
+ type="daterange"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
+ <el-col :xs="24":sm="10":md="10":lg="10":xl="10">
<el-form-item label="璁″垝瀹屾垚鏃ユ湡" prop="planFinishDate">
<el-date-picker
format="yyyy 骞� MM 鏈� dd 鏃�"
value-format="yyyy-MM-dd"
v-model="dataForm.planFinishDate"
range-separator="鑷�"
+ type="daterange"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
- <el-form-item label="淇濆吇鍐呭涓庡瓨鍦ㄩ棶棰�" prop="detail">
- <el-input size="mini" type="text" v-model="dataForm.detail"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -140,32 +104,18 @@
import { getMachineList, maintainCreate, maintainUpdate, userList, departmentGet } from '@/api/MdcApi'
import { getRequest } from '@/api/Api'
export default {
- props: ['styles', 'departmentlist'],
+ props: ['styles', 'departmentlist','machineList','userList'],
data() {
return {
dataForm: {
- style: '鏃ュ父淇濆吇',
- state: 1,
- machineName: '', // 璁惧鍚嶇О
- uuid: '', // 鍚屾剰缂栫爜
- type: '', // 璁惧绫诲瀷
- specification: '', // 璁惧瑙勬牸
- location: '', // 瀹夎浣嶇疆
- department: '', // 浣跨敤鍗曚綅
- maintainPerson: '', // 淇濆吇鑰�
- productionDate: '', // 鎶曚骇鏃ユ湡
- manufacturer: '', // 鐢熶骇鍘傚
- planStatus: '1', // 璁″垝鐘舵��
- isQualified: '鍚堟牸',
- planStartDate: '',
- planFinishDate: '',
- detail: '' // 淇濆吇鍐呭涓庡瓨鍦ㄩ棶棰�
+ machineId: '',
+ department: '',
+ maintainPerson: '',
+ isQualified: '',
+ detail: '',
},
dialogVisibleAdd: false,
// 涓嬫媺妗�
- machineName: [], // 璁惧鍚嶇О
- department: [], // 浣跨敤閮ㄩ棬
- maintainPerson: [], // 璁惧鍚嶇О
isQualified: [{ // 鏄惁鍚堟牸
label: '鍚堟牸',
value: '鍚堟牸'
@@ -183,42 +133,16 @@
init(n, data) {
this.data = data
this.no = n
- if (this.styles === '1') {
- this.dataForm.style = '鏃ュ父淇濆吇'
- } else if (this.styles === '2') {
- this.dataForm.style = '涓�绾т繚鍏�'
- } else if (this.styles === '3') {
- this.dataForm.style = '浜岀骇淇濆吇'
- } else {
- this.dataForm.style = '涓夌骇淇濆吇'
- }
if (n === 1) {
- this.title = '鏂板' + this.dataForm.style
- this.dataForm.machineName = ''
- this.dataForm.uuid = ''
- this.dataForm.type = ''
- this.dataForm.specification = ''
- this.dataForm.location = ''
- this.dataForm.department = ''
- this.dataForm.maintainPerson = ''
- this.dataForm.productionDate = ''
- this.dataForm.manufacturer = ''
- this.dataForm.planStartDate = ''
- this.dataForm.planFinishDate = ''
- this.dataForm.isQualified = '鍚堟牸'
- this.dataForm.detail = ''
+ this.title = '鏂板' + this.style
+ Object.keys(this.dataForm).forEach(key => {
+ this.dataForm[key] = ''
+ })
} else {
- this.title = '淇敼' + this.dataForm.styles
- this.dataForm.machineName = this.data.machineName
- this.dataForm.uuid = this.data.uuid
- this.dataForm.type = this.data.type
- this.dataForm.specification = this.data.specification
- this.dataForm.location = this.data.location
- this.dataForm.department = this.data.department
- this.dataForm.maintainPerson = this.data.userName
- this.dataForm.isQualified = this.data.isQualified === '0' ? '涓嶅悎鏍�' : '鍚堟牸'
- this.dataForm.manufacturer = this.data.manufacturer
- this.dataForm.detail = this.data.detail
+ this.title = '淇敼' + this.style
+ Object.keys(this.dataForm).forEach(key => {
+ this.dataForm[key] = data[key]
+ })
}
this.dialogVisibleAdd = true
this.machineName = []
@@ -235,48 +159,65 @@
const completeDateTo = this.dataForm.planFinishDate[1]
const isQualified = this.dataForm.isQualified === '鍚堟牸' ? 1 : 0
if (this.no === 1) {
- getRequest('maintainCreate',{})
- // maintainCreate(
- // this.styles, this.dataForm.uuid, this.dataForm.machineName, this.dataForm.type,
- // this.dataForm.specification, this.dataForm.department, this.dataForm.location,
- // startDateFrom, startDateTo, completeDateFrom, completeDateTo, isQualified,
- // this.dataForm.state, this.dataForm.detail
- // ).then(res => {
- // if (res.result === 'SUCCESS') {
- // this.$message({
- // type: 'success',
- // message: '淇濆瓨鎴愬姛!'
- // })
- // this.$emit('reflash')
- // // const that = this
- // this.dialogVisibleAdd = false
- // } else {
- // this.$message({
- // type: 'error',
- // message: res.result
- // })
- // }
- // })
+ console.log({
+ ...this.dataForm,
+ startDateFrom,
+ startDateTo,
+ completeDateFrom,
+ completeDateTo,
+ isQualified,
+ styles: this.style
+ })
+ // return
+ getRequest('maintainCreate',{
+ ...this.dataForm,
+ startDateFrom,
+ startDateTo,
+ completeDateFrom,
+ completeDateTo,
+ isQualified,
+ styles: this.style
+ }).then(res => {
+ if (res.result === 'SUCCESS') {
+ this.$message({
+ type: 'success',
+ message: '淇濆瓨鎴愬姛!'
+ })
+ this.$emit('reflash')
+ // const that = this
+ this.dialogVisibleAdd = false
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.result
+ })
+ }
+ })
} else {
- getRequest('maintainUpdate',{})
- // 淇敼淇濆瓨
- // maintainUpdate(this.styles, this.data.id, this.dataForm.uuid, this.dataForm.machineName, this.dataForm.type,
- // this.dataForm.specification, this.dataForm.department, this.dataForm.location,
- // startDateFrom, startDateTo, completeDateFrom, completeDateTo, isQualified,
- // this.dataForm.state, this.dataForm.detail).then(res => {
- // if (res.result === 'SUCCESS') {
- // this.$message({
- // type: 'success',
- // message: '淇濆瓨鎴愬姛!'
- // })
- // this.$emit('reflash')
- // } else {
- // this.$message({
- // type: 'error',
- // message: res.result
- // })
- // }
- // })
+ getRequest('maintainUpdate',{
+ ...this.dataForm,
+ startDateFrom,
+ startDateTo,
+ completeDateFrom,
+ completeDateTo,
+ isQualified,
+ styles: this.style
+ }).then(res => {
+ if (res.result === 'SUCCESS') {
+ this.$message({
+ type: 'success',
+ message: '淇濆瓨鎴愬姛!'
+ })
+ this.$emit('reflash')
+ // const that = this
+ this.dialogVisibleAdd = false
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.result
+ })
+ }
+ })
}
},
/**
@@ -288,7 +229,7 @@
}
},
created() {
- this.initDevices()
+ // this.initDevices()
}
}
</script>
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