From e23360d3fed6c392933a95529e4c2e33b7005af8 Mon Sep 17 00:00:00 2001
From: rjg <746338628@qq.com>
Date: Mon, 21 Apr 2025 16:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature_0.1_04'
---
public/img/bg/index_logo.png | 0
/dev/null | 0
src/views/tickets/orderLog.vue | 6 +++---
public/img/bg/mainLogo.png | 0
index.html | 2 +-
src/page/index/logo.vue | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/index.html b/index.html
index 6de0d9e..2c07141 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="format-detection" content="telephone=no" />
- <link rel="icon" href="/favicon.png" />
+ <link rel="icon" href="/img/bg/index_logo.png" />
<link rel="stylesheet" href="/iconfont/index.css" />
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
diff --git a/public/img/bg/index_logo.png b/public/img/bg/index_logo.png
new file mode 100644
index 0000000..43577c7
--- /dev/null
+++ b/public/img/bg/index_logo.png
Binary files differ
diff --git a/public/img/bg/logo.png b/public/img/bg/logo.png
deleted file mode 100644
index b3e40cc..0000000
--- a/public/img/bg/logo.png
+++ /dev/null
Binary files differ
diff --git a/public/img/bg/mainLogo.png b/public/img/bg/mainLogo.png
new file mode 100644
index 0000000..0db1ec8
--- /dev/null
+++ b/public/img/bg/mainLogo.png
Binary files differ
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index e181c40..db62d5d 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -8,7 +8,7 @@
<transition-group name="fade">
<template v-if="getScreen(!isCollapse)">
<div style="display: flex; align-items: left; gap: 5px; margin: 8px 8px 10px 20px;">
- <img class="img" src="/img/logo.png" alt="" width="50%" height="50%" />
+ <img class="img" src="/img/bg/mainLogo.png" alt="" width="50%" height="50%" />
<!-- <span style="font-size: 20px;" key="1">
{{ this.parentDeptInfo.sysName }}
</span> -->
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index f46fd3d..8590d70 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -197,7 +197,7 @@
</el-dialog>
<!-- 工单详情对话框 -->
- <el-dialog v-model="detailVisible" title="工单详情" width="70%" :close-on-click-modal="false" @close="resetForm" >
+ <el-dialog v-model="detailVisible" title="编辑工单" width="70%" :close-on-click-modal="false" @close="resetForm" >
<el-form :model="form" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
@@ -287,8 +287,8 @@
<el-button type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@click="submitForm(1)">发布</el-button>
- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
- @click="submitForm(0)">保存</el-button>
+ <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
+ @click="submitForm(0)">保存</el-button> -->
<el-button type="primary" v-if="form.status == 1 && userInfo.user_id != form.create_user"
@click="orderLogPass(form.id)">通过</el-button>
--
Gitblit v1.9.3