admin/src/api/Inspection/device.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
admin/src/api/Inspection/deviceRecord.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
admin/src/views/operation/components/deviceEdit.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
admin/src/views/operation/device.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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}`) 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 } }) } 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) { 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) } })