From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
admin/src/views/platform/queueUp.vue | 16 ++++++++++++++--
screen/src/assets/images/default_nowarning.png | 0
admin/src/api/platform/index.js | 4 ++++
screen/src/views/SecurityControl.vue | 4 ++--
admin/.env.development | 2 +-
screen/src/views/FireFighting.vue | 2 +-
screen/src/views/TaskEfficiency.vue | 18 ++++++++++++------
7 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 3661935..bb23aa8 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,7 +2,7 @@
NODE_ENV = 'development'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://192.168.1.54:10010'
+VUE_APP_API_URL = 'http://192.168.1.116:10010'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/admin/src/api/platform/index.js b/admin/src/api/platform/index.js
index 4e07a6e..873bfd1 100644
--- a/admin/src/api/platform/index.js
+++ b/admin/src/api/platform/index.js
@@ -143,3 +143,7 @@
export function restoreWork (data) {
return request.post('/visitsAdmin/cloudService/business/platformJob/restoreWork', data)
}
+// 鍔犳��
+export function jobUrge (data) {
+ return request.post('/visitsAdmin/cloudService/business/platformJob/jobUrge', data)
+}
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 2a367f4..14057e8 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -65,11 +65,12 @@
<span v-if="row.status == 7" class="primaryColor">杞Щ涓�</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
+ <el-table-column label="鎿嶄綔" align="center" width="200" fixed="right">
<template slot-scope="{ row }">
<el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
v-permissions="['business:company:update']">杩愬崟璇︽儏</el-button>
<el-button v-else type="text" @click="subDetail(row)">棰勭害璇︽儏</el-button>
+ <el-button type="text" @click="jiaji(row.id)">鍔犳��</el-button>
</template>
</el-table-column>
</el-table>
@@ -118,7 +119,8 @@
import {
getPlatformGroupList,
platformLineUpPage,
- getPlatformGroupWork
+ getPlatformGroupWork,
+ jobUrge
} from '@/api'
import { queryQueueUpConfig } from './config'
import WaybillDetail from './components/WaybillDetail.vue'
@@ -174,6 +176,16 @@
this.$refs.PlatformSignRef.getList()
})
},
+ jiaji(id) {
+ this.$dialog.exportConfirm('纭鍔犳�ュ悧锛�')
+ .then(() => {
+ jobUrge({ id })
+ .then(res => {
+ this.getPlatGroupList()
+ })
+ })
+ .catch(() => {})
+ },
getPlatGroupList() {
getPlatformGroupList({
queryData: 1,
diff --git a/screen/src/assets/images/default_nowarning.png b/screen/src/assets/images/default_nowarning.png
new file mode 100644
index 0000000..52636d6
--- /dev/null
+++ b/screen/src/assets/images/default_nowarning.png
Binary files differ
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index a92a142..458ccd2 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -328,7 +328,7 @@
</div>
</div>
<div v-if="dataList7.length == 0" style="margin-top: 50px;" class="empty_wrap">
- <img src="@/assets/images/default_empty.png" alt="">
+ <img src="@/assets/images/default_nowarning.png" style="width: 150px; height: 150px;" alt="">
</div>
</div>
</div>
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index c358cb6..1f378c4 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -369,7 +369,7 @@
</div>
</div>
<div v-if="arr1.length == 0" style="width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;">
- <img src="@/assets/images/default_empty.png" style="width: 120px; height: 120px;" alt="">
+ <img src="@/assets/images/default_nowarning.png" style="width: 150px; height: 150px;" alt="">
</div>
</div>
</div>
@@ -408,7 +408,7 @@
</div>
</div>
<div v-if="arr2.length == 0" style="width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;">
- <img src="@/assets/images/default_empty.png" style="width: 120px; height: 120px;" alt="">
+ <img src="@/assets/images/default_nowarning.png" style="width: 150px; height: 150px;" alt="">
</div>
</div>
</div>
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 939a043..e270f2a 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -311,7 +311,7 @@
</div>
</div>
<div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;">
- <img src="@/assets/images/default_empty.png" alt="">
+ <img src="@/assets/images/default_nowarning.png" alt="">
</div>
</div>
</div>
@@ -598,11 +598,17 @@
}]),
]
const temp = []
- temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100' : 0 })
- temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.signedNum ? (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
- temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.signedNum ? (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
- temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.signedNum ? (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ // temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100' : 0 })
+ // temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.signedNum ? (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ // temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.signedNum ? (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ // temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.signedNum ? (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum || 0 })
+ temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.calledNum || 0 })
+ temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.workedNum || 0 })
+ temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.doneNum || 0 })
+
+ console.log('temp', temp)
const option = {
color: colors,
tooltip: {
@@ -649,7 +655,7 @@
position: 'outside',
formatter: (params) => {
const index = params.dataIndex
- return `{color${index}|${params.data.name} ${params.data.rate}%}`
+ return `{color${index}|${params.data.name} ${params.data.rate}}`
// return `<div>${params.data.name}</div>`
},
rich: {
--
Gitblit v1.9.3