From 8a05e77f8dc0d4b2400e22bdf5cdc16cbf42649d Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 12 Aug 2022 16:35:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=BB=9F=E8=AE=A1=20-=20?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/icons/svg/empty.svg | 190 ++++++++++++++++++
src/views/system/archiveStatistics/index.vue | 33 ++-
.../archiveStatistics/module/acrossBar.vue | 2 -
.../archiveStatistics/module/barEcharts.vue | 14 --
.../archiveStatistics/module/lineEchart.vue | 2 -
5 files changed, 219 insertions(+), 22 deletions(-)
create mode 100644 src/assets/icons/svg/empty.svg
diff --git a/src/assets/icons/svg/empty.svg b/src/assets/icons/svg/empty.svg
new file mode 100644
index 0000000..a6afeb7
--- /dev/null
+++ b/src/assets/icons/svg/empty.svg
@@ -0,0 +1,190 @@
+
+
+
diff --git a/src/views/system/archiveStatistics/index.vue b/src/views/system/archiveStatistics/index.vue
index d918424..b288810 100644
--- a/src/views/system/archiveStatistics/index.vue
+++ b/src/views/system/archiveStatistics/index.vue
@@ -48,9 +48,13 @@
value-format="yyyy-MM"
@change="handleTypeDate"
/>
-
@@ -91,8 +95,12 @@
value-format="yyyy-MM"
@change="handleSearchDate"
/>
-
@@ -178,7 +186,6 @@ export default {
}
}
.center-box{
- // width:100%;
margin:20px 0;
display: flex;
justify-content: space-between;
@@ -188,4 +195,22 @@ export default {
flex: 1;
}
}
+
+.empty-main{
+ display: flex;
+ height: calc(100% - 40px);
+ flex-flow: column;
+ justify-content: center;
+ align-items: center;
+ .empty-img{
+ width: 140px;
+ height: 140px;
+ vertical-align: middle;
+ }
+ p{
+ font-size: 12px;
+ color: #999;
+ margin-top: -10px;
+ }
+}
diff --git a/src/views/system/archiveStatistics/module/acrossBar.vue b/src/views/system/archiveStatistics/module/acrossBar.vue
index ccd2b87..48e5120 100644
--- a/src/views/system/archiveStatistics/module/acrossBar.vue
+++ b/src/views/system/archiveStatistics/module/acrossBar.vue
@@ -126,7 +126,6 @@ export default {
}
]
}
-
option && this.chart.setOption(option)
}
}
@@ -134,5 +133,4 @@ export default {
diff --git a/src/views/system/archiveStatistics/module/barEcharts.vue b/src/views/system/archiveStatistics/module/barEcharts.vue
index bf33ebc..69968df 100644
--- a/src/views/system/archiveStatistics/module/barEcharts.vue
+++ b/src/views/system/archiveStatistics/module/barEcharts.vue
@@ -144,18 +144,6 @@ export default {
axisPointer: {
type: 'shadow'
},
- // formatter: function(params) {
- // var res = "" + echarts.format.formatTime('yyyy年M月', new Date(params[0].name)) + '
'
- // for (var i = 0; i < params.length; i++) {
- // res += `
- //
- // ${params[i].color}
- // ${params[i].seriesName}
- // ${params[i].data}
- //
`
- // }
- // return res
- // },
formatter(params) {
const val0 = params[0]['data']
const val1 = params[1]['data']
@@ -280,7 +268,6 @@ export default {
}
]
}
-
option && this.chart.setOption(option)
}
}
@@ -288,5 +275,4 @@ export default {
diff --git a/src/views/system/archiveStatistics/module/lineEchart.vue b/src/views/system/archiveStatistics/module/lineEchart.vue
index e708aeb..412eec1 100644
--- a/src/views/system/archiveStatistics/module/lineEchart.vue
+++ b/src/views/system/archiveStatistics/module/lineEchart.vue
@@ -45,7 +45,6 @@ export default {
},
mounted() {
this.drawChart()
- console.log(this.year)
window.addEventListener('resize', this.__resizeHandler)
},
methods: {
@@ -177,5 +176,4 @@ export default {
From 242b8b15aab934c0a65ef55f1471e995a9afd29c Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 12 Aug 2022 17:25:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=BA=93=E6=88=BF=E4=BD=8D=E7=BD=AE?=
=?UTF-8?q?=E7=BB=9F=E4=B8=80/=E6=A1=A3=E6=A1=88-1=E7=8A=B6=E6=80=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../archivesManage/archivesCheck/module/checkDetail.vue | 9 ++++++++-
.../archivesList/module/archivesInfo/index.vue | 2 ++
src/views/archivesManage/archivesSearch/index.vue | 9 ++++++++-
.../archivesSearch/module/detailDialog.vue | 9 ++++++++-
src/views/archivesManage/caseManage/caseList/index.vue | 6 ++++--
.../caseManage/caseList/module/detailDialog.vue | 9 ++++++++-
src/views/environmentalScreen/index.vue | 9 +++++++++
7 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/views/archivesManage/archivesCheck/module/checkDetail.vue b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
index 09b885a..e68f555 100644
--- a/src/views/archivesManage/archivesCheck/module/checkDetail.vue
+++ b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
@@ -48,7 +48,14 @@
-
+
+
+ -
+
+ {{ scope.row.folderLocationDetails }}
+
+
+
{{ scope.row.createTime | parseTime }}
diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
index 5fc5f31..5d7d6a9 100644
--- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
@@ -117,6 +117,8 @@ export default {
item.context = '待归还'
} else if (item.context === 4 || item.context === '' || item.context === null) {
item.context = '-'
+ } else if (item.context === -1) {
+ item.context = '在库'
}
}
})
diff --git a/src/views/archivesManage/archivesSearch/index.vue b/src/views/archivesManage/archivesSearch/index.vue
index 649990c..58bce5d 100644
--- a/src/views/archivesManage/archivesSearch/index.vue
+++ b/src/views/archivesManage/archivesSearch/index.vue
@@ -49,7 +49,14 @@
-
+
+
+ -
+
+ {{ scope.row.folder_location_details }}
+
+
+
{{ scope.row.create_time | parseTime }}
diff --git a/src/views/archivesManage/archivesSearch/module/detailDialog.vue b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
index 7a77fa0..852e884 100644
--- a/src/views/archivesManage/archivesSearch/module/detailDialog.vue
+++ b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
@@ -54,7 +54,14 @@
盒名称:{{ rowData.fieldCnName }}
-
库房位置:{{ rowData.folder_location }}
+
库房位置:
+ -
+ {{ rowData.folder_location }}
+
+
借阅状态:{{ rowData.borrow_type | borrowStatus }}
条形码:{{ rowData.barcode }}
diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue
index c167c51..52b1b44 100644
--- a/src/views/archivesManage/caseManage/caseList/index.vue
+++ b/src/views/archivesManage/caseManage/caseList/index.vue
@@ -51,8 +51,10 @@
- -
- {{ scope.row.folderLocationDetails }}
+ -
+
+ {{ scope.row.folderLocationDetails }}
+
diff --git a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
index 237a4fd..1df6662 100644
--- a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
+++ b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
@@ -33,7 +33,14 @@
-
+
+
+ -
+
+ {{ scope.row.folderLocationDetails }}
+
+
+
{{ scope.row.create_time | parseTime }}
diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue
index f091ba3..012b97b 100644
--- a/src/views/environmentalScreen/index.vue
+++ b/src/views/environmentalScreen/index.vue
@@ -242,6 +242,7 @@ export default {
this.timer = setInterval(() => {
this.nowDate = getCurrentTime()
}, 1000)
+ window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
},
mounted() {
this.tableData = data1.rows
@@ -259,6 +260,14 @@ export default {
}
},
methods: {
+ // 加载完成状态传值
+ getIframeLoading(value) {
+ // console.log(`我是iframe传过来的参数:${value}`)
+ if (value === 'false') {
+ this.handleHide('DAK_MO_OAO_001')
+ this.handleAlarm('DAK_MO_OAO_003')
+ }
+ },
// 传入设备状态data / 给iframe传初始值
deviceState(e) {
this.iframeWin.postMessage({
From e0bcd68f9b65a5f2bc96dfe7b45ae6e891a8fb12 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Fri, 12 Aug 2022 17:33:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/logs.js | 12 +++
.../archivesManage/archivesCheck/index.vue | 2 -
src/views/system/logManage/warnLog/index.vue | 101 ++++++++++++++----
3 files changed, 94 insertions(+), 21 deletions(-)
create mode 100644 src/api/system/logs.js
diff --git a/src/api/system/logs.js b/src/api/system/logs.js
new file mode 100644
index 0000000..32f75b9
--- /dev/null
+++ b/src/api/system/logs.js
@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+// 报警日志 手动处理
+export function warnRemark(data) {
+ return request({
+ url: 'api/alarmlog/remark',
+ method: 'post',
+ data
+ })
+}
+
+export default { warnRemark }
diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue
index a3d6c8e..bfc24d6 100644
--- a/src/views/archivesManage/archivesCheck/index.vue
+++ b/src/views/archivesManage/archivesCheck/index.vue
@@ -187,8 +187,6 @@ export default {
} else {
this.crud.query.orderNo = this.keyWord
}
- console.log(this.crud.query, '2')
-
this.crud.downloadLoading = false
},
// 删除
diff --git a/src/views/system/logManage/warnLog/index.vue b/src/views/system/logManage/warnLog/index.vue
index 11daf77..8ceae55 100644
--- a/src/views/system/logManage/warnLog/index.vue
+++ b/src/views/system/logManage/warnLog/index.vue
@@ -15,6 +15,7 @@
placeholder="请输入关键词"
style="width: 300px;margin-right:10px;padding-left:10px"
class="input-prepend filter-item"
+ @keyup.enter.native="crud.toQuery"
>
@@ -34,18 +35,32 @@
:data="crud.data"
style="width: 100%;"
height="calc(100vh - 356px)"
+ :cell-class-name="cell"
@row-click="clickRowHandler"
@selection-change="selectionChangeHandler"
>
-
-
-
-
-
-
-
+
+
+ 已处理
+ 未处理
+
+
+
+
+
+
+
+
+ {{ scope.row.create_time | parseTime }}
+
+
+
+
+ {{ scope.row.update_time | parseTime }}
+
+
@@ -59,7 +74,7 @@
@@ -71,15 +86,15 @@ import rrOperation from '@crud/RR.operation'
import CRUD, { presenter, crud } from '@crud/crud'
import DateRangePicker from '@/components/DateRangePicker'
import pagination from '@crud/Pagination'
-
+import { warnRemark } from '@/api/system/logs'
export default {
name: 'LoginLog',
components: { rrOperation, DateRangePicker, pagination },
mixins: [presenter(), crud()],
cruds() {
return CRUD({
- url: 'api/storage/initStorageLogList',
- sort: ['update_time,desc'],
+ url: 'api/alarmlog/',
+ sort: ['createTime,desc'],
// crudMethod: caseCrudMethod,
optShow: {
add: false,
@@ -91,14 +106,15 @@ export default {
},
data() {
return {
+ tableData: [],
handleVisible: false,
selections: [],
keyWord: '',
- oprType: 0,
+ oprType: -1,
oprTypeOptions: [
- { value: 0, label: '全部' },
+ { value: -1, label: '全部' },
{ value: 1, label: '已处理' },
- { value: 2, label: '未处理' }
+ { value: 0, label: '未处理' }
],
optionVal: 1,
options: [
@@ -111,12 +127,27 @@ export default {
},
rules: {
description: [
- { required: true, message: '请输入内容', trigger: 'blur' }
+ { required: true, message: '说明不能为空', trigger: 'blur' }
]
}
}
},
methods: {
+ // 获取数据前的处理
+ [CRUD.HOOK.beforeRefresh]() {
+ this.crud.downloadLoading = true
+ this.crud.query.state = null
+ this.crud.query.blurry = this.keyWord
+ if (this.oprType > -1) {
+ this.crud.query.state = this.oprType
+ }
+ console.log(this.crud.query, '--')
+ this.crud.downloadLoading = false
+ },
+ getData() {
+ const arr = this.crud.data
+ console.log(arr, 'arr')
+ },
// 导出
handleDownload() {
@@ -132,24 +163,56 @@ export default {
},
// 手动处理
handleHand() {
+ this.form.description = this.selections[0].remark
this.handleVisible = true
},
- handleConfirm() {
+ handleSave() {
+ const row = this.selections[0]
+ const params = {
+ 'id': row.id,
+ // 'storeroom_name': row.storeroomName,
+ 'state': true,
+ // 'device_id': row.deviceId,
+ // 'device_name': row.deviceName,
+ // 'content': row.content,
+ 'remark': this.form.description
+ }
+ console.log(params)
this.$refs.formDom.validate((valid) => {
if (valid) {
- this.handleVisible = false
- this.$refs.formDom.resetFields()
- this.$refs.formDom.clearValidate()
+ warnRemark(params).then(res => {
+ console.log(res, '手动处理')
+ if (res === 'SUCCESS') {
+ this.crud.refresh()
+ this.$message({
+ message: '处理成功',
+ type: 'success'
+ })
+ this.handleVisible = false
+ this.$refs.formDom.resetFields()
+ this.$refs.formDom.clearValidate()
+ } else {
+ this.$message.error('处理失败')
+ }
+ })
} else {
return false
}
})
+ },
+ cell({ row, columnIndex }) {
+ if (row.state === true && columnIndex === 2) {
+ return 'have-clear'
+ } else if (row.state === false && columnIndex === 2) {
+ return 'fail-clear'
+ }
}
}
}