Commit fed109e5 by 韩振

1

parent cc73f9db
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
"test:unit": "vitest --environment jsdom --root src/" "test:unit": "vitest --environment jsdom --root src/"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons": "^0.0.11",
"@element-plus/icons-vue": "^2.3.1",
"axios": "^1.2.1", "axios": "^1.2.1",
"consola": "^2.15.3", "consola": "^2.15.3",
"element-plus": "^2.2.32", "element-plus": "^2.2.32",
......
...@@ -9,9 +9,14 @@ import './assets/iconfont/iconfont.css' ...@@ -9,9 +9,14 @@ import './assets/iconfont/iconfont.css'
import ElementPlus from 'element-plus' import ElementPlus from 'element-plus'
import 'element-plus/theme-chalk/index.css' // 引入 Element Plus 的样式文件 import 'element-plus/theme-chalk/index.css' // 引入 Element Plus 的样式文件
import * as ElIcon from '@element-plus/icons-vue'
const app = createApp(App) const app = createApp(App)
Object.keys(ElIcon).forEach((key) => {
app.component(key, ElIcon[key])
})
// 设置全局主题色 // 设置全局主题色
app.config.globalProperties.$theme = { app.config.globalProperties.$theme = {
primary: '#1890ff', primary: '#1890ff',
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
{{ scope.row.type == 'IN' ? '入库' : '出库' }} {{ scope.row.type == 'IN' ? '入库' : '出库' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="stationId" label="站台号" align="center" width="100"/> <el-table-column prop="stationId" label="通道号" align="center" width="100"/>
<el-table-column prop="content" label="异常说明" align="center"/> <el-table-column prop="content" label="异常说明" align="center"/>
<el-table-column prop="createTime" label="最后更新时间" align="center" width="200"/> <el-table-column prop="createTime" label="最后更新时间" align="center" width="200"/>
<el-table-column prop="handleFlag" label="状态" align="center" width="100"> <el-table-column prop="handleFlag" label="状态" align="center" width="100">
......
...@@ -273,6 +273,10 @@ ...@@ -273,6 +273,10 @@
</el-dialog> </el-dialog>
<el-dialog title="异常信息确认" v-model="errVisible" style="width:60%"> <el-dialog title="异常信息确认" v-model="errVisible" style="width:60%">
<el-select v-model="searchData.handleFlag" @change="searchAgain" style="width: 140px;margin-bottom: 10px;margin-top: -30px">
<el-option label="未处理" :value="2" />
<el-option label="已处理" :value="1" />
</el-select>
<el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="logList" border size="large"> <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="logList" border size="large">
<el-table-column type="index" label="序号" width="70" align="center"/> <el-table-column type="index" label="序号" width="70" align="center"/>
<el-table-column prop="type" label="出入库" align="center" width="100"> <el-table-column prop="type" label="出入库" align="center" width="100">
...@@ -280,7 +284,7 @@ ...@@ -280,7 +284,7 @@
{{ scope.row.type == 'IN' ? '入库' : '出库' }} {{ scope.row.type == 'IN' ? '入库' : '出库' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="stationId" label="站台号" align="center" width="100"/> <el-table-column prop="stationId" label="通道号" align="center" width="100"/>
<el-table-column prop="content" label="异常说明" align="center"/> <el-table-column prop="content" label="异常说明" align="center"/>
<el-table-column prop="createTime" label="最后更新时间" align="center" width="200"/> <el-table-column prop="createTime" label="最后更新时间" align="center" width="200"/>
<el-table-column prop="handleFlag" label="状态" align="center" width="100"> <el-table-column prop="handleFlag" label="状态" align="center" width="100">
...@@ -291,7 +295,7 @@ ...@@ -291,7 +295,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template #default="scope"> <template #default="scope">
<el-button type="primary" size="small" v-if="scope.row.handleFlag == '2'" @click="updateError(scope.row)">处理</el-button> <el-button type="primary" size="small" :disabled="scope.row.handleFlag == '1'" @click="updateError(scope.row)">处理</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -344,7 +348,8 @@ export default defineComponent({ ...@@ -344,7 +348,8 @@ export default defineComponent({
const logList = ref([]) const logList = ref([])
const searchData = ref({ const searchData = ref({
pageNo: 1, pageNo: 1,
pageSize: 8 pageSize: 8,
handleFlag: 2
}) })
const total = ref(0) const total = ref(0)
...@@ -545,6 +550,8 @@ export default defineComponent({ ...@@ -545,6 +550,8 @@ export default defineComponent({
function changeErr() { function changeErr() {
showErr.value = !showErr.value showErr.value = !showErr.value
console.log(showErr.value) console.log(showErr.value)
errVisible.value = true
loadErrData()
} }
function showChannelSetting() { function showChannelSetting() {
...@@ -627,6 +634,7 @@ export default defineComponent({ ...@@ -627,6 +634,7 @@ export default defineComponent({
// 异常分页 // 异常分页
const loadErrData = () => { const loadErrData = () => {
searchData.value.storeCode = JSON.parse(sessionStorage.getItem('storeInfo')).storeCode
postAction(state.url.getErrorPage, searchData.value).then(res => { postAction(state.url.getErrorPage, searchData.value).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message); if (res.code !== 99200) return ElMessage.error(res.message);
logList.value = res.data.records logList.value = res.data.records
...@@ -634,6 +642,11 @@ export default defineComponent({ ...@@ -634,6 +642,11 @@ export default defineComponent({
}) })
} }
//重新搜索异常报错信息
function searchAgain() {
loadErrData()
}
// 处理异常 // 处理异常
const updateError = (row) => { const updateError = (row) => {
postAction(state.url.updateError, {errorId: row.errorId, handleFlag: 1}).then(res => { postAction(state.url.updateError, {errorId: row.errorId, handleFlag: 1}).then(res => {
...@@ -677,6 +690,7 @@ export default defineComponent({ ...@@ -677,6 +690,7 @@ export default defineComponent({
clearData, clearData,
changeErr, changeErr,
changeType, changeType,
searchAgain,
url: audio, url: audio,
deleteEpc, deleteEpc,
errVisible, errVisible,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论