liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

Compare commits

base: liubiao:2d005a54562e4ba8ba2f711e7418667168cfd460
Branches Tags
liubiao:main dyf:main
...
compare: liubiao:d632ba514c388acbe990f528c94921cb55bec4e6
Branches Tags
liubiao:main dyf:main

2 Commits
2d005a5456 ... d632ba514c

Author SHA1 Message Date
daiyongfei
d632ba514c Merge branch 'liubiao-main' 2025-09-22 11:09:56 +08:00
fengerli
ed9b519b77 设备列表，细节修改 2025-09-22 10:37:27 +08:00
4 changed files with 11 additions and 6 deletions
Expand all files Collapse all files

4
.env.development
View File

@ -5,8 +5,8 @@ VITE_APP_TITLE = 云平台管理系统
VITE_APP_ENV = 'development' VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
#VITE_APP_BASE_API = 'https://fuyuanshen.com/backend' VITE_APP_BASE_API = 'https://fuyuanshen.com/backend'
VITE_APP_BASE_API = 'http://192.168.2.23:8000' #VITE_APP_BASE_API = 'http://192.168.2.23:8000'
#代永飞接口 #代永飞接口
#VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689' #VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'

7
src/views/controlCenter/delivery/index.vue
View File

@ -63,7 +63,12 @@
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备型号" align="center" prop="deviceType" /> <el-table-column label="设备型号" align="center" prop="deviceType" />
<el-table-column label="操作模块" align="center" prop="deviceAction" /> <el-table-column label="操作模块" align="center" prop="deviceAction" />
<el-table-column label="操作内容" align="center" prop="content" show-overflow-tooltip /> <el-table-column label="操作内容" align="center" prop="content" show-overflow-tooltip >
<template #default="scope">
<div>{{scope.row.content || '/'}}</div>
</template>
</el-table-column>
<el-table-column label="操作时间" align="center" prop="createTime" /> <el-table-column label="操作时间" align="center" prop="createTime" />
</el-table> </el-table>
<pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"

4
src/views/equipmentManagement/devices/index.vue
View File

@ -21,7 +21,7 @@
:value="item.id" /> :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="deviceStatus"> <el-form-item label="设备状态" prop="deviceStatus" v-hasPermi="['equipment:devices:allocate']">
<el-select v-model="queryParams.deviceStatus" placeholder="设备状态" style="margin-left: 10px"> <el-select v-model="queryParams.deviceStatus" placeholder="设备状态" style="margin-left: 10px">
<el-option label="正常" value="1" /> <el-option label="正常" value="1" />
<el-option label="失效" value="0" /> <el-option label="失效" value="0" />
@ -922,7 +922,7 @@ const handleImportSuccess = (response: any) => {
} }
getList(); // 初始化列表数据 getList(); // 初始化列表数据
} else { } else {
proxy?.$modal.msgError(response.msg || '导入失败'); proxy?.$modal.msgError(response.msg);
} }
}; };
const handleImportError = () => { const handleImportError = () => {

2
src/views/index.vue
View File

@ -507,7 +507,7 @@ onUnmounted(() => {
alarmRingChartInstance?.dispose(); alarmRingChartInstance?.dispose();
//alarmBarChartInstance?.dispose(); //alarmBarChartInstance?.dispose();
window.removeEventListener('resize', () => { }); window.removeEventListener('resize', () => { });
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>