From 6be859f745beaa13a831f3291147612f66b9d776 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 26 十一月 2024 09:42:21 +0800
Subject: [PATCH] ll
---
admin/src/api/Inspection/device.js | 4 +
admin/src/api/Inspection/deviceRecord.js | 44 ++++++++++++++
admin/src/views/operation/components/deviceEdit.vue | 60 +++++++++++++-------
admin/src/views/operation/device.vue | 14 +++-
4 files changed, 98 insertions(+), 24 deletions(-)
diff --git a/admin/src/api/Inspection/device.js b/admin/src/api/Inspection/device.js
index 5098bb4..ec4923a 100644
--- a/admin/src/api/Inspection/device.js
+++ b/admin/src/api/Inspection/device.js
@@ -25,6 +25,10 @@
return request.post('/visitsAdmin/cloudService/business/ywDevice/updateById', data)
}
+// 璇︽儏
+export function detailById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywDevice/${id}`)
+}
// 鍒犻櫎
export function deleteById (id) {
return request.get(`/visitsAdmin/cloudService/business/ywDevice/delete/${id}`)
diff --git a/admin/src/api/Inspection/deviceRecord.js b/admin/src/api/Inspection/deviceRecord.js
new file mode 100644
index 0000000..741f588
--- /dev/null
+++ b/admin/src/api/Inspection/deviceRecord.js
@@ -0,0 +1,44 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywDeviceRecord/page', data, {
+ trim: true
+ })
+}
+
+// 瀵煎嚭Excel
+export function exportExcel (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywDeviceRecord/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywDeviceRecord/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/ywDeviceRecord/updateById', data)
+}
+
+// 璇︽儏
+export function detailById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywDeviceRecord/${id}`)
+}
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/ywDeviceRecord/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/ywDeviceRecord/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/views/operation/components/deviceEdit.vue b/admin/src/views/operation/components/deviceEdit.vue
index 1f81c25..4b24b38 100644
--- a/admin/src/views/operation/components/deviceEdit.vue
+++ b/admin/src/views/operation/components/deviceEdit.vue
@@ -12,7 +12,7 @@
<el-input v-model="param.modelNo" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
<el-form-item label="璁惧鍒嗙被" prop="">
- <el-cascader v-model="param.areaIds" @change="changeSel" placeholder="璇烽�夋嫨璁惧鍒嗙被" clearable :options="cateList"
+ <el-cascader v-model="param.cateIds" @change="changeSel" placeholder="璇烽�夋嫨璁惧鍒嗙被" clearable :options="cateList"
:props="{
label: 'name',
value: 'id',
@@ -20,7 +20,7 @@
}"></el-cascader>
</el-form-item>
<el-form-item label="璁惧绠＄悊鍛�" prop="">
- <el-select v-model="param.userId" clearable filterable class="w400">
+ <el-select v-model="param.userId" clearable filterable>
<el-option v-for="item in staffList" :label="item.realname" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -29,27 +29,24 @@
</el-form-item>
<el-form-item label="渚涘簲鍟�" prop="">
- <el-input v-model="param.company" placeholder="璇疯緭鍏�" v-trim />
+ <el-input v-model="param.supplier" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
<el-form-item label="杩愮淮鍐呭" prop="">
<el-input type="textarea" :rows="4" v-model="param.content" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="璁惧鐘舵��" prop="">
- <el-select v-model="param.status" filterable clearable>
- <el-option value="0" label="姝ｅ父"></el-option>
- <el-option value="1" label="鎹熷潖"></el-option>
- <el-option value="2" label="鎶ュ簾"></el-option>
+ <el-select v-model="param.status" filterable>
+ <el-option :value="0" label="姝ｅ父"></el-option>
+ <el-option :value="1" label="鎹熷潖"></el-option>
+ <el-option :value="2" label="鎶ュ簾"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐓х墖" prop="">
<UploadAvatarImage :file="{ 'imgurlfull': param.imgurlfull, 'imgurl': param.imgurl }"
- :uploadData="{ folder: 'projects' }" @uploadSuccess="uploadAvatarSuccess" @uploadEnd="isUploading = false"
+ :uploadData="{ folder: 'ywDevice/' }" @uploadSuccess="uploadAvatarSuccess" @uploadEnd="isUploading = false"
@uploadBegin="isUploading = true" />
</el-form-item>
-
-
-
</el-form>
</GlobalWindow>
</template>
@@ -58,7 +55,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { fetchList } from '@/api/business/category'
-import { create, updateById } from '@/api/Inspection/device'
+import { create, updateById, detailById } from '@/api/Inspection/device'
import { getUserList } from '@/api/system/user'
import { Message } from 'element-ui'
export default {
@@ -67,7 +64,9 @@
return {
isShowModal: false,
subLoading: false,
- param: {},
+ param: {
+ status: 0
+ },
cateList: [],
rules: {
name: [{ required: true, message: '璇疯緭鍏�' }],
@@ -88,16 +87,35 @@
let fn = param.id ? updateById : create
this.subLoading = true
fn(param).then(res => {
- if (res.code == 200) {
- this.subLoading = false
- this.$emit('success')
- Message.success('淇濆瓨鎴愬姛')
- this.close()
- }
+ this.subLoading = false
+ this.$emit('success')
+ Message.success('淇濆瓨鎴愬姛')
+ this.close()
}).catch(() => {
this.subLoading = false
})
}
+ })
+ },
+ getDetail(id) {
+ detailById(id).then(res => {
+ this.param = res
+ const cateId = this.param.cateId || ''
+ setTimeout(() => {
+ if (cateId) {
+ this.cateList.forEach(item => {
+ if (item.childCategoryList) {
+ item.childCategoryList.forEach(item2 => {
+ if (item2.id == cateId) {
+ this.$set(this.param, 'cateIds', [item.id, item2.id])
+ console.log('cateId', this.form)
+
+ }
+ })
+ }
+ })
+ }
+ },1000)
})
},
getStaff() {
@@ -117,9 +135,9 @@
},
changeSel(e) {
if (e && e.length == 2) {
- this.$set(this.param, 'areaId', e[1])
+ this.$set(this.param, 'cateId', e[1])
} else {
- this.$set(this.param, 'areaId', '')
+ this.$set(this.param, 'cateId', '')
}
},
uploadAvatarSuccess(file) {
diff --git a/admin/src/views/operation/device.vue b/admin/src/views/operation/device.vue
index 202eccd..5c34d4f 100644
--- a/admin/src/views/operation/device.vue
+++ b/admin/src/views/operation/device.vue
@@ -8,11 +8,17 @@
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="code" label="璁惧缂栧彿" min-width="100" show-overflow-tooltip />
<el-table-column prop="name" label="璁惧鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="璁惧鍒嗙被" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="categoryName" label="璁惧鍒嗙被" min-width="100" show-overflow-tooltip />
<el-table-column prop="modelNo" label="璁惧鍨嬪彿" min-width="100" show-overflow-tooltip />
<el-table-column prop="realName" label="绠＄悊鍛�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="company" label="璁惧渚涘簲鍟�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="status" label="璁惧鐘舵��" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="supplier" label="璁惧渚涘簲鍟�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="status" label="璁惧鐘舵��" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span v-if="row.status == 0">姝ｅ父</span>
+ <span v-if="row.status == 1">鎹熷潖</span>
+ <span v-if="row.status == 2">鎶ュ簾</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="handleEdit(row)" icon="el-icon-edit"
@@ -104,6 +110,8 @@
this.$nextTick(() => {
this.$refs.EditRef.isShowModal = true
if (row && row.id) {
+ console.log('---');
+
this.$refs.EditRef.getDetail(row.id)
}
})
--
Gitblit v1.9.3