odjbin/SmartOpsWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master' (#188) from master into test

Browse Source 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/188
This commit is contained in:
odjbin
2024-11-24 14:10:49 +00:00
parent b56a191d08 d1e9f634cf
commit 4b2bbfdb4c
5 changed files with 153 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/home/index.vue
View File

@@ -70,12 +70,12 @@ const tableConfig = reactive({
label: '处理人',
align: 'center'
},
{
prop: 'knotter',
// prop: 'destinationName',
label: '关单人',
align: 'center'
},
// {
// prop: 'knotter',
// // prop: 'destinationName',
// label: '关单人',
// align: 'center'
// },
{
prop: 'destinationName',
// prop: 'workOrderNumber',
@@ -189,8 +189,8 @@ const handleLogout = () => {
const initWebSocket = () => {
try {
// const wsUrl=setWsUrl(`/ws/text/${token}`)
const wsUrl = `ws://frp.feashow.cn:31800/ws/history/${token}`
// const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}`
// const wsUrl = `ws://frp.feashow.cn:31800/ws/history/${token}`
const wsUrl = `ws://192.168.1.71:88/ws/history/${token}`
socket = new WebSocket(wsUrl)
// 2. ws.send()给服务器发送信息
//连接发生错误的回调方法

71
src/views/task-management/all-work-order/index.vue
View File

@@ -43,16 +43,18 @@ const searchConfig = reactive([
checkStrictly: true
},
component: 'el-input',
}, {
label: '工单名称',
prop: 'orderName',
props: {
placeholder: '请输入工单名查询',
clearable: true,
checkStrictly: true
},
component: 'el-input',
}, {
},
// {
// label: '工单名称',
// prop: 'orderName',
// props: {
// placeholder: '请输入工单名查询',
// clearable: true,
// checkStrictly: true
// },
// component: 'el-input',
// },
{
label: '工单状态',
prop: 'orderState',
props: {
@@ -71,16 +73,17 @@ const searchConfig = reactive([
checkStrictly: true
},
component: 'el-input',
}, {
label: '关单人',
prop: 'knotter',
props: {
placeholder: '请输入关单人查询',
clearable: true,
checkStrictly: true
},
component: 'el-input',
},
// {
// label: '关单人',
// prop: 'knotter',
// props: {
// placeholder: '请输入关单人查询',
// clearable: true,
// checkStrictly: true
// },
// component: 'el-input',
// },
{
label: '创建时间',
prop: 'createdTime',
@@ -133,15 +136,27 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
// {
// prop: 'orderName',
// label: '工单名称',
// align: 'center',
// width: 200
// },
{
prop: 'orderName',
label: '工单名称',
prop: 'orderContent',
label: '工单内容',
align: 'center',
width: 250
},
{
prop: 'alarmUnit',
label: '拨打单位',
align: 'center',
width: 200
},
{
prop: 'orderContent',
label: '工单内容',
prop: 'alarmObject',
label: '拨打对象',
align: 'center',
width: 200
},
@@ -208,11 +223,11 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
{
prop: 'knotter',
label: '关单人',
align: 'center'
},
// {
// prop: 'knotter',
// label: '关单人',
// align: 'center'
// },
{
prop: 'oper',
label: '操作',

10
src/views/task-management/components/WorkDialog.vue
View File

@@ -179,12 +179,14 @@ const inputOrderTime = (item, index) => {
}
const inputOrderContent = (contentState) => {
console.log('contentState',contentState)
contentState.map((item, index) => {
inputOrderTime(item, index)
})
contentState.forEach(item => {
orderContent.value.push(item)
})
// contentState.forEach(item => {
// orderContent.value.push(item)
// })
}
const openRecord = () => {
@@ -241,8 +243,8 @@ defineExpose({
<span>处理人：{{ rowData.operationUser || '--' }}</span>
</div>
<div class="info">
<span>工单名称：{{ rowData.orderName || '--' }}</span>
<span>关单人：{{ rowData.knotter || '--' }}</span>
<span>拨打单位：{{ rowData.alarmUnit || '--' }}</span>
<span>拨打对象：{{ rowData.alarmObject || '--' }}</span>
</div>
</div>
<div class="body">

77
src/views/task-management/historical-work-order/index.vue
View File

@@ -45,16 +45,18 @@ const searchConfig = reactive([
checkStrictly: true
},
component: 'el-input',
}, {
label: '工单名称',
prop: 'orderName',
props: {
placeholder: '请输入工单名查询',
clearable: true,
checkStrictly: true
},
component: 'el-input',
}, {
},
// {
// label: '工单名称',
// prop: 'orderName',
// props: {
// placeholder: '请输入工单名查询',
// clearable: true,
// checkStrictly: true
// },
// component: 'el-input',
// },
{
label: '处理人',
prop: 'operationUser',
props: {
@@ -63,16 +65,17 @@ const searchConfig = reactive([
checkStrictly: true
},
component: 'el-input',
}, {
label: '关单人',
prop: 'knotter',
props: {
placeholder: '请输入关单人查询',
clearable: true,
checkStrictly: true
},
component: 'el-input',
},
// {
// label: '关单人',
// prop: 'knotter',
// props: {
// placeholder: '请输入关单人查询',
// clearable: true,
// checkStrictly: true
// },
// component: 'el-input',
// },
{
label: '创建时间',
prop: 'createdTime',
@@ -125,15 +128,27 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
// {
// prop: 'orderName',
// label: '工单名称',
// align: 'center',
// width: 200
// },
{
prop: 'orderName',
label: '工单名称',
prop: 'orderContent',
label: '工单内容',
align: 'center',
width: 250
},
{
prop: 'alarmUnit',
label: '拨打单位',
align: 'center',
width: 200
},
{
prop: 'orderContent',
label: '工单内容',
prop: 'alarmObject',
label: '拨打对象',
align: 'center',
width: 200
},
@@ -193,11 +208,11 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
{
prop: 'knotter',
label: '关单人',
align: 'center'
},
// {
// prop: 'knotter',
// label: '关单人',
// align: 'center'
// },
{
prop: 'oper',
label: '操作',
@@ -275,7 +290,11 @@ const handleClose = async (row) => {
}
)
.then(async () => {
const info = await orderdClose(row.orderNumber)
const info = await orderdClose({
orderNumber: row.orderNumber,
alarmObject: row.alarmObject,
alarmUnit: row.alarmUnit
})
// console.log(info);
if (info.code === 1000) {
tableIns.value.refresh()

77
src/views/task-management/pending-work-order/index.vue
View File

@@ -45,16 +45,18 @@ const searchConfig = reactive([
checkStrictly: true
},
component: 'el-input',
}, {
label: '工单名称',
prop: 'orderName',
props: {
placeholder: '请输入工单名查询',
clearable: true,
checkStrictly: true
},
component: 'el-input',
}, {
},
// {
// label: '工单名称',
// prop: 'orderName',
// props: {
// placeholder: '请输入工单名查询',
// clearable: true,
// checkStrictly: true
// },
// component: 'el-input',
// },
{
label: '处理人',
prop: 'operationUser',
props: {
@@ -63,16 +65,17 @@ const searchConfig = reactive([
checkStrictly: true
},
component: 'el-input',
}, {
label: '关单人',
prop: 'knotter',
props: {
placeholder: '请输入关单人查询',
clearable: true,
checkStrictly: true
},
component: 'el-input',
},
// {
// label: '关单人',
// prop: 'knotter',
// props: {
// placeholder: '请输入关单人查询',
// clearable: true,
// checkStrictly: true
// },
// component: 'el-input',
// },
{
label: '创建时间',
prop: 'createdTime',
@@ -125,15 +128,27 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
// {
// prop: 'orderName',
// label: '工单名称',
// align: 'center',
// width: 200
// },
{
prop: 'orderName',
label: '工单名称',
prop: 'orderContent',
label: '工单内容',
align: 'center',
width: 250
},
{
prop: 'alarmUnit',
label: '拨打单位',
align: 'center',
width: 200
},
{
prop: 'orderContent',
label: '工单内容',
prop: 'alarmObject',
label: '拨打对象',
align: 'center',
width: 200
},
@@ -193,11 +208,11 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
{
prop: 'knotter',
label: '关单人',
align: 'center'
},
// {
// prop: 'knotter',
// label: '关单人',
// align: 'center'
// },
{
prop: 'oper',
label: '操作',
@@ -275,7 +290,11 @@ const handleClose = async (row) => {
}
)
.then(async () => {
const info = await orderdClose(row.orderNumber)
const info = await orderdClose({
orderNumber: row.orderNumber,
alarmObject: row.alarmObject,
alarmUnit: row.alarmUnit
})
// console.log(info);
if (info.code === 1000) {
tableIns.value.refresh()