+
+
-
+
-
+
+
+
-
-
{{ $translateTitle('Maintenance.Ticket number') }} :
{{ detail.number }}
{{ $translateTitle('Maintenance.Ticket type') }} : {{ detail.type }}
- {{ $translateTitle('Maintenance.the starting time') }} :
+ {{ $translateTitle('cloudTest.Creation time') }} :
{{ $moment(detail.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
-
+
+
+
+
+
+ {{ form.info.productname }}
+
+
+
+
+ {{ form.info.devicename }}
+
+
+
+
+
+ {{ $moment(form.info.startdata).format('YYYY-MM-DD') }}
+
+
+
+
+
+
+ {{ $moment(form.info.completiondata).format('YYYY-MM-DD') }}
+
+
+
+
+
+ {{ form.info.createdname }}
+
+
+
+
+
+
+ {{ form.info.principalname }}
+
+
+
+
+
+
+ {{ form.info.executorname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/src/views/CloudOT/maintenance/components/Step2.vue b/src/views/CloudOT/maintenance/components/Step2.vue
deleted file mode 100644
index 4d3d4e5c09..0000000000
--- a/src/views/CloudOT/maintenance/components/Step2.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
+ ![]()
+
+
-
-
-
-
-
-
-
- {{ form.info.productname }}
-
-
-
-
-
- {{ form.info.devicename }}
-
-
-
-
-
- {{ form.info.createdname }}
-
-
-
-
- {{ form.info.description }}
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/CloudOT/maintenance/components/Step3.vue b/src/views/CloudOT/maintenance/components/Step3.vue
deleted file mode 100644
index cc1b2f6e4e..0000000000
--- a/src/views/CloudOT/maintenance/components/Step3.vue
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ form.info.productname }}
-
-
-
-
-
- {{ form.info.devicename }}
-
-
-
-
-
- {{ form.info.createdname }}
-
-
-
-
- {{ form.info.description }}
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/CloudOT/maintenance/components/Step4.vue b/src/views/CloudOT/maintenance/components/Step4.vue
deleted file mode 100644
index 3890cf81f3..0000000000
--- a/src/views/CloudOT/maintenance/components/Step4.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ form.info.productname }}
-
-
-
-
-
- {{ form.info.createdname }}
-
-
-
-
-
- {{ form.info.createdname }}
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/CloudOT/maintenance/createTicket.vue b/src/views/CloudOT/maintenance/createTicket.vue
index 602dbdcbd1..cd80f49135 100644
--- a/src/views/CloudOT/maintenance/createTicket.vue
+++ b/src/views/CloudOT/maintenance/createTicket.vue
@@ -1,178 +1,218 @@
-
-
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.create Ticket') }}
-
-
- {{ $translateTitle('Maintenance.Export') }}
+ {{ $translateTitle('Maintenance.pub Ticket') }}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ row.info && row.info.productname ? row.info.productname : '' }}
+
+
+
+
+ {{ row.info && row.info.devicename ? row.info.devicename : '' }}
+
+
+
+
+ {{ row.info && row.info.executorname ? row.info.executorname : '' }}
+
+
{{ getStatus(row.status, row) }}
-
- {{ row.info && row.info.productname ? row.info.productname : '' }}
+ {{ $moment(row.info.startdata).format('YYYY-MM-DD') }}
-
- {{ row.info && row.info.devicename ? row.info.devicename : '' }}
+ {{ $moment(row.info.completiondata).format('YYYY-MM-DD') }}
{{ row.info && row.info.createdname ? row.info.createdname : '' }}
@@ -386,7 +393,7 @@
@@ -396,11 +403,27 @@
+
+
+
+
+
+
+ {{ $translateTitle('Maintenance.republish') }}
+
{{ $translateTitle('Maintenance.View') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ $translateTitle('Maintenance.delete') }}
@@ -468,9 +459,12 @@
import { create_object, query_object, update_object } from '@/api/Parse'
import { batch } from '@/api/Batch'
import { queryDevice } from '@/api/Device'
+ import { usertree } from '@/api/User'
import { mapGetters, mapMutations } from 'vuex'
- import ChangeStep from '@/views/CloudOT/maintenance/ChangeStep'
+ import ChangeStep from '../maintenance/ChangeStep'
import { exlout, UploadImg } from '@/api/File'
+ import { getRoleuser, queryRoledepartment } from '@/api/Role'
+ import { Roletree } from '@/api/Menu'
export default {
name: 'CreateTicket',
@@ -479,23 +473,37 @@
},
data() {
return {
+ tickettype: [
+ {
+ label: '巡检',
+ value: '巡检',
+ },
+ {
+ label: '抢修',
+ value: '抢修',
+ },
+ {
+ label: '故障',
+ value: '故障',
+ },
+ ],
showdeviceFlag: false,
created: 0,
Assigned: 0,
+ loading: false,
+ user: [],
+ viewticket: false,
form: {
- receiveuseid: '',
- productname: '',
- devicename: '',
- createdname: '',
- receiveusername: '',
- receiveuserphone: '',
name: '',
product: '',
+ device: '',
type: '',
- description: '',
- photo: [],
- objectId: '',
+ info: {
+ startdata: '',
+ completiondata: '',
+ },
},
+ title: '',
dialogFormVisible: false,
fold: false,
step: 1,
@@ -519,7 +527,7 @@
trigger: 'change',
},
],
- name: [
+ 'info.device': [
{
required: true,
message: '请选择设备',
@@ -533,6 +541,34 @@
trigger: 'change',
},
],
+ 'info.startdata': [
+ {
+ required: true,
+ message: '请选择开始时间',
+ trigger: 'change',
+ },
+ ],
+ 'info.completiondata': [
+ {
+ required: true,
+ message: '请选择要求完成时间',
+ trigger: 'change',
+ },
+ ],
+ 'info.principal': [
+ {
+ required: true,
+ message: '请选择负责人',
+ trigger: 'change',
+ },
+ ],
+ 'info.executor': [
+ {
+ required: true,
+ message: '请选择执行人',
+ trigger: 'change',
+ },
+ ],
},
list: [],
// aclObj: {},
@@ -541,20 +577,20 @@
total: 0,
status: [
{
- key: 0,
- text: 'Maintenance.To be assigned',
+ label: '待接收',
+ value: 0,
},
{
- key: 1,
- text: 'Maintenance.Assigned',
+ label: '已回退',
+ value: 3,
},
{
- key: 2,
- text: 'Maintenance.Processed',
+ label: '处理中',
+ value: 1,
},
{
- key: 3,
- text: 'Maintenance.Statement',
+ label: '已处理',
+ value: 2,
},
],
queryForm: {
@@ -599,43 +635,56 @@
this.set_deviceStep(v)
},
},
- aclObj() {
- let aclObj = {}
- this.role.map((e) => {
- dgiotlog.log(e.name, '')
- aclObj[`${'role' + ':' + e.name}`] = {
- read: true,
- write: true,
- }
- })
- return aclObj
- },
},
watch: {
_deviceStep: function (e) {
- dgiotlog.log(e)
if (e == -1) this.fetchData()
- // this.showdeviceFlag = e == 0 ? true : false
- // this.fetchData()
},
- 'queryForm.status': function (e) {
- dgiotlog.log(e)
- if (e != '') {
- this.queryForm.statusFlag = true
- } else {
- this.queryForm.statusFlag = false
- }
- },
- },
- created() {
- dgiotlog.log('role', this.role)
- dgiotlog.log('this.aclObj', this.aclObj)
},
+ created() {},
mounted() {
- // this.fetchData()
- this.handleCreated('created')
+ this.fetchData()
},
methods: {
+ getistimeout(row) {
+ let oldtime = new Date(row.info.completiondata).getTime()
+ if (new Date() > oldtime && row.status != 2) {
+ return ` 超时 `
+ } else {
+ return ` 未超时 `
+ }
+ },
+ pubticket() {
+ //初始化的时候重置表单，清空效验规则
+ this.$nextTick(() => {
+ this.$refs['form'].resetFields()
+ })
+ this.form = {
+ name: '',
+ product: '',
+ device: '',
+ type: '',
+ info: {
+ startdata: '',
+ completiondata: '',
+ },
+ }
+ this.viewticket = false
+ this.roleuser()
+ this.title = this.$translateTitle('Maintenance.create Ticket')
+ this.dialogFormVisible = true
+ },
+ async roleuser() {
+ let params = {
+ where: {
+ objectId: this.currentDepartment.objectId,
+ },
+ include: true,
+ limit: 10,
+ }
+ const { results } = await getRoleuser(params)
+ this.user = results
+ },
myUpload(content) {
const file = content.file
let extension = file.name.substring(file.name.lastIndexOf('.') + 1)
@@ -650,14 +699,14 @@
UploadImg(params)
.then((res) => {
if (res.data.url) {
- this.form.photo.push(res.data.url)
- dgiotlog.log('上传成功的回调', res.data.url, this.form.photo)
+ this.form.info.photo.push(res.data.url)
+ console.log('上传成功的回调', res.data.url, this.form.photo)
} else {
- dgiotlog.log('no up url ', res)
+ console.log('no up url ', res)
}
})
.catch((e) => {
- dgiotlog.log('出错了', e)
+ console.log('出错了', e)
})
},
submitForm(formName) {
@@ -665,81 +714,76 @@
if (valid) {
this.createdTicket(this.form)
} else {
- dgiotlog.log('error submit!!')
return false
}
})
},
async createdTicket(from) {
const setAcl = {}
- // setAcl['*'] = {
- // read: true,
- // write: true,
- // }
- setAcl[this.objectid] = {
+ setAcl[from.info.principal] = {
read: true,
write: true,
}
- setAcl[`${'role' + ':' + this.currentDepartment.name}`] = {
+ setAcl[from.info.executor] = {
+ read: true,
+ write: true,
+ }
+ setAcl[this.objectid] = {
read: true,
write: true,
}
-
const params = {
number: moment(new Date()).unix() + '',
type: from.type,
status: 0,
- // product: {
- // objectId: from.product,
- // __type: 'Pointer',
- // className: 'Product',
- // },
-
- // user: {
- // objectId: this.objectId,
- // __type: 'Pointer',
- // className: '_User',
- // },
+ ACL: setAcl,
+ product: {
+ objectId: from.product,
+ __type: 'Pointer',
+ className: 'Product',
+ },
+ device: {
+ objectId: from.info.device,
+ __type: 'Pointer',
+ className: 'Device',
+ },
+ user: {
+ objectId: from.info.executor,
+ __type: 'Pointer',
+ className: '_User',
+ },
// ACL: this.aclObj,
- ACL: _.merge(setAcl, this.aclObj),
info: {
- photo: from.photo,
+ photo: from.info.photo,
timeline: [
{
timestamp: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
- h4: '生成工单',
- p: `${this.username}新建工单`,
+ h4: '发布工单',
+ p: `${this.username}创建工单发布给${from.info.executorname}`,
},
],
- description: from.description,
- step1: {},
- step2: {},
- step3: {},
- step4: {},
- productid: from.product,
- productname: from.productname,
- devicename: from.devicename,
- deviceid: from.name,
+ description: from.info.description,
+ productname: from.info.productname,
+ devicename: from.info.devicename,
+ created: this.objectid,
createdname: this.username,
- receiveusername: from.receiveusername,
- receiveuseid: from.receiveuseid,
- receiveuserphone: from.receiveuserphone,
- },
- device: {
- objectId: from.name,
- __type: 'Pointer',
- className: 'Device',
+ startdata: new Date(from.info.startdata).getTime(),
+ completiondata: new Date(from.info.completiondata).getTime(),
+ principal: from.info.principal,
+ principalname: from.info.principalname,
+ executor: from.info.executor,
+ executorname: from.info.executorname,
},
}
const loading = this.$baseColorfullLoading()
const res = await create_object('Maintenance', params)
this.set_deviceStep(-1)
loading.close()
- dgiotlog.log('res', res)
this.fetchData()
this.dialogFormVisible = false
},
resetForm(formName) {
+ this.dialogFormVisible = false
this.$refs[formName].resetFields()
},
changeBox(val) {
@@ -752,10 +796,6 @@
...mapMutations({
set_deviceStep: 'global/set_deviceStep',
}),
- handleFold() {
- this.fold = !this.fold
- this.handleHeight()
- },
/**
*
* @param row
@@ -785,25 +825,13 @@
)
}
},
- handleDelete(row, type) {
+ handleDelete(row) {
let batchParams = []
-
- if (type == 2) {
- batchParams.push({
- method: 'DELETE',
- path: `/classes/Maintenance/${row.objectId}`,
- body: {},
- })
- } else {
- row.forEach((item) => {
- batchParams.push({
- method: 'DELETE',
- path: `/classes/Maintenance/${item.objectId}`,
- body: {},
- })
- })
- }
- dgiotlog.log(batchParams, 'batchParams')
+ batchParams.push({
+ method: 'DELETE',
+ path: `/classes/Maintenance/${row.objectId}`,
+ body: {},
+ })
this.$baseConfirm(
this.$translateTitle(
'Maintenance.Are you sure you want to delete the current item'
@@ -816,42 +844,32 @@
'success',
'dgiot-hey-message-success'
)
- setTimeout(() => {
- this.fetchData()
- }, 1500)
+ this.fetchData()
}
)
},
- handleHeight() {
- if (this.fold) {
- this.height = this.$baseTableHeight(0) - 20
- } else {
- this.height = this.$baseTableHeight(0) - 30
- }
- },
getStatus(type = 0) {
- // type == 0 ? '' : ''
switch (type) {
case 0:
return this.$translateTitle('Maintenance.To be assigned')
break
case 1:
- return this.$translateTitle('Maintenance.Assigned')
+ return this.$translateTitle('Maintenance.processing')
break
case 2:
- return this.$translateTitle('Maintenance.Processed')
+ return this.$translateTitle('Maintenance.processed')
break
case 3:
- return this.$translateTitle('Maintenance.Statement')
+ return this.$translateTitle('Maintenance.returned')
break
default:
return type
- dgiotlog.log('other', type)
}
},
showInfo(row, ishard = false, isfooter = true) {
+ this.title = this.$translateTitle('Maintenance.view Ticket')
+ this.detail = {}
this.showdeviceFlag = false
- dgiotlog.log('row', row.status)
this.ishard = ishard
this.isfooter = isfooter
let { status = 0 } = row
@@ -859,72 +877,53 @@
this.step = status + 1
this.set_deviceStep(status)
this.showdeviceFlag = true
- // switch (step) {
- // case -1:
- // alert(-1)
- // break
- // case 0:
- // alert(0)
- // break
- // case 1:
- // alert(1)
- // break
- // case 2:
- // alert(2)
- // break
- // }
},
- // async handleDelete(objectId) {
- // const res = await del_object('Maintenance', objectId)
- // // dgiotlog.log('res', res)
- // this.$message.success('删除成功')
- // this.fetchData()
- // },
- handleCreated(type) {
- type == 'created' ? this.created++ : this.Assigned++
- this.fetchData()
+ republish(row) {
+ this.title = this.$translateTitle('Maintenance.republish')
+ this.detail = {}
+ this.showdeviceFlag = false
+ this.ishard = true
+ this.isfooter = false
+ let { status = 0 } = row
+ this.detail = row
+ this.step = status + 1
+ this.set_deviceStep(status)
+ this.showdeviceFlag = true
},
- async fetchData(args = {}) {
- dgiotlog.log(this.created % 2, this.created, 'this.created')
- if (!args.limit) {
- args = this.queryForm
- }
- dgiotlog.log(this.queryForm, 'queryForm', args)
+ async fetchData() {
+ let args = this.queryForm
this.listLoading = false
const loading = this.$baseColorfullLoading()
let params = {
limit: args.limit,
order: args.order,
skip: args.skip,
- keys: args.keys,
- where: {},
+ count: 'objectId',
+ where: {
+ 'info.created': this.objectid,
+ },
+ }
+ if (String(this.queryForm.status + '').length > 0) {
+ params.where['status'] = this.queryForm.status
+ }
+ if (isNaN(params.where['status'])) {
+ delete params.where['status']
}
- this.Assigned % 2 == 0
- ? (params.where['info.receiveuseid'] = this.objectid)
- : ''
this.queryForm.number
? (params.where.number = { $regex: this.queryForm.number })
: ''
this.queryForm.product
- ? (params.where['info.productid'] = {
- $regex: this.queryForm.product,
- })
+ ? (params.where['product'] = this.queryForm.product)
: ''
this.queryForm.type
? (params.where.type = { $regex: this.queryForm.type })
: ''
if (this.queryForm.searchDate?.length) {
- params.where['createdAt'] = {
- $gt: {
- __type: 'Date',
- iso: this.queryForm.searchDate[0],
- },
+ params.where['info.startdata'] = {
+ $gt: new Date(this.queryForm.searchDate[0]).getTime(),
}
- params.where['updatedAt'] = {
- $lt: {
- __type: 'Date',
- iso: this.queryForm.searchDate[1],
- },
+ params.where['info.completiondata'] = {
+ $lt: new Date(this.queryForm.searchDate[1]).getTime(),
}
}
await query_object('Maintenance', params)
@@ -950,11 +949,10 @@
dgiotlog.log(this.list, 'this.list')
},
async prodChange(e) {
- dgiotlog.log(e)
this.Device = []
this._Product.map((p) => {
if (p.objectId == e) {
- this.form.productname = p.name
+ this.form.info.productname = p.name
}
})
this.form.name = ''
@@ -962,88 +960,59 @@
where: { product: e },
}
const { results } = await queryDevice(params)
- dgiotlog.log(results, '设备')
this.Device = results
},
deviceChange(e) {
+ console.log('e', e)
this.Device.map((p) => {
if (p.objectId == e) {
- this.form.devicename = p.name
+ this.form.info.devicename = p.name
}
})
- dgiotlog.log(this.form.productname, this.form.devicename)
},
- dispatch() {
- this.$refs.ChangeStep.$refs.step1.dispatchUser()
- // dgiotlog.log()
+ principalChange(e) {
+ this.user.map((p) => {
+ if (p.objectId == e) {
+ this.form.info.principalname = p.nick
+ }
+ })
},
- async backChange(detail) {
- const { objectId, info } = detail
- info.timeline.push({
- timestamp: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
- h4: '已回退',
- p: `${this.username} 回退了流程`,
+ executorChange(e) {
+ this.user.map((p) => {
+ if (p.objectId == e) {
+ this.form.info.executorname = p.nick
+ }
})
-
- const params = {
- status: 0,
- info: info,
+ },
+ //重新发布
+ async dispatch(detail) {
+ const { ACL, objectId, info } = detail
+ const setAcl = {}
+ setAcl[info.principal] = {
+ read: true,
+ write: true,
}
- dgiotlog.log(objectId, params)
- const res = await update_object('Maintenance', objectId, params)
- if (res.updatedAt) {
- this.set_deviceStep(-1)
+ setAcl[info.executor] = {
+ read: true,
+ write: true,
}
- },
- async Reassign(detail) {
- const { objectId, info } = detail
info.timeline.push({
timestamp: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
- h4: '已改派',
- p: `${this.username} 改派了工单`,
+ h4: '重新发布工单',
+ p: `${this.username}重新发布工单给${info.executorname}`,
})
-
const params = {
status: 0,
+ ACL: _.merge(setAcl, ACL),
info: info,
}
- dgiotlog.log(objectId, params)
const res = await update_object('Maintenance', objectId, params)
if (res.updatedAt) {
this.set_deviceStep(-1)
}
- },
- dealwith() {
- this.$refs.ChangeStep.$refs.step2.dispatchUser()
- },
- check() {
- this.$refs.ChangeStep.$refs.step3.dispatchUser()
+ this.showdeviceFlag = false
},
},
}
-
+
diff --git a/src/views/CloudOT/maintenance/dispatchTicket.vue b/src/views/CloudOT/maintenance/dispatchTicket.vue
deleted file mode 100644
index 51752734f2..0000000000
--- a/src/views/CloudOT/maintenance/dispatchTicket.vue
+++ /dev/null
@@ -1,1054 +0,0 @@
-
-
-
-
+
+ ![]()
+
+
+
+
+
-
+
+
+
+
-
-
-
- {{ form.info.executorname }}-->
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+ ![]()
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
+
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.search') }}
-
-
- {{ $translateTitle('Maintenance.Export') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getStatus(row.status, row) }}
-
-
-
-
-
- {{ row.info && row.info.productname ? row.info.productname : '' }}
-
-
-
-
-
- {{ row.info && row.info.devicename ? row.info.devicename : '' }}
-
-
-
-
- {{ row.info && row.info.createdname ? row.info.createdname : '' }}
-
-
-
-
- {{ $moment(row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
-
- {{ $translateTitle('Maintenance.View') }}
-
-
- {{ $translateTitle('Maintenance.Dispatch') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/CloudOT/maintenance/evaluationTicket.vue b/src/views/CloudOT/maintenance/evaluationTicket.vue
deleted file mode 100644
index 10ab946d8e..0000000000
--- a/src/views/CloudOT/maintenance/evaluationTicket.vue
+++ /dev/null
@@ -1,958 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.search') }}
-
-
- {{ $translateTitle('Maintenance.Export') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getStatus(row.status, row) }}
-
-
-
-
-
- {{ row.info && row.info.productname ? row.info.productname : '' }}
-
-
-
-
-
- {{ row.info && row.info.devicename ? row.info.devicename : '' }}
-
-
-
-
- {{ row.info && row.info.createdname ? row.info.createdname : '' }}
-
-
-
-
- {{ $moment(row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
-
- {{ $translateTitle('Maintenance.View') }}
-
-
- {{ $translateTitle('Maintenance.Evaluation') }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/CloudOT/maintenance/index.vue b/src/views/CloudOT/maintenance/index.vue
index e7f8806285..70584e6056 100644
--- a/src/views/CloudOT/maintenance/index.vue
+++ b/src/views/CloudOT/maintenance/index.vue
@@ -1,42 +1,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
- ![]()
-
-
-
+
+
-
-
+
@@ -49,6 +35,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
{{ $translateTitle('Maintenance.search') }}
-
- {{ $translateTitle('Maintenance.Export') }}
-
+
+
+
+
+
+
+
+
+
-
-
+
+ {{ row.info && row.info.productname ? row.info.productname : '' }}
+
+
+
+
+ {{ row.info && row.info.devicename ? row.info.devicename : '' }}
+
+
+
+
+ {{ row.info && row.info.executorname ? row.info.executorname : '' }}
+
+
- {{ getStatus(row.status) }}
+ {{ getStatus(row.status, row) }}
-
- {{ row.info && row.info.productname ? row.info.productname : '' }}
+ {{ $moment(row.info.startdata).format('YYYY-MM-DD') }}
-
- {{ row.info && row.info.devicename ? row.info.devicename : '' }}
+ {{ $moment(row.info.completiondata).format('YYYY-MM-DD') }}
@@ -204,99 +212,92 @@
-
+
{{ $translateTitle('Maintenance.View') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/CloudOT/maintenance/myticket.vue b/src/views/CloudOT/maintenance/myticket.vue
index c6bafbb13d..3ec4efd911 100644
--- a/src/views/CloudOT/maintenance/myticket.vue
+++ b/src/views/CloudOT/maintenance/myticket.vue
@@ -1,181 +1,54 @@
-
-
-
-
+ />
- }
- */
- async batchExport(row) {
- try {
- const params = {
- results: [],
- }
- params['results'] = row
- const res = await exlout(params)
- this.$convertRes2Blob(res)
- this.$message({
- showClose: true,
- duration: 2000,
- message: this.$translateTitle('node.export success'),
- type: 'success',
- })
- } catch (error) {
- console.log(error)
- this.$baseMessage(
- this.$translateTitle('node.export error') + `${error}`,
- 'error',
- 'dgiot-hey-message-error'
- )
- }
- },
- handleDelete(row, type) {
- let batchParams = []
-
- if (type == 2) {
- batchParams.push({
- method: 'DELETE',
- path: `/classes/Maintenance/${row.objectId}`,
- body: {},
- })
- } else {
- row.forEach((item) => {
- batchParams.push({
- method: 'DELETE',
- path: `/classes/Maintenance/${item.objectId}`,
- body: {},
- })
- })
- }
- this.$baseConfirm(
- this.$translateTitle(
- 'Maintenance.Are you sure you want to delete the current item'
- ),
- null,
- async () => {
- const res = await batch(batchParams)
- this.$baseMessage(
- this.$translateTitle('Maintenance.successfully deleted'),
- 'success',
- 'dgiot-hey-message-success'
- )
- setTimeout(() => {
- this.fetchData()
- }, 1500)
- }
- )
- },
- handleHeight() {
- if (this.fold) {
- this.height = this.$baseTableHeight(0) - 20
- } else {
- this.height = this.$baseTableHeight(0) - 30
- }
- },
getStatus(type = 0) {
// type == 0 ? '' : ''
switch (type) {
@@ -836,54 +520,53 @@
return this.$translateTitle('Maintenance.To be assigned')
break
case 1:
- return this.$translateTitle('Maintenance.Assigned')
+ return this.$translateTitle('Maintenance.processing')
break
case 2:
- return this.$translateTitle('Maintenance.Processed')
+ return this.$translateTitle('Maintenance.processed')
break
case 3:
- return this.$translateTitle('Maintenance.Statement')
+ return this.$translateTitle('Maintenance.returned')
break
default:
return type
}
},
showInfo(row, ishard = false, isfooter = true) {
+ this.title = this.$translateTitle('Maintenance.view Ticket')
+ this.detail = {}
+ this.showdeviceFlag = false
this.ishard = ishard
this.isfooter = isfooter
let { status = 0 } = row
this.detail = row
this.step = status + 1
- this.set_deviceFlag(true)
- // switch (step) {
- // case -1:
- // alert(-1)
- // break
- // case 0:
- // alert(0)
- // break
- // case 1:
- // alert(1)
- // break
- // case 2:
- // alert(2)
- // break
- // }
+ this.set_deviceStep(status)
+ this.showdeviceFlag = true
},
- // async handleDelete(objectId) {
- // const res = await del_object('Maintenance', objectId)
- // // console.log('res', res)
- // this.$message.success('删除成功')
- // this.fetchData()
- // },
- handleCreated(type) {
- type == 'created' ? this.created++ : this.Assigned++
- this.fetchData()
- this.getProduct()
+ receive(row) {
+ this.title = this.$translateTitle('Maintenance.receive Ticket')
+ this.detail = {}
+ this.showdeviceFlag = false
+ this.ishard = true
+ this.isfooter = false
+ let { status = 0 } = row
+ this.detail = row
+ this.step = status + 1
+ this.set_deviceStep(status)
+ this.showdeviceFlag = true
},
- async getProduct() {
- const { results = {} } = await queryProduct({})
- this.Product = results
+ dealwith(row) {
+ this.title = this.$translateTitle('Maintenance.dealwith Ticket')
+ this.detail = {}
+ this.showdeviceFlag = false
+ this.ishard = true
+ this.isfooter = false
+ let { status = 0 } = row
+ this.detail = row
+ this.step = status + 1
+ this.set_deviceStep(status)
+ this.showdeviceFlag = true
},
async fetchData(args = {}) {
if (!args.limit) {
@@ -892,55 +575,41 @@
this.listLoading = false
const loading = this.$baseColorfullLoading()
let params = {
+ limit: args.limit,
order: args.order,
- skip: this.start,
- limit: this.length,
- keys: args.keys,
+ skip: args.skip,
count: 'objectId',
where: {
- // info: {},
+ user: this.objectid,
+ status: {
+ $lt: 3,
+ },
},
}
- this.Assigned % 2 == 0
- ? (params.where['info.receiveuseid'] = this.objectid)
- : ''
+ if (String(this.queryForm.status + '').length > 0) {
+ params.where['status'] = this.queryForm.status
+ }
this.queryForm.number
? (params.where.number = { $regex: this.queryForm.number })
: ''
this.queryForm.product
- ? (params.where['info.productid'] = {
- $regex: this.queryForm.product,
- })
+ ? (params.where['product'] = this.queryForm.product)
: ''
this.queryForm.type
? (params.where.type = { $regex: this.queryForm.type })
: ''
if (this.queryForm.searchDate?.length) {
- params.where['createdAt'] = {
- $gt: {
- __type: 'Date',
- iso: this.queryForm.searchDate[0],
- },
+ params.where['info.startdata'] = {
+ $gt: new Date(this.queryForm.searchDate[0]).getTime(),
}
- params.where['updatedAt'] = {
- $lt: {
- __type: 'Date',
- iso: this.queryForm.searchDate[1],
- },
+ params.where['info.completiondata'] = {
+ $lt: new Date(this.queryForm.searchDate[1]).getTime(),
}
}
await query_object('Maintenance', params)
.then((res) => {
const { results = [], count = 0 } = res
this.list = results
- this.list.forEach((e) => {
- e._user = '暂无'
- if (e.ACL) {
- for (var key in e.ACL) {
- e._user = key.substr(0)
- }
- }
- })
this.total = count
loading.close()
})
@@ -949,31 +618,6 @@
loading.close()
})
},
- async prodChange(e) {
- this.Device = []
- this.Product.map((p) => {
- if (p.objectId == e) {
- this.form.productname = p.name
- }
- })
- this.form.name = ''
- const params = {
- where: { product: e },
- }
- const { results } = await queryDevice(params)
- this.Device = results
- },
- deviceChange(e) {
- this.Device.map((p) => {
- if (p.objectId == e) {
- this.form.devicename = p.name
- }
- })
- },
- dispatch() {
- this.$refs.changeinfo.$refs.step1.dispatchUser()
- // console.log()
- },
async backChange(detail) {
const { objectId, info } = detail
info.timeline.push({
@@ -981,64 +625,53 @@
h4: '已回退',
p: `${this.username} 回退了流程`,
})
-
const params = {
- status: 0,
+ status: 3,
info: info,
}
const res = await update_object('Maintenance', objectId, params)
if (res.updatedAt) {
- this.set_deviceFlag(false)
+ this.set_deviceStep(-1)
}
+ this.showdeviceFlag = false
},
- async Reassign(detail) {
+ //接收
+ async receiveChange(detail) {
const { objectId, info } = detail
info.timeline.push({
timestamp: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
- h4: '已改派',
- p: `${this.username} 改派了工单`,
+ h4: '已接收',
+ p: `${this.username} 接收了工单`,
})
-
const params = {
- status: 0,
+ status: 1,
info: info,
}
const res = await update_object('Maintenance', objectId, params)
if (res.updatedAt) {
- this.set_deviceFlag(false)
+ this.set_deviceStep(-1)
}
+ this.showdeviceFlag = false
},
- dealwith() {
- this.$refs.changeinfo.$refs.step2.dispatchUser()
- },
- check() {
- this.$refs.changeinfo.$refs.step3.dispatchUser()
+ //处理
+ async dealwithChange(detail) {
+ const { objectId, info } = detail
+ info.timeline.push({
+ timestamp: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+ h4: '已处理',
+ p: `${this.username} 处理了工单`,
+ })
+ const params = {
+ status: 2,
+ info: info,
+ }
+ const res = await update_object('Maintenance', objectId, params)
+ if (res.updatedAt) {
+ this.set_deviceStep(-1)
+ }
+ this.showdeviceFlag = false
},
},
}
-
+
diff --git a/src/views/CloudOT/maintenance/processTicket.vue b/src/views/CloudOT/maintenance/processTicket.vue
deleted file mode 100644
index bcc2daeadd..0000000000
--- a/src/views/CloudOT/maintenance/processTicket.vue
+++ /dev/null
@@ -1,997 +0,0 @@
-
-
-
{{
row.original.path.split('/')[
@@ -133,11 +118,6 @@
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
{{ $translateTitle('Maintenance.search') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.Unfold') }}
-
- {{ $translateTitle('Maintenance.merge') }}
-
-
-
-
-
- {{ $translateTitle('Maintenance.create Ticket') }}
-
-
- {{ $translateTitle('Maintenance.Export') }}
-
-
- {{ $translateTitle('Maintenance.batch deletion') }}
-
-
-
+
+ {{ row.info && row.info.productname ? row.info.productname : '' }}
+
+
+
+
+ {{ row.info && row.info.devicename ? row.info.devicename : '' }}
+
+
+
+
+ {{ row.info && row.info.executorname ? row.info.executorname : '' }}
+
+
-
- {{ row.info && row.info.productname ? row.info.productname : '' }}
+ {{ $moment(row.info.startdata).format('YYYY-MM-DD') }}
-
- {{ row.info && row.info.devicename ? row.info.devicename : '' }}
+ {{ $moment(row.info.completiondata).format('YYYY-MM-DD') }}
@@ -390,58 +224,47 @@
{{ $moment(row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
+
+
+
+
+
- {{ $translateTitle('Maintenance.View') }}
+ {{ $translateTitle('Maintenance.receive') }}
-
-
-
-
-
-
-
-
{{ $translateTitle('Maintenance.deal with') }}
- {{ $translateTitle('Maintenance.Evaluation') }}
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.delete') }}
+ {{ $translateTitle('Maintenance.View') }}
@@ -449,20 +272,12 @@
-
-
-
-
-
-
-
@@ -471,35 +286,51 @@
import { create_object, query_object, update_object } from '@/api/Parse'
import { batch } from '@/api/Batch'
import { queryDevice } from '@/api/Device'
+ import { usertree } from '@/api/User'
import { mapGetters, mapMutations } from 'vuex'
- import { queryProduct } from '@/api/Product'
- import ChangeInfo from '@/views/CloudOT/maintenance/ChangeInfo'
+ import ChangeStep from '@/views/CloudOT/maintenance/ChangeStep'
import { exlout, UploadImg } from '@/api/File'
+ import { getRoleuser, queryRoledepartment } from '@/api/Role'
+ import { Roletree } from '@/api/Menu'
export default {
- name: 'MyWork',
+ name: 'CreateTicket',
components: {
- ChangeInfo,
+ ChangeStep,
},
data() {
return {
- Product: {},
+ tickettype: [
+ {
+ label: '巡检',
+ value: '巡检',
+ },
+ {
+ label: '抢修',
+ value: '抢修',
+ },
+ {
+ label: '故障',
+ value: '故障',
+ },
+ ],
+ showdeviceFlag: false,
created: 0,
Assigned: 0,
+ loading: false,
+ user: [],
+ viewticket: false,
form: {
- receiveuseid: '',
- productname: '',
- devicename: '',
- createdname: '',
- receiveusername: '',
- receiveuserphone: '',
name: '',
product: '',
+ device: '',
type: '',
- description: '',
- photo: [],
- objectId: '',
+ info: {
+ startdata: '',
+ completiondata: '',
+ },
},
+ title: '',
dialogFormVisible: false,
fold: false,
step: 1,
@@ -523,7 +354,7 @@
trigger: 'change',
},
],
- name: [
+ 'info.device': [
{
required: true,
message: '请选择设备',
@@ -537,38 +368,59 @@
trigger: 'change',
},
],
+ 'info.startdata': [
+ {
+ required: true,
+ message: '请选择开始时间',
+ trigger: 'change',
+ },
+ ],
+ 'info.completiondata': [
+ {
+ required: true,
+ message: '请选择要求完成时间',
+ trigger: 'change',
+ },
+ ],
+ 'info.principal': [
+ {
+ required: true,
+ message: '请选择负责人',
+ trigger: 'change',
+ },
+ ],
+ 'info.executor': [
+ {
+ required: true,
+ message: '请选择执行人',
+ trigger: 'change',
+ },
+ ],
},
list: [],
// aclObj: {},
listLoading: false,
layout: 'total, sizes, prev, pager, next, jumper',
- length: 10,
- start: 0,
total: 0,
- paginationKey: moment(new Date()).valueOf() + '',
status: [
{
- key: 0,
- text: 'Maintenance.To be assigned',
- },
- {
- key: 1,
- text: 'Maintenance.Assigned',
+ label: '待接收',
+ value: 0,
},
{
- key: 2,
- text: 'Maintenance.Processed',
+ label: '处理中',
+ value: 1,
},
{
- key: 3,
- text: 'Maintenance.Statement',
+ label: '已处理',
+ value: 2,
},
],
queryForm: {
devicename: '',
statusFlag: false,
status: '',
- number: this.$route.query.id || '',
+ number: '',
product: '',
type: '',
pageNo: 1,
@@ -583,65 +435,49 @@
},
computed: {
...mapGetters({
+ _Product: 'user/_Product',
objectid: 'user/objectId',
role: 'acl/role',
- currentDepartment: 'user/currentDepartment',
username: 'user/username',
+ currentDepartment: 'user/currentDepartment',
}),
- _deviceFlag: {
+ _deviceStep: {
get() {
- console.log(
- 'this.$store.state.global._deviceFlag',
- this.$store.state.global._deviceFlag
- )
- return this.$store.state.global._deviceFlag
+ return this.$store.state.global._deviceStep
},
set(v) {
- this.set_deviceFlag(v)
+ this.set_deviceStep(v)
},
},
- aclObj() {
- let aclObj = {}
- this.role.map((e) => {
- aclObj[`${'role' + ':' + e.name}`] = {
- read: true,
- write: true,
- }
- })
- return aclObj
- },
},
watch: {
- _deviceFlag: function (e) {
- if (e == false) {
- this.fetchData()
- }
- },
- 'queryForm.status': function (e) {
- if (e != '') {
- this.queryForm.statusFlag = true
- } else {
- this.queryForm.statusFlag = false
- }
+ _deviceStep: function (e) {
+ if (e == -1) this.fetchData()
},
},
created() {},
mounted() {
- // this.fetchData()
- this.handleCreated('created')
+ this.fetchData()
},
methods: {
- // 分页
- channelSizeChange(val) {
- this.length = val
- // this.total = 0
- this.fetchData()
+ getistimeout(row) {
+ let oldtime = new Date(row.info.completiondata).getTime()
+ if (new Date() > oldtime && row.status != 2) {
+ return ` 超时 `
+ } else {
+ return ` 未超时 `
+ }
},
- channelCurrentChange(val) {
- // this.total = 0
- if (val <= 1) this.total = 0
- this.start = (val - 1) * this.length
- this.fetchData()
+ async roleuser() {
+ let params = {
+ where: {
+ objectId: this.currentDepartment.objectId,
+ },
+ include: true,
+ limit: 10,
+ }
+ const { results } = await getRoleuser(params)
+ this.user = results
},
myUpload(content) {
const file = content.file
@@ -653,10 +489,12 @@
path: 'ticket',
filename: 'ticket' + `${moment().format('x')}.${extension}`,
}
+ dgiotlog.log('extension', params)
UploadImg(params)
.then((res) => {
if (res.data.url) {
- this.form.photo.push(res.data.url)
+ this.form.info.photo.push(res.data.url)
+ console.log('上传成功的回调', res.data.url, this.form.photo)
} else {
console.log('no up url ', res)
}
@@ -665,170 +503,16 @@
console.log('出错了', e)
})
},
- submitForm(formName) {
- this.$refs[formName].validate((valid) => {
- if (valid) {
- this.createdTicket(this.form)
- } else {
- console.log('error submit!!')
- return false
- }
- })
- },
- async createdTicket(from) {
- const setAcl = {}
- // setAcl['*'] = {
- // read: true,
- // write: true,
- // }
- setAcl[this.objectid] = {
- read: true,
- write: true,
- }
- setAcl[`${'role' + ':' + this.currentDepartment.name}`] = {
- read: true,
- write: true,
- }
- const params = {
- number: moment(new Date()).unix() + '',
- type: from.type,
- // status: 0,
- // product: {
- // objectId: from.product,
- // __type: 'Pointer',
- // className: 'Product',
- // },
-
- // user: {
- // objectId: this.objectId,
- // __type: 'Pointer',
- // className: '_User',
- // },
- // ACL: this.aclObj,
- status: 0,
- ACL: _.merge(setAcl, this.aclObj),
- info: {
- photo: from.photo,
- timeline: [
- {
- timestamp: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
- h4: '生成工单',
- p: `${this.username}新建工单`,
- },
- ],
- description: from.description,
- step1: {},
- step2: {},
- step3: {},
- step4: {},
- productid: from.product,
- productname: from.productname,
- devicename: from.devicename,
- deviceid: from.name,
- createdname: this.username,
- receiveusername: from.receiveusername,
- receiveuseid: from.receiveuseid,
- receiveuserphone: from.receiveuserphone,
- },
- device: {
- objectId: from.name,
- __type: 'Pointer',
- className: 'Device',
- },
- }
- const loading = this.$baseColorfullLoading()
- const res = await create_object('Maintenance', params)
- loading.close()
- this.fetchData()
- this.dialogFormVisible = false
- },
- resetForm(formName) {
- this.$refs[formName].resetFields()
- },
changeBox(val) {
this.selectedList = []
val.forEach((item) => {
this.selectedList.push(item)
})
+ dgiotlog.log(this.selectedList)
},
...mapMutations({
- set_deviceFlag: 'global/set_deviceFlag',
+ set_deviceStep: 'global/set_deviceStep',
}),
- handleFold() {
- this.fold = !this.fold
- this.handleHeight()
- },
- /**
- *
- * @param row
- * @return {Promise
-
-
-
-
+
+ {{ $translateTitle('Maintenance.receive') }}
+
+
+ {{ $translateTitle('Maintenance.deal with') }}
+
+
+
-
+
+
+ {{ $translateTitle('tagsView.close') }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
+ {{ $translateTitle('Maintenance.back') }}
+
+
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.search') }}
-
-
- {{ $translateTitle('Maintenance.Export') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getStatus(row.status, row) }}
-
-
-
-
-
- {{ row.info && row.info.productname ? row.info.productname : '' }}
-
-
-
-
-
- {{ row.info && row.info.devicename ? row.info.devicename : '' }}
-
-
-
-
- {{ row.info && row.info.createdname ? row.info.createdname : '' }}
-
-
-
-
- {{ $moment(row.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
-
-
-
-
-
- {{ $translateTitle('Maintenance.View') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $translateTitle('Maintenance.deal with') }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/CloudTest/review/index.vue b/src/views/CloudTest/review/index.vue
index 5eb2c9eeb9..2524028557 100644
--- a/src/views/CloudTest/review/index.vue
+++ b/src/views/CloudTest/review/index.vue
@@ -49,21 +49,6 @@
width="auto"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
- ![]()
-
-