diff --git a/src/views/EquipmentEntryApply/equipmentInput/index1.vue b/src/views/EquipmentEntryApply/equipmentInput/index1.vue
index cd1f6d47..c374701b 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index1.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index1.vue
@@ -12,14 +12,7 @@
-
+
@@ -35,22 +28,9 @@
-
- 查询
-
-
- 重置
-
-
+ 查询
+ 重置
+
新增装备
@@ -59,94 +39,50 @@
-
+
-
+
{{ `${row.deviceName}` }}
-
+
-
-
- {{ row.proType }} /
- {{ row.mainGx }}/
- {{ row.childGx }}/
- {{ row.devCategory }}/
- {{ row.devSubcategory }}/
- {{ row.devName }}
-
+
+
+ {{ row.proType }} / {{ row.mainGx }}/
+ {{ row.childGx }}/ {{ row.devCategory
+ }}/ {{ row.devSubcategory
+ }}/
+ {{ row.devName }}
+
-
+
-
- {{
- row.nextCheckDate
- }}
+
+ {{ row.nextCheckDate }}
-
+
待审批
已审批
审批驳回
草稿
-
-
-
- 编辑
-
- 删除
-
+
+
+ 编辑
+ 删除
-
-
-
-
- 通过
-
-
- 驳回
-
+
+
+ 通过
+ 驳回
@@ -156,23 +92,17 @@
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
/>
-
-
-
+
@@ -184,7 +114,7 @@ import {
equipmentDraftListApiNew,
equipmentPassAndRejectApiNew,
equipmentSubmitApiNew,
- removeDeviceApi
+ removeDeviceApi,
} from '@/api/EquipmentEntryApply'
export default {
@@ -196,21 +126,21 @@ export default {
isVisible: {
type: Boolean,
default: false,
- description: '控制弹窗显示与隐藏'
+ description: '控制弹窗显示与隐藏',
},
isAddVisible: {
type: Boolean,
- default: false
+ default: false,
},
orderId: {
type: String,
default: '',
- description: '关联的订单ID字符串'
+ description: '关联的订单ID字符串',
},
isApprovalVisible: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
},
emits: ['update:isVisible', 'submit'], // 声明事件
data() {
@@ -223,15 +153,15 @@ export default {
orderId: '',
deviceName: '',
pageNum: 1,
- pageSize: 10
+ pageSize: 10,
},
// 可添加表单数据
formData: {
// 示例字段,可根据实际需求修改
equipmentName: '',
model: '',
- quantity: 1
- }
+ quantity: 1,
+ },
}
},
watch: {
@@ -239,15 +169,15 @@ export default {
if (val) {
this.getList()
}
- }
+ },
},
methods: {
async approval(row, status) {
- equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then(res => {
+ equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
- message: '操作成功'
+ message: '操作成功',
})
this.getList()
}
@@ -284,22 +214,21 @@ export default {
this.$confirm('是否确定删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning'
+ type: 'warning',
})
.then(() => {
return removeDeviceApi([row.maId])
})
- .then(res => {
+ .then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
- message: '删除成功'
+ message: '删除成功',
})
this.getList()
}
})
- .catch(() => {
- })
+ .catch(() => {})
},
// 重置表格查询
resetTableList() {
@@ -318,21 +247,20 @@ export default {
* 处理表单提交
*/
handleSubmit() {
- equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then(res => {
+ equipmentSubmitApiNew({ id: this.orderId, status: 0 }).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
- message: '提交成功'
+ message: '提交成功',
})
this.handleClose()
this.$emit('submit', {
- orderId: this.orderId
+ orderId: this.orderId,
})
}
})
-
- }
- }
+ },
+ },
}
diff --git a/src/views/contract-manage/index.vue b/src/views/contract-manage/index.vue
index 2f9323e5..7d543059 100644
--- a/src/views/contract-manage/index.vue
+++ b/src/views/contract-manage/index.vue
@@ -1,125 +1,118 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
-
+
协议新建
-
- 模板下载
-
+
+ 模板下载
+
-
-
+
+
@@ -451,11 +443,11 @@ export default {
padding: 0;
::v-deep .el-card__body {
padding: 20px !important;
-}
+ }
}
.el-form-item--small.el-form-item {
- margin-bottom: 0px;
+ margin-bottom: 0px;
}
.content-box {
@@ -498,7 +490,7 @@ export default {
padding-top: 6px;
margin-top: auto;
- ::v-deep .pagination-container {
+ ::v-deep .pagination-container {
padding: 0px 20px !important;
/* margin-bottom: 30px; */
}
@@ -508,25 +500,24 @@ export default {
// 启用斑马纹
&.el-table--striped .el-table__body {
tr.el-table__row--striped td {
- background-color: #F6FBFA !important; // 浅紫色
+ background-color: #f6fbfa !important; // 浅紫色
}
}
.el-table__header {
- background: #E9F0EE;
+ background: #e9f0ee;
th {
- background: #E9F0EE !important;
+ background: #e9f0ee !important;
color: #606266;
font-weight: 600;
height: 50px;
}
}
- &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
- background-color: #CCF1E9 !important;
+ &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
+ background-color: #ccf1e9 !important;
}
}
}
-
diff --git a/src/views/system/log/businessLog/index.vue b/src/views/system/log/businessLog/index.vue
index 64b0613f..efe6a708 100644
--- a/src/views/system/log/businessLog/index.vue
+++ b/src/views/system/log/businessLog/index.vue
@@ -1,73 +1,109 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
- 查询
-
-
- 重置
-
-
- 备份
-
+
+ 查询
+ 重置
+ 备份
-
+
-
+
-
+
{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}
@@ -91,7 +127,7 @@
- {{ row.result}}
+ {{ row.result }}
@@ -101,153 +137,157 @@
-
-
-
+
+
+
-
+ this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
+ this.handleFilter()
+ },
+ // 备份
+ handleBackups() {
+ downloadYwLogs().then((res) => {
+ downloadFile({ fileName: '业务日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
+ })
+ },
+ //导出
+ handleExport() {
+ // exportCarDetail().then(res => {
+ // downloadFile({ fileName: '设备详情.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+ // })
+ },
+ getCurrentDate() {
+ let now = new Date()
+ let year = now.getFullYear()
+ let month = now.getMonth() + 1
+ if (month < 10) {
+ month = '0' + month
+ }
+ let day = now.getDate()
+ if (day < 10) {
+ day = '0' + day
+ }
+ return year + '-' + month + '-' + day
+ },
+ },
+}
+
diff --git a/src/views/system/log/systemLog/index.vue b/src/views/system/log/systemLog/index.vue
index b99bb01d..eb3234c1 100644
--- a/src/views/system/log/systemLog/index.vue
+++ b/src/views/system/log/systemLog/index.vue
@@ -1,110 +1,135 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 查询
-
-
- 重置
-
-
- 备份
-
-
-
-
+
+ 查询
+ 重置
+ 备份
+
+
+
-
-
-
- {{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}
-
-
-
-
-
-
-
-
-
-
- {{ row.result }}
-
-
-
-
-
-
-
+
+
+
+ {{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+ {{ row.result }}
+
+
+
+
+
+
+
-
+
@@ -115,24 +140,23 @@ import Pagination from '@/components/Pagination'
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
-import { getSysLogs,downloadSysLogs } from '@/api/system/log'
-
+import { getSysLogs, downloadSysLogs } from '@/api/system/log'
const outcomeList = {
- 1:'成功',
- 2:'失败'
-};
+ 1: '成功',
+ 2: '失败',
+}
const operateList = {
- 1:'新增',
- 2:'修改',
- 3:'删除',
- 4:'查询',
- 5:'导出',
- 6:'下载',
- 7:'备份',
- 8:'登录',
- 9:'登出'
-};
+ 1: '新增',
+ 2: '修改',
+ 3: '删除',
+ 4: '查询',
+ 5: '导出',
+ 6: '下载',
+ 7: '备份',
+ 8: '登录',
+ 9: '登出',
+}
export default {
components: { Pagination },
@@ -145,21 +169,30 @@ export default {
listLoading: false,
tableHeight: 650,
operateList: operateList,
- timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},{id:5,name:'操作类型'},],
- sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
+ timeList: [
+ { id: 1, name: '时间' },
+ { id: 2, name: '操作人' },
+ { id: 3, name: '操作模块' },
+ { id: 4, name: 'ip' },
+ { id: 5, name: '操作类型' },
+ ],
+ sortList: [
+ { id: 1, name: '倒序' },
+ { id: 2, name: '升序' },
+ ],
listQuery: {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
- content:'',
+ content: '',
result: '',
- operTime:'',
+ operTime: '',
operaType: '',
- logSort:1,
- logDesc:1,
+ logSort: 1,
+ logDesc: 1,
},
- rangeDate:[],
+ rangeDate: [],
}
},
created() {
@@ -167,8 +200,8 @@ export default {
// this.getOperate()
},
mounted() {
- this.listQuery.operTime = this.getCurrentDate()+' - '+this.getCurrentDate();
- this.rangeDate = [this.getCurrentDate(),this.getCurrentDate()]
+ this.listQuery.operTime = this.getCurrentDate() + ' - ' + this.getCurrentDate()
+ this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
this.getList()
},
methods: {
@@ -176,7 +209,7 @@ export default {
return this.outcomeList[val]
},
//获取下拉数据
- getOperate(){
+ getOperate() {
// getOperateList().then((response) => {
// this.operateList = response.data
// })
@@ -184,18 +217,18 @@ export default {
getList() {
this.listLoading = true
- if(this.rangeDate && this.rangeDate.length>0){
- this.listQuery.operTime = this.rangeDate[0]+' - '+this.rangeDate[1];
+ if (this.rangeDate && this.rangeDate.length > 0) {
+ this.listQuery.operTime = this.rangeDate[0] + ' - ' + this.rangeDate[1]
}
getSysLogs(this.listQuery).then((response) => {
- this.list = response.rows.map(item => {
+ this.list = response.rows.map((item) => {
return item
})
this.total = response.total
})
- setTimeout(()=>{
+ setTimeout(() => {
this.listLoading = false
- },500)
+ }, 500)
},
// 查询
handleFilter() {
@@ -204,49 +237,46 @@ export default {
},
//重置
resetFilter() {
- this.listQuery={
+ this.listQuery = {
pageNum: 1,
pageSize: 10,
operaUserName: '',
ip: '',
- content:'',
+ content: '',
result: '',
operateType: '',
- logSort:1,
- logDesc:1,
- };
- this.rangeDate=[this.getCurrentDate(),this.getCurrentDate()]
+ logSort: 1,
+ logDesc: 1,
+ }
+ this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()]
this.handleFilter()
},
// 备份
handleBackups() {
- downloadSysLogs().then(res => {
- downloadFile({ fileName: '系统日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
+ downloadSysLogs().then((res) => {
+ downloadFile({ fileName: '系统日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
})
-
},
//导出
- handleExport(){
-
+ handleExport() {
// exportCarDetail().then(res => {
// downloadFile({ fileName: '设备详情.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
// })
},
getCurrentDate() {
- let now = new Date();
- let year = now.getFullYear();
- let month = now.getMonth() + 1;
- if(month<10){
- month = '0'+month
+ let now = new Date()
+ let year = now.getFullYear()
+ let month = now.getMonth() + 1
+ if (month < 10) {
+ month = '0' + month
}
- let day = now.getDate();
- if(day<10){
- day = '0'+day
+ let day = now.getDate()
+ if (day < 10) {
+ day = '0' + day
}
- return year + "-" + month + "-" + day;
- }
-
- }
+ return year + '-' + month + '-' + day
+ },
+ },
}