From a81849daddb3af142ed76d37d2f7237b8f866fee Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Tue, 9 Jul 2024 18:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E7=AB=99=E7=82=B9=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=20=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD=20?=
 =?UTF-8?q?=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0]=EF=BC=9Aruning=E5=AD=97=E6=AE=B5=E6=9C=89?=
 =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E5=9C=A8=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=20=E4=B9=9F=E5=8F=AF=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=E5=85=88?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=8F=90=E4=BA=A4=20=20=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9C=89=E5=9C=A8=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=80=89=E6=8B=A9=E6=8F=90=E7=A4=BA=E6=A1=86?=
 =?UTF-8?q?=20=E5=8F=AF=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=96=B0=20=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4=20=E8=B7=B3=E8=BF=87runing=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A3=80=E6=9F=A5=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A?=
 =?UTF-8?q?=20=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 src/store/index.js                            | 18 ++++++++++++++++++
 src/views/layout/components/main/site/add.vue |  7 ++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 990739b..1a0c7b3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -450,6 +450,24 @@ const store = new Vuex.Store({
       if (res.data.status === 1) {
         await dispatch('fetchSiteList')// 刷新站点列表
         Message.success(res.data.msg)
+      } else if (res.data.status === -1) { // -1状态 服务器判断runing字段 正在有飞机正在执行
+        MessageBox.confirm(res.data.msg, '提示', {
+          confirmButtonText: '强制更新',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          params.append('isCoerce', 1)
+          api.post('saveSite', params).then(res => {
+            if (res.data.status === 1) {
+              Message.success(res.data.msg)
+              dispatch('fetchSiteList')// 刷新站点列表
+            } else {
+              Message.error(res.data.msg)
+            }
+          })
+        }).catch(() => {
+          Message.info('取消操作')
+        })
       } else {
         Message.error(res.data.msg)
       }
diff --git a/src/views/layout/components/main/site/add.vue b/src/views/layout/components/main/site/add.vue
index 7dcf00d..76572f1 100644
--- a/src/views/layout/components/main/site/add.vue
+++ b/src/views/layout/components/main/site/add.vue
@@ -25,10 +25,8 @@
                 <el-upload class="avatar-uploader" drag name="file" :action="action" :headers="myheader"
                   :show-file-list="false" :on-success="handleUpSuccess" :on-error="handleUpErr"
                   :before-upload="beforeAvatarUpload">
-                  <img v-if="form.upFile != ''"
-                    :src="$store.state.settings.tempPath + form.upFile" class="avatar" />
-                  <img v-else-if="defaultQr != '' && form.upFile == ''"
-                    :src="defaultQr" class="avatar" />
+                  <img v-if="form.upFile != ''" :src="$store.state.settings.tempPath + form.upFile" class="avatar" />
+                  <img v-else-if="defaultQr != '' && form.upFile == ''" :src="defaultQr" class="avatar" />
                   <template v-else>
                     <i class="el-icon-plus f-s-30 m-t-70 seatFontColor"></i>
                     <div class="el-upload__text"><em>空为默认LOGO</em></div>
@@ -216,7 +214,6 @@ export default {
       this.initPage()// 初始化页面
     },
     routeList () {
-      console.log(this.routeData)
     }
   },
   created () {