From e704a28e469374dc9b42a2f0f79a22848bf5e5f5 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Fri, 16 Aug 2024 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=8F=90=E9=86=92=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E6=8F=90=E9=86=92=E6=96=B9=E6=B3=95=E3=80=81=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=B1=95=E7=A4=BA=E4=B9=9F=E5=8A=A0=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +--
 package.json                                  |  2 +-
 src/assets/styles/public.scss                 | 20 +++++++++++--
 src/views/home/index.vue                      | 24 +++++++++++++---
 src/views/intelligentReminder/index.vue       | 12 ++++++++
 .../projectInfo/components/tabFive/index.vue  | 12 ++++++++
 src/views/workbench/index.vue                 | 28 +++++++++++++++----
 7 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index fa6f4dc..897c93a 100644
--- a/.env.development
+++ b/.env.development
@@ -7,9 +7,9 @@ ENV = 'development'
 # 金鸡湖现代服务业品牌管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.0.117:9031'
 # 测试环境数据库
-# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
-VUE_APP_BASE_API = 'http://39.101.188.84:9031'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9031'
 # 正式环境数据库
 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
 
diff --git a/package.json b/package.json
index 14ce592..dc1fa23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408131732",
+  "version": "1.0.202408160938",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 929c4b9..4fdd935 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1416,6 +1416,7 @@
 
               .warn-main-left {
                 display: flex;
+                flex: 1;
 
                 .warn-main-img {
                   padding-top: 3px;
@@ -1443,7 +1444,11 @@
                     color: #333333;
                     margin: 10px 0;
                   }
-
+                  .tixing-duanxin {
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                  }
                   .content-time {
                     font-weight: 500;
                     font-size: 14px;
@@ -1481,7 +1486,7 @@
                 }
 
                 .warn-main-right-status {
-                  padding: 5px 15px;
+                  padding: 0px 15px;
                   font-weight: 500;
                   font-size: 14px;
                   color: #4EB997;
@@ -2681,6 +2686,7 @@
               justify-content: space-between;
               .warn-main-left {
                 display: flex;
+                flex: 1;
                 .warn-main-img {
                   padding-top: 3px;
                   img {
@@ -2690,6 +2696,7 @@
                   }
                 }
                 .warn-main-content {
+                   flex: 1;
                   .content-title {
                     font-weight: bold;
                     font-size: 15px;
@@ -2701,11 +2708,18 @@
                     color: #333333;
                     margin: 10px 0;
                   }
+                  .tixing-duanxin {
+                    display: flex;
+                    align-items: center;
+                  }
                   .content-time {
                     font-weight: 500;
                     font-size: 14px;
                     color: #737373;
                   }
+                  .content-time-two {
+                    margin-left: 10px;
+                  }
                 }
               }
               .different-left {
@@ -2734,7 +2748,7 @@
                   margin-bottom: 10px;
                 }
                 .warn-main-right-status {
-                  padding: 5px 15px;
+                  padding: 0px 15px;
                   font-weight: 500;
                   font-size: 14px;
                   color: #4EB997;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index caa8f93..b200785 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -133,7 +133,11 @@
                       <div class="warn-main-content">
                         <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后填报结束】</div>
                         <div class="content-middle">{{ item.alertContent }}</div>
-                        <div class="content-time">{{ item.alertTime }}</div>
+                        <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                        <div class="tixing-duanxin">
+                          <div class="content-time">{{ item.alertTime }}</div>
+                          <div class="content-time content-time-two">已发送短信、已发送邮件</div>
+                        </div>
                       </div>
                     </div>
                     <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
@@ -141,7 +145,11 @@
                       <div class="warn-main-content">
                         <div class="content-title" style="display: flex;">【{{ item.qymc }}】<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
                         <div class="content-middle">{{ item.alertContent }}</div>
-                        <div class="content-time">{{ item.alertTime }}</div>
+                        <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                        <div class="tixing-duanxin">
+                          <div class="content-time">{{ item.alertTime }}</div>
+                          <div class="content-time content-time-two">已发送短信、已发送邮件</div>
+                        </div>
                       </div>
                     </div>
                     <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
@@ -149,14 +157,22 @@
                       <div class="warn-main-content">
                         <div class="content-title">【{{ item.declarationName }}】</div>
                         <div class="content-middle">{{ item.alertContent }}</div>
-                        <div class="content-time">{{ item.alertTime }}</div>
+                        <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                        <div class="tixing-duanxin">
+                          <div class="content-time">{{ item.alertTime }}</div>
+                          <div class="content-time content-time-two">已发送短信、已发送邮件</div>
+                        </div>
                       </div>
                     </div>
                     <div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
                       <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
                       <div class="warn-main-content">
                         <div class="content-title">{{ item.alertContent }}</div>
-                        <div class="content-time">{{ item.alertTime }}</div>
+                        <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                        <div class="tixing-duanxin">
+                          <div class="content-time">{{ item.alertTime }}</div>
+                          <div class="content-time content-time-two">已发送短信、已发送邮件</div>
+                        </div>
                       </div>
                     </div>
                     <div class="warn-main-right">
diff --git a/src/views/intelligentReminder/index.vue b/src/views/intelligentReminder/index.vue
index 443f7f3..5976db6 100644
--- a/src/views/intelligentReminder/index.vue
+++ b/src/views/intelligentReminder/index.vue
@@ -111,6 +111,14 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="提醒方法：" class="importFormItem" prop="function">
+              <el-radio-group v-model="addFrom.function" disabled>
+                <el-radio :label="1">短信提醒</el-radio>
+                <el-radio :label="2">邮件提醒</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="addFrom.alertManner == 1">
             <!-- :rules="form.isTime == 0 ? rules.reportTime : [
 					      {required: false, message: '请选择填报时间', trigger: 'change' }]" -->
@@ -215,6 +223,7 @@ export default {
       addFrom: {
         rulesName:"",
         alertRecipients: 2,
+        function: 1,
         alertManner: 1,
         alertTime:"",
         alertContent:"",
@@ -231,6 +240,9 @@ export default {
         alertManner:[
           { required: true, message: '请选择提醒方式', trigger: 'change' },
         ],
+        function: [
+          { required: true, message: '请选择提醒方法', trigger: 'change' },
+        ],
         alertTime:[
           { required: true, message: '请选择日期', trigger: 'change' },
           {validator: validateTime, trigger: 'blur'},
diff --git a/src/views/project/projectInfo/components/tabFive/index.vue b/src/views/project/projectInfo/components/tabFive/index.vue
index 9d47d86..fcca6aa 100644
--- a/src/views/project/projectInfo/components/tabFive/index.vue
+++ b/src/views/project/projectInfo/components/tabFive/index.vue
@@ -66,6 +66,14 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒方法：" class="importFormItem" prop="function">
+                <el-radio-group v-model="remindData.function" disabled>
+                  <el-radio :label="1">短信提醒</el-radio>
+                  <el-radio :label="2">邮件提醒</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="提醒时间：" prop="alertTime" class="importFormItem">
                 <el-date-picker
@@ -115,6 +123,7 @@ export default {
         rulesName: "",
         alertRecipients: 2,
         alertManner: 1,
+        function: 1,
         alertTime: "",
         alertContent: "",
       },
@@ -128,6 +137,9 @@ export default {
         alertManner:[
           { required: true, message: '请选择提醒方式', trigger: 'change' },
         ],
+        function:[
+          { required: true, message: '请选择提醒方法', trigger: 'change' },
+        ],
         alertTime:[
           { required: true, message: '请选择日期', trigger: 'change' },
         ],
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index c7f6c60..e9fa910 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -76,7 +76,12 @@
                         <div class="warn-main-content">
                           <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后建设完成】</div>
                           <div class="content-middle">{{ item.alertContent }}</div>
-                          <div class="content-time">{{ item.alertTime }}</div>
+                          <!-- <div class="content-middle">已发送短信、已发送邮件</div> -->
+                          <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                          <div class="tixing-duanxin">
+                            <div class="content-time">{{ item.alertTime }}</div>
+                            <div class="content-time">已发送短信、已发送邮件</div>
+                          </div>
                         </div>
                       </div>
                       <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
@@ -85,7 +90,12 @@
                           <div class="content-title" style="display: flex;">【{{ item.qymc }}】</div>
                           <div class="content-title-type"><dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
                           <div class="content-middle">{{ item.alertContent }}</div>
-                          <div class="content-time">{{ item.alertTime }}</div>
+                          <!-- <div class="content-middle">已发送短信、已发送邮件</div> -->
+                          <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                          <div class="tixing-duanxin">
+                            <div class="content-time">{{ item.alertTime }}</div>
+                            <div class="content-time">已发送短信、已发送邮件</div>
+                          </div>
                         </div>
                       </div>
                       <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
@@ -93,14 +103,22 @@
                         <div class="warn-main-content">
                           <div class="content-title">【{{ item.declarationName }}】</div>
                           <div class="content-middle">{{ item.alertContent }}</div>
-                          <div class="content-time">{{ item.alertTime }}</div>
+                          <div class="tixing-duanxin">
+                            <div class="content-time">{{ item.alertTime }}</div>
+                            <div class="content-time">已发送短信、已发送邮件</div>
+                          </div>
                         </div>
                       </div>
                       <div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
                         <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
                         <div class="warn-main-content">
                           <div class="content-title">{{ item.alertContent }}</div>
-                          <div class="content-time">{{ item.alertTime }}</div>
+                          <!-- <div class="content-middle">已发送短信、已发送邮件</div> -->
+                          <!-- <div class="content-time">{{ item.alertTime }}</div> -->
+                          <div class="tixing-duanxin">
+                            <div class="content-time">{{ item.alertTime }}</div>
+                            <div class="content-time">已发送短信、已发送邮件</div>
+                          </div>
                         </div>
                       </div>
                       <div class="warn-main-right">
@@ -279,7 +297,7 @@
                   </div>
                   <span class="industry-condition-statistics">【统计数据截至：2024-01】</span>
                 </div>
-                <!-- <div class="rightBtn" @click="industryBtn">查看更多数据>></div> -->
+                <div class="rightBtn" @click="industryBtn">查看更多数据>></div>
               </div>
               <div class="headline-two-main">
                 <TableFive></TableFive>