From a7b4da4fb176cfbca00d6ac4c06db56720a13e0c Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 26 Jan 2026 16:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff | 0
applications/drone-command/src/styles/common.scss | 1
applications/task-work-order/src/styles/common.scss | 1
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 2
applications/task-work-order/src/assets/images/menuIcon/order-manage.png | 0
applications/drone-command/src/config/iconList.js | 7 ++
applications/task-work-order/src/styles/customFont.scss | 60 ++++++++++++++++++++
applications/drone-command/src/styles/customFont.scss | 60 ++++++++++++++++++++
applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff | 0
applications/task-work-order/src/config/iconList.js | 7 ++
applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff2 | 0
applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.ttf | 0
applications/task-work-order/src/styles/common/cockpit.scss | 4 +
applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff2 | 0
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 2
applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.ttf | 0
16 files changed, 142 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.ttf b/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.ttf
new file mode 100644
index 0000000..8d29e36
--- /dev/null
+++ b/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.ttf
Binary files differ
diff --git a/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff b/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff
new file mode 100644
index 0000000..042931c
--- /dev/null
+++ b/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff
Binary files differ
diff --git a/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff2 b/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff2
new file mode 100644
index 0000000..b7023c0
--- /dev/null
+++ b/applications/drone-command/public/fonts/font_5099981_va3gbv2bkxo.woff2
Binary files differ
diff --git a/applications/drone-command/src/config/iconList.js b/applications/drone-command/src/config/iconList.js
index 38e50cb..65f400f 100644
--- a/applications/drone-command/src/config/iconList.js
+++ b/applications/drone-command/src/config/iconList.js
@@ -113,6 +113,13 @@
'iconfont icon-msnui-360',
'iconfont icon-iframe',
'iconfont icon-huanyingye',
+ 'iconfont_com icon-a-1',
+ 'iconfont_com icon-a-4',
+ 'iconfont_com icon-a-3',
+ 'iconfont_com icon-a-2',
+ 'iconfont_com icon-a-6',
+ 'iconfont_com icon-a-5',
+ 'iconfont_com icon-Frame',
],
},
];
diff --git a/applications/drone-command/src/styles/common.scss b/applications/drone-command/src/styles/common.scss
index ff83617..1cadaa7 100644
--- a/applications/drone-command/src/styles/common.scss
+++ b/applications/drone-command/src/styles/common.scss
@@ -9,6 +9,7 @@
@import './mapEdit.scss';
@import './common/cockpit.scss';
+@import './customFont.scss';
a {
text-decoration: none;
diff --git a/applications/drone-command/src/styles/customFont.scss b/applications/drone-command/src/styles/customFont.scss
new file mode 100644
index 0000000..522fc05
--- /dev/null
+++ b/applications/drone-command/src/styles/customFont.scss
@@ -0,0 +1,60 @@
+@font-face {
+ font-family: "iconfont_com";
+ /* Project id 5099981 */
+ src: url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.woff2?t=1769414361186') format('woff2'),
+ url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.woff?t=1769414361186') format('woff'),
+ url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.ttf?t=1769414361186') format('truetype'),
+ url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.svg?t=1769414361186#iconfont') format('svg');
+}
+
+.iconfont_com {
+ font-family: "iconfont_com" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-a-1:before {
+ content: "\e609";
+ }
+
+.icon-a-4:before {
+ content: "\e604";
+}
+
+.icon-a-3:before {
+ content: "\e605";
+}
+
+.icon-a-2:before {
+ content: "\e606";
+}
+
+.icon-a-6:before {
+ content: "\e607";
+}
+
+.icon-a-5:before {
+ content: "\e608";
+}
+
+.icon-Frame:before {
+ content: "\e602";
+}
+
+.icon-a-:before {
+ content: "\e601";
+}
+
+.icon-MenuIcon-biaozhunshujutuisong-heise:before {
+ content: "\e611";
+}
+
+.icon-MenuIcon-xuncharenwujiankong-heise:before {
+ content: "\e614";
+}
+
+.icon-MenuIcon-shebeirizhi-heise:before {
+ content: "\e615";
+}
\ No newline at end of file
diff --git a/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.ttf b/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.ttf
new file mode 100644
index 0000000..8d29e36
--- /dev/null
+++ b/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.ttf
Binary files differ
diff --git a/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff b/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff
new file mode 100644
index 0000000..042931c
--- /dev/null
+++ b/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff
Binary files differ
diff --git a/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff2 b/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff2
new file mode 100644
index 0000000..b7023c0
--- /dev/null
+++ b/applications/task-work-order/public/fonts/font_5099981_va3gbv2bkxo.woff2
Binary files differ
diff --git a/applications/task-work-order/src/assets/images/menuIcon/order-manage.png b/applications/task-work-order/src/assets/images/menuIcon/order-manage.png
new file mode 100644
index 0000000..6d85589
--- /dev/null
+++ b/applications/task-work-order/src/assets/images/menuIcon/order-manage.png
Binary files differ
diff --git a/applications/task-work-order/src/config/iconList.js b/applications/task-work-order/src/config/iconList.js
index 38e50cb..65f400f 100644
--- a/applications/task-work-order/src/config/iconList.js
+++ b/applications/task-work-order/src/config/iconList.js
@@ -113,6 +113,13 @@
'iconfont icon-msnui-360',
'iconfont icon-iframe',
'iconfont icon-huanyingye',
+ 'iconfont_com icon-a-1',
+ 'iconfont_com icon-a-4',
+ 'iconfont_com icon-a-3',
+ 'iconfont_com icon-a-2',
+ 'iconfont_com icon-a-6',
+ 'iconfont_com icon-a-5',
+ 'iconfont_com icon-Frame',
],
},
];
diff --git a/applications/task-work-order/src/styles/common.scss b/applications/task-work-order/src/styles/common.scss
index d2eee88..6e81a0b 100644
--- a/applications/task-work-order/src/styles/common.scss
+++ b/applications/task-work-order/src/styles/common.scss
@@ -9,6 +9,7 @@
@import './mapEdit.scss';
@import './common/cockpit.scss';
+@import './customFont.scss';
a {
text-decoration: none;
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 7adbaac..8b20c32 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -595,6 +595,10 @@
margin: 0 10px;
min-width: 28px;
+ span {
+ color: #0075FF;
+ }
+
&:first-child {
margin-left: 0;
}
diff --git a/applications/task-work-order/src/styles/customFont.scss b/applications/task-work-order/src/styles/customFont.scss
new file mode 100644
index 0000000..522fc05
--- /dev/null
+++ b/applications/task-work-order/src/styles/customFont.scss
@@ -0,0 +1,60 @@
+@font-face {
+ font-family: "iconfont_com";
+ /* Project id 5099981 */
+ src: url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.woff2?t=1769414361186') format('woff2'),
+ url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.woff?t=1769414361186') format('woff'),
+ url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.ttf?t=1769414361186') format('truetype'),
+ url('//at.alicdn.com/t/c/font_5099981_ysrl5v42ycd.svg?t=1769414361186#iconfont') format('svg');
+}
+
+.iconfont_com {
+ font-family: "iconfont_com" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-a-1:before {
+ content: "\e609";
+ }
+
+.icon-a-4:before {
+ content: "\e604";
+}
+
+.icon-a-3:before {
+ content: "\e605";
+}
+
+.icon-a-2:before {
+ content: "\e606";
+}
+
+.icon-a-6:before {
+ content: "\e607";
+}
+
+.icon-a-5:before {
+ content: "\e608";
+}
+
+.icon-Frame:before {
+ content: "\e602";
+}
+
+.icon-a-:before {
+ content: "\e601";
+}
+
+.icon-MenuIcon-biaozhunshujutuisong-heise:before {
+ content: "\e611";
+}
+
+.icon-MenuIcon-xuncharenwujiankong-heise:before {
+ content: "\e614";
+}
+
+.icon-MenuIcon-shebeirizhi-heise:before {
+ content: "\e615";
+}
\ No newline at end of file
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index b093e22..f04786f 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -60,7 +60,7 @@
<div class="label">关联工单</div>
<div class="val">{{ getWorkOrderName(formData.workOrderId) }}</div>
</el-col>
- <el-col :span="24">
+ <el-col :span="12">
<div class="label">巡查任务描述</div>
<div class="val">{{ formData.taskDesc }}</div>
</el-col>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 56db4dd..ab9687d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -206,7 +206,7 @@
<el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)" color="#F2F3F5">
{{ gdStatus === '50' ? '结算' : '申请取消' }}
</el-button>
- <el-button @click="requestModification" v-if="['20', '25'].includes(gdStatus)" color="#4C34FF">
+ <el-button color="#4C34FF" @click="requestModification" v-if="['20', '25'].includes(gdStatus)">
申请修改
</el-button>
</template>
--
Gitblit v1.9.3