Skip to content

P
pet-business-web
Commit 8865dea6 authored by 王飞龙's avatar 王飞龙
Browse files
Options

设备管理

parent a422ad00
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 126 deletions
src/api/business/device.js
View file @ 8865dea6
// import request from '@/utils/request'
// 查询设备列表
// export function listDevice(query) {
// return request({
// url: '/system/device/list',
// method: 'get',
// params: query
// })
// }
//
// // 查询设备详细
// export function getDevice(id) {
// return request({
// url: '/system/device/' + id,
// method: 'get'
// })
// }
//
// // 新增设备
// export function addDevice(data) {
// return request({
// url: '/system/device',
// method: 'post',
// data: data
// })
// }
//
// // 修改设备
// export function updateDevice(data) {
// return request({
// url: '/system/device',
// method: 'put',
// data: data
// })
// }
//
// // 删除设备
// export function delDevice(data) {
// return request({
// url: '/system/device/del',
// method: 'Put',
// data: data
// })
// }
import request from '@/utils/request'
// 查询设备列表
export function listDevice(query) {
return request({
url: '/system/device/list',
url: '/business/device/list',
method: 'get',
params: query
})
......@@ -12,7 +58,7 @@ export function listDevice(query) {
// 查询设备详细
export function getDevice(id) {
return request({
url: '/system/device/' + id,
url: '/business/device/' + id,
method: 'get'
})
}
......@@ -20,7 +66,7 @@ export function getDevice(id) {
// 新增设备
export function addDevice(data) {
return request({
url: '/system/device',
url: '/business/device',
method: 'post',
data: data
})
......@@ -29,7 +75,7 @@ export function addDevice(data) {
// 修改设备
export function updateDevice(data) {
return request({
url: '/system/device',
url: '/business/device',
method: 'put',
data: data
})
......@@ -38,54 +84,8 @@ export function updateDevice(data) {
// 删除设备
export function delDevice(data) {
return request({
url: '/system/device/del',
url: '/business/device/del',
method: 'Put',
data: data
})
}
// import request from '@/utils/request'
//
// // 查询设备列表
// export function listDevice(query) {
// return request({
// url: '/business/device/list',
// method: 'get',
// params: query
// })
// }
//
// // 查询设备详细
// export function getDevice(id) {
// return request({
// url: '/business/device/' + id,
// method: 'get'
// })
// }
//
// // 新增设备
// export function addDevice(data) {
// return request({
// url: '/business/device',
// method: 'post',
// data: data
// })
// }
//
// // 修改设备
// export function updateDevice(data) {
// return request({
// url: '/business/device',
// method: 'put',
// data: data
// })
// }
//
// // 删除设备
// export function delDevice(data) {
// return request({
// url: '/business/device/del',
// method: 'Put',
// data: data
// })
// }
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ 8865dea6
......@@ -14,7 +14,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
<el-input v-model="form.deviceName" placeholder="请输入设备名称" style="width: 250px" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -24,7 +24,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="医院是否自有设备" prop="isPrivate">
<el-select v-model="form.isPrivate">
<el-select v-model="form.isPrivate" style="width: 250px">
<el-option
v-for="index in optionss"
:key="index"
......@@ -39,17 +39,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="负责人" prop="head">
<el-input v-model="form.head" placeholder="请输入负责人名称" />
<el-input v-model="form.head" placeholder="请输入负责人名称" style="width: 250px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" />
<el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" style="width: 250px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType">
<el-select v-model="form.deviceType" style="width: 250px">
<el-option
v-for="(item,index) in dict.type.device_type"
:key="index"
......@@ -67,20 +67,20 @@
<el-col :span="8">
<el-form-item label="服务地点">
<el-cascader
style="width: 250px"
v-model="selectedOptions"
size="large"
:options="cityOptions"
placeholder="请选择地区"
expand-trigger="hover"
clearable
style="width: 218px"
@change="handleChangeAddress"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item style="margin-left: 30px">
<el-form-item style="margin-left: 50px">
<el-input
v-model.trim="form.address"
placeholder="请输入服务地址"
......@@ -94,6 +94,7 @@
<el-col :span="8">
<el-form-item label="单位时段服务数">
<el-input
style="width: 250px"
v-model.trim="form.useNum"
placeholder="请输入单位时段服务数"
clearable
......@@ -106,7 +107,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="预约方式" prop="reservationMethod">
<el-select v-model="form.reservationMethod" placeholder="请选择预约方式">
<el-select v-model="form.reservationMethod" placeholder="请选择预约方式" style="width: 250px">
<el-option
v-for="item in options"
:key="item.value"
......@@ -119,6 +120,7 @@
<el-col :span="8">
<el-form-item label="上午开始时间">
<el-time-select
style="width: 250px"
v-model="useTime.ams"
is-range
placeholder="开始时间"
......@@ -135,6 +137,7 @@
<el-col :span="8">
<el-form-item label="上午结束时间">
<el-time-select
style="width: 250px"
v-model="useTime.ame"
is-range
placeholder="结束时间"
......@@ -156,6 +159,7 @@
<el-col :span="8">
<el-form-item label="下午开始时间">
<el-time-select
style="width: 250px"
v-model="useTime.pms"
is-range
placeholder="开始时间"
......@@ -172,6 +176,7 @@
<e-col :span="8">
<el-form-item label="下午结束时间">
<el-time-select
style="width: 250px"
v-model="useTime.pme"
is-range
placeholder="结束时间"
......@@ -191,7 +196,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="权重" prop="sort">
<el-input-number v-model="form.sort" :min="0" :max="9999" />
<el-input-number v-model="form.sort" :min="0" :max="9999" style="width: 250px" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -202,7 +207,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="设备状态" prop="sort">
<el-select v-model="form.status" placeholder="请选择设备状态">
<el-select v-model="form.status" placeholder="请选择设备状态" style="width: 250px">
<el-option
v-for="dict in dict.type.device_status"
:key="dict.value"
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 8865dea6
......@@ -7,15 +7,14 @@
<span style="color: #666666; font-weight: 600; font-size: 17px;">详情</span>
</div>
<el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
<div style="display: flex;margin: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">基本信息</div>
<div class="title-paragraph">
<span class="title-text">基本信息</span>
</div>
<!-- 1-->
<el-row>
<el-col :span="8">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" disabled />
<el-input v-model="form.deviceName" placeholder="请输入设备名称" style="width: 250px" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -25,7 +24,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="userType === '00' ?'平台自有设备':'医院自有设备'" prop="deviceName">
<el-select v-model="form.isPrivate" disabled>
<el-select v-model="form.isPrivate" disabled style="width: 250px">
<el-option
v-for="index in optionss"
:key="index"
......@@ -40,17 +39,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="负责人" prop="head">
<el-input v-model="form.head" placeholder="请输入负责人名称" disabled />
<el-input v-model="form.head" placeholder="请输入负责人名称" disabled style="width: 250px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" disabled />
<el-input v-model="form.phone" placeholder="请输入手机号" disabled style="width: 250px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" disabled>
<el-select v-model="form.deviceType" disabled style="width: 250px">
<el-option
v-for="(item,index) in dict.type.device_type"
:key="index"
......@@ -75,7 +74,7 @@
placeholder="请选择地区"
expand-trigger="hover"
clearable
style="width: 218px"
style="width: 250px"
disabled
@change="handleChangeAddress"
/>
......@@ -97,6 +96,7 @@
<el-col :span="8">
<el-form-item label="单位时段服务数">
<el-input
style="width: 250px"
v-model.trim="form.useNum"
disabled
placeholder="请输入单位时段服务数"
......@@ -109,7 +109,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="预约方式" prop="reservationMethod">
<el-select v-model="form.reservationMethod" placeholder="请选择预约方式" disabled>
<el-select v-model="form.reservationMethod" placeholder="请选择预约方式" disabled style="width: 250px">
<el-option
v-for="item in options"
:key="item.value"
......@@ -125,6 +125,7 @@
v-model="useTime.ams"
is-range
disabled
style="width: 250px"
placeholder="开始时间"
format="HH:mm"
value-format="HH:mm"
......@@ -142,6 +143,7 @@
v-model="useTime.ame"
is-range
disabled
style="width: 250px"
placeholder="结束时间"
format="HH:mm"
value-format="HH:mm"
......@@ -164,6 +166,7 @@
v-model="useTime.pms"
is-range
disabled
style="width: 250px"
placeholder="开始时间"
format="HH:mm"
value-format="HH:mm"
......@@ -181,6 +184,7 @@
v-model="useTime.pme"
is-range
disabled
style="width: 250px"
placeholder="结束时间"
format="HH:mm"
value-format="HH:mm"
......@@ -198,7 +202,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="权重" prop="sort">
<el-input-number v-model="form.sort" :min="0" :max="9999" disabled />
<el-input-number v-model="form.sort" :min="0" :max="9999" disabled style="width: 250px"/>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -209,7 +213,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="设备状态" prop="status">
<el-select v-model="form.status" placeholder="请选择设备状态" disabled>
<el-select v-model="form.status" placeholder="请选择设备状态" disabled style="width: 250px">
<el-option
v-for="dict in dict.type.device_status"
:key="dict.value"
......@@ -284,9 +288,8 @@
<span style="color: #666666; font-weight: 600; font-size: 17px;">编辑</span>
</div>
<el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
<div style="display: flex;margin: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">基本信息</div>
<div class="title-paragraph">
<span class="title-text">基本信息</span>
</div>
<!-- 1-->
<el-row>
......@@ -302,7 +305,7 @@
</el-col>
<el-col :span="8">
<el-form-item v-if="isShow" label="平台自有设备" prop="deviceName">
<el-select v-model="form.isPrivate" disabled>
<el-select v-model="form.isPrivate" disabled style="width: 250px">
<el-option
v-for="index in optionss"
:key="index"
......@@ -313,7 +316,7 @@
</el-form-item>
<el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
<el-select v-model="form.isPrivate">
<el-select v-model="form.isPrivate" style="width: 250px">
<el-option
v-for="index in optionss"
:key="index"
......@@ -328,17 +331,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="负责人" prop="head">
<el-input v-model="form.head" placeholder="请输入负责人名称" />
<el-input v-model="form.head" placeholder="请输入负责人名称" style="width: 250px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
<el-input v-model="form.phone" placeholder="请输入手机号" style="width: 250px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType">
<el-select v-model="form.deviceType" style="width: 250px">
<el-option
v-for="(item,index) in dict.type.device_type"
:key="index"
......@@ -356,6 +359,7 @@
<el-col :span="8">
<el-form-item label="服务地点" prop="serviceArea">
<el-cascader
ref="serviceArea"
v-model="form.selectedOptions"
size="large"
......@@ -363,7 +367,7 @@
placeholder="请选择地区"
expand-trigger="hover"
clearable
style="width: 218px"
style="width: 250px"
@change="handleChangeAddress"
/>
</el-form-item>
......@@ -383,6 +387,7 @@
<el-col :span="8">
<el-form-item label="单位时段服务数">
<el-input
style="width: 250px"
v-model.trim="form.useNum"
placeholder="请输入单位时段服务数"
clearable
......@@ -394,7 +399,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="预约方式" prop="reservationMethod">
<el-select v-model="form.reservationMethod" placeholder="请选择预约方式">
<el-select v-model="form.reservationMethod" placeholder="请选择预约方式" style="width: 250px">
<el-option
v-for="item in options"
:key="item.value"
......@@ -407,6 +412,7 @@
<el-col :span="8">
<el-form-item label="上午开始时间" prop="userTime">
<el-time-select
style="width: 250px"
v-model="useTime.ams"
is-range
placeholder="开始时间"
......@@ -423,6 +429,7 @@
<el-col :span="8">
<el-form-item label="上午结束时间" prop="userTime">
<el-time-select
style="width: 250px"
v-model="useTime.ame"
is-range
placeholder="结束时间"
......@@ -444,6 +451,7 @@
<el-col :span="8">
<el-form-item label="下午开始时间" prop="userTime">
<el-time-select
style="width: 250px"
v-model="useTime.pms"
is-range
placeholder="开始时间"
......@@ -460,6 +468,7 @@
<e-col :span="8">
<el-form-item label="下午开始时间" prop="userTime">
<el-time-select
style="width: 250px"
v-model="useTime.pme"
is-range
placeholder="结束时间"
......@@ -479,7 +488,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="权重" prop="sort">
<el-input-number v-model="form.sort" :min="0" :max="9999" />
<el-input-number v-model="form.sort" :min="0" :max="9999" style="width: 250px" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -490,7 +499,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="设备状态" prop="status">
<el-select v-model="form.status" placeholder="请选择设备状态">
<el-select v-model="form.status" placeholder="请选择设备状态" style="width: 250px">
<el-option
v-for="dict in dict.type.device_status"
:key="dict.value"
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 8865dea6
......@@ -147,10 +147,24 @@
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">
{{ showStatus(scope.row.status)||'-' }}
</span>
<span
v-if="scope.row.status === '1'"
style="color: #5FB54B;"
>{{ showStatus(scope.row.status) }}</span>
<span
v-else-if="scope.row.status === '2'"
style="color: #FF9D4E;"
>{{ showStatus(scope.row.status) }}</span>
<span
v-else
style="color: #DB4747;"
>{{ showStatus(scope.row.status) || '-' }}</span>
</template>
<!-- <template slot-scope="scope">-->
<!-- <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
<!-- {{ showStatus(scope.row.status)||'-' }}-->
<!-- </span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope">
......@@ -335,6 +349,7 @@ import { regionData, CodeToText } from 'element-china-area-data'
import { listDevice, getDevice, delDevice } from '@/api/business/device'
import { getInfo } from '@/api/login'
import { parseTime } from '@/utils/ruoyi'
import {listUseManagementAll} from "@/api/business/use";
export default {
name: 'EquipmentManagement',
......@@ -700,27 +715,9 @@ export default {
}
})
},
// 全部选择
selectAll() {
this.$refs.table.toggleAllSelection()
},
// 反向选择
reverseSelect(rows) {
rows.forEach(row => {
this.$refs.table.toggleRowSelection(row)
})
},
// /**
// * 全部选择
// * @param selection 已选择内容
// * @param all 是否永远进行全选操作
// */
// async selectAll(selection = [], all = true) {
// if (this.veterinarianList.length !== selection.length && !all) {
// this.effectTableSelect([])
// } else {
// await this.changeTableSelect()
// }
// // 全部选择
// selectAll() {
// this.$refs.table.toggleAllSelection()
// },
// // 反向选择
// reverseSelect(rows) {
......@@ -728,23 +725,41 @@ export default {
// this.$refs.table.toggleRowSelection(row)
// })
// },
// /** 提交按钮 */
// submitForm() {
// if (this.form.checkType != null && this.form.checkType !== '') {
// this.form.checkType = this.form.checkType.toString()
// }
// this.form.useTime = JSON.stringify(this.useTime)
// this.$refs['form'].validate(valid => {
// if (valid) {
// console.log(this.form)
// addDevice(this.form).then(response => {
// this.$modal.msgSuccess('新增成功')
// this.open = false
// this.getList()
// })
// }
// })
// },
/**
* 全部选择
* @param selection 已选择内容
* @param all 是否永远进行全选操作
*/
async selectAll(selection = [], all = true) {
if (this.userList.length !== selection.length && !all) {
this.effectTableSelect([])
} else {
await this.changeTableSelect()
}
},
/**
* 控制table的选择项
* @param data
*/
effectTableSelect(data = []) {
this.$refs.table.store.states.selection = data
this.$refs.table.store.updateSelectionByRowKey()
this.$refs.table.store.updateAllSelected()
this.$refs.table.$emit('selection-change', data)
},
/**
* 改变table选择项
* @param notIncludeIds 需要排除的id列表
*/
async changeTableSelect(notIncludeIds = []) {
// 获取反选的数据
const { data } = await listUseManagementAll({ notIncludeIds })
this.effectTableSelect(data)
},
// 反向选择
reverseSelect() {
this.changeTableSelect(this.ids)
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment