ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:4ff0e865a90497fd0b90f14dc9a9d65bba7c9c45
Branches Tags
ak:master
ak:dev
..
compare: ak:0bff1c27aab03a852e00ee0b8e33a493ffb5761a
Branches Tags
ak:master
ak:dev

No commits in common. "4ff0e865a90497fd0b90f14dc9a9d65bba7c9c45" and "0bff1c27aab03a852e00ee0b8e33a493ffb5761a" have entirely different histories.
4ff0e865a9 ... 0bff1c27aa

4 changed files with 40 additions and 240 deletions
Show Stats Expand all files Collapse all files

2
src/store/modules/app.ts
View File

@ -55,7 +55,7 @@ export const useAppStore = defineStore('app', {
screenfull: true, // 全屏图标 screenfull: true, // 全屏图标
search: true, // 搜索图标 search: true, // 搜索图标
size: true, // 尺寸图标 size: true, // 尺寸图标
locale: false, // 多语言图标 locale: true, // 多语言图标
message: true, // 消息图标 message: true, // 消息图标
tagsView: false, // 标签页 tagsView: false, // 标签页
tagsViewImmerse: false, // 标签页沉浸 tagsViewImmerse: false, // 标签页沉浸

8
src/views/Login/components/LoginForm.vue
View File

@ -17,11 +17,12 @@
<div class="login-form"> <div class="login-form">
<div class="login-tip">欢迎登录</div> <div class="login-tip">欢迎登录</div>
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="loginData.tenantEnable === 'true'"> <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input <el-input
:disabled="true" v-model="loginData.loginForm.tenantName"
placeholder="中鼐智能" :placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse" :prefix-icon="iconHouse"
link
type="primary" type="primary"
/> />
</el-form-item> </el-form-item>
@ -365,6 +366,7 @@ onMounted(() => {
.login-tip { .login-tip {
margin-bottom: 28px; margin-bottom: 28px;
margin-left: 10px;
font-family: font-family:
PingFangSC, PingFangSC,
PingFang SC; PingFang SC;

193
src/views/mapPage/logList/index.vue
View File

@ -1,193 +0,0 @@
<template>
<div>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="item.name" :name="item.id" v-for="item in tabList" :key="item.id">
<ContentWrap>
<div class="form-table">
<!-- 搜索工作栏 -->
<el-form
class=""
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="车辆编号" prop="robotNo">
<el-select v-model="queryParams.robotNo" class="!w-240px" @change="handleQuery()">
<el-option
v-for="car in robotList"
:key="car.id"
:label="car.robotNo"
:value="car.robotNo"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"
><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
>
<el-button @click="resetQuery"
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
>
</el-form-item>
</el-form>
<!-- 列表 -->
<el-table
:data="list"
style="width: 100%"
class="mt-1"
:header-cell-style="{
backgroundColor: '#EBF1FF',
color: '#0D162A',
padding: '13px 0'
}"
v-loading="loading"
>
<el-table-column label="序号" type="index" width="80" />
<el-table-column prop="date" label="车辆编号" />
<el-table-column prop="name" label="日志内容" />
<el-table-column prop="address" label="发生时间" />
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</div>
</ContentWrap>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup>
import * as MapTaskAPi from '@/api/map/mapTask'
defineOptions({ name: 'mapLogQueriesList' })
const message = useMessage() // 消息弹窗
const tabList = ref([
{
name: '操作日志',
id: 1
},
{
name: '车辆日志',
id: 2
},
{
name: '任务日志',
id: 3
}
])
const activeName = ref(1) //tab栏
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
robotNo: null,
createTime: []
})
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
// const data = await MapTaskAPi.getList(queryParams)
// list.value = data.list
// total.value = data.total
list.value = [
{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
}
]
} finally {
loading.value = false
}
}
const handleClick = () => {
console.log(activeName.value)
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
//查询能用的车辆
const robotList = ref([])
const getCanUseRobotList = async () => {
robotList.value = await MapTaskAPi.getCanUseRobot()
}
/** 初始化 **/
onMounted(() => {
getList()
getCanUseRobotList()
})
</script>
<style lang="scss" scoped>
::v-deep .el-tabs__nav-wrap::after {
height: 0px;
}
::v-deep .el-tabs__nav {
padding-left: 4px;
}
::v-deep .table-row-class {
background-color: #f9f9f9e5;
}
::v-deep .el-table__body .cell {
font-weight: 400;
font-size: 14px;
color: #536387;
padding: 4px 12px;
}
.form-table {
padding: 6px 10px 14px 10px;
}
</style>

77
src/views/parameterSetting/index.vue
View File

@ -32,7 +32,7 @@
:min="0" :min="0"
:max="100" :max="100"
placeholder="自动充电阈值" placeholder="自动充电阈值"
style="width: 240px" style="width: 240px;"
> >
<template #suffix> <template #suffix>
<span>%</span> <span>%</span>
@ -52,7 +52,7 @@
:min="0" :min="0"
:max="100" :max="100"
placeholder="自动充电离开阈值" placeholder="自动充电离开阈值"
style="width: 240px" style="width: 240px;"
> >
<template #suffix> <template #suffix>
<span>%</span> <span>%</span>
@ -74,7 +74,7 @@
:min="0" :min="0"
:max="100" :max="100"
placeholder="机会充电电量" placeholder="机会充电电量"
style="width: 240px" style="width: 240px;"
> >
<template #suffix> <template #suffix>
<span>%</span> <span>%</span>
@ -95,7 +95,7 @@
:min="0" :min="0"
:max="100" :max="100"
placeholder="机会充电离开阈值" placeholder="机会充电离开阈值"
style="width: 240px" style="width: 240px;"
> >
<template #suffix> <template #suffix>
<span>%</span> <span>%</span>
@ -107,37 +107,31 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="定时充电时段" label-width="146" style="width: 100%"> <el-form-item label="定时充电时段" label-width="146" style="width: 100%">
<div style="display: flex"> <div style="display: flex;">
<el-time-select <el-time-select
v-model="formData.scheduleChargeStartTime" v-model="formData.scheduleChargeStartTime"
:max-time="formData.scheduleChargeEndTime" :max-time="formData.scheduleChargeEndTime"
placeholder="开始时间" placeholder="开始时间"
start="00:00" start="00:00"
step="00:01" step="00:01"
end="23:59" end="23:59"
style="width: 240px" style="width: 240px;"
/> />
<el-time-select <el-time-select
v-model="formData.scheduleChargeEndTime" v-model="formData.scheduleChargeEndTime"
:min-time="formData.scheduleChargeStartTime" :min-time="formData.scheduleChargeStartTime"
placeholder="结束时间" placeholder="结束时间"
start="00:00" start="00:00"
step="00:01" step="00:01"
end="23:59" end="23:59"
style="width: 240px; margin-left: 16px" style="width: 240px;margin-left: 16px;"
/> />
<el-checkbox <el-checkbox label="每天" :value="1" style="margin-left: 16px;" :true-value="1" :false-value="0" v-model="formData.everyDay" @change="everyDayChange"/>
label="每天" </div>
:value="1" </el-form-item>
style="margin-left: 16px"
:true-value="1"
:false-value="0"
v-model="formData.everyDay"
@change="everyDayChange"
/>
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
@ -151,7 +145,7 @@
type="number" type="number"
:min="0" :min="0"
placeholder="充电周期" placeholder="充电周期"
style="width: 240px" style="width: 240px;"
> >
<template #suffix> <template #suffix>
<span>天</span> <span>天</span>
@ -182,7 +176,7 @@
type="number" type="number"
:min="0" :min="0"
placeholder="请输入等待时间" placeholder="请输入等待时间"
style="width: 240px" style="width: 240px;"
> >
<template #suffix> <template #suffix>
<span>S</span> <span>S</span>
@ -218,7 +212,7 @@ const formData = ref({
scheduleChargeStartTime: undefined, //定时充电开始时间 scheduleChargeStartTime: undefined, //定时充电开始时间
scheduleChargeEndTime: undefined, //定时充电结束时间 scheduleChargeEndTime: undefined, //定时充电结束时间
warnWaitTime: undefined, //等待时间 warnWaitTime: undefined, //等待时间
everyDay: 0 everyDay:0
}) })
const resData = ref(null) const resData = ref(null)
const getConfig = async () => { const getConfig = async () => {
@ -237,7 +231,7 @@ const getConfig = async () => {
scheduleChargeStartTime: undefined, //定时充电开始时间 scheduleChargeStartTime: undefined, //定时充电开始时间
scheduleChargeEndTime: undefined, //定时充电结束时间 scheduleChargeEndTime: undefined, //定时充电结束时间
warnWaitTime: undefined, //等待时间 warnWaitTime: undefined, //等待时间
everyDay: 0 everyDay:0
} }
resData.value = null resData.value = null
} }
@ -269,10 +263,7 @@ const formLoading = ref(false)
//校验数组的 //校验数组的
const submit = async () => { const submit = async () => {
if ( if(formData.value.everyDay == 1 && (!formData.value.scheduleChargeStartTime || !formData.value.scheduleChargeEndTime)){
formData.value.everyDay == 1 &&
(!formData.value.scheduleChargeStartTime || !formData.value.scheduleChargeEndTime)
) {
message.warning('勾选每天,定时充电时段不能为空！') message.warning('勾选每天,定时充电时段不能为空！')
return return
} }
@ -320,7 +311,7 @@ onMounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.el-input-number .el-input__inner) { :deep( .el-input-number .el-input__inner) {
text-align: left !important; text-align: left !important;
} }
.card-header { .card-header {