chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
墨大叔 2024-09-12 17:10:43 +08:00
parent e397ea984b
commit 7c70024fa0
4 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/system/device/components/DeviceUsingStatusTag.vue Normal file
View File

@ -0,0 +1,20 @@
<template>
<el-tag v-if="isUsing" type="warning" :size="size">使用中</el-tag>
<el-tag v-else type="success" :size="size">待使用</el-tag>
</template>
<script>
export default {
name: "DeviceUsingStatusTag",
props: {
isUsing: {
type: Boolean,
default: false
},
size: {
type: String,
default: null
}
}
}
</script>

9
src/views/system/device/detail.vue
View File

@ -48,8 +48,11 @@
<el-descriptions-item label="MAC">{{deviceData.mac | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="SN">{{deviceData.deviceNo | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="型号">{{deviceData.model | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="状态">
<dict-tag :options="dict.type.sm_device_status" :value="deviceData.status" size="mini"/>
<!-- <el-descriptions-item label="状态">-->
<!-- <dict-tag :options="dict.type.sm_device_status" :value="deviceData.status" size="mini"/>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label="使用状态">
<device-using-status-tag :is-using="deviceData.isUsing" size="mini"/>
</el-descriptions-item>
<el-descriptions-item label="在线状态">
<dict-tag :options="dict.type.sm_device_online_status" :value="deviceData.onlineStatus" size="mini"/>
@ -183,11 +186,13 @@ import { isEmpty } from '@/utils'
import { checkPermi } from '@/utils/permission'
import { BonusArrivalType, FieldName, ROOT_DEPT } from '@/utils/constants'
import { mapGetters } from 'vuex'
import DeviceUsingStatusTag from '@/views/system/device/components/DeviceUsingStatusTag.vue'
export default {
name: 'Device/:deviceId',
mixins: [$serviceType, $view],
components: {
DeviceUsingStatusTag,
Recharge,
RechargeList,
LineField,

37
src/views/system/device/index.vue
View File

@ -43,14 +43,20 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.sm_device_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<!-- <el-form-item label="状态" prop="status">-->
<!-- <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.sm_device_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="使用状态" prop="isUsing">
<el-select v-model="queryParams.isUsing" placeholder="请选择使用状态" clearable @change="handleQuery">
<el-option :value="true" label="使用中"/>
<el-option :value="false" label="待使用"/>
</el-select>
</el-form-item>
<el-form-item :label="FieldName.AGENT" prop="agentName">
@ -178,9 +184,14 @@
<dict-tag :options="dict.type.sm_device_online_status" :value="scope.row.onlineStatus"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="80">
<!-- <el-table-column label="状态" align="center" prop="status" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sm_device_status" :value="scope.row.status"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="使用状态" align="center" prop="status" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sm_device_status" :value="scope.row.status"/>
<device-using-status-tag :is-using="scope.row.isUsing"/>
</template>
</el-table-column>
<el-table-column :label="FieldName.AGENT" align="center" prop="agentName" >
@ -321,12 +332,13 @@ import StoreLink from '@/components/Business/Store/StoreLink.vue'
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import { $serviceType, $view } from '@/utils/mixins'
import { FieldName, SmUserType } from '@/utils/constants'
import DeviceUsingStatusTag from '@/views/system/device/components/DeviceUsingStatusTag.vue'
export default {
name: "Device",
mixins: [$serviceType, $view],
dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit'],
components: { DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
components: { DeviceUsingStatusTag, DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
props: {
query: {
type: Object,
@ -372,7 +384,8 @@ export default {
status: null,
userName: null,
tenantName: null,
isArrears: null
isArrears: null,
isUsing: null
},
// 表单参数
form: {},

2
src/views/system/smUser/index.vue
View File

@ -241,7 +241,7 @@ import { $serviceType, $showColumns, $withdrawServiceType } from '@/utils/mixins
import UserLink from '@/components/Business/SmUser/UserLink.vue'
import UserInput from '@/components/Business/SmUser/UserInput.vue'
import DeptTreeSelect from '@/components/Business/Dept/DeptTreeSelect.vue'
import { FieldName, ROOT_DEPT, SmUserType, UserType } from '@/utils/constants'
import { FieldName, ROOT_DEPT, SmUserType } from '@/utils/constants'
import { mapGetters } from 'vuex'
const defaultSort = {