suzhou-jichuang-lanhai
/
jin_ji_hu
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

智能提醒加上提醒方法、首页展示也加上

Browse Source
master
吕天方 5 months ago
parent 3fd6990bf6
commit e704a28e46
7 changed files with 87 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -7,9 +7,9 @@ ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境 # 金鸡湖现代服务业品牌管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.0.117:9031' # 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' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "1.0.202408131732", "version": "1.0.202408160938",
"description": "金鸡湖现代服务业品牌管理系统", "description": "金鸡湖现代服务业品牌管理系统",
"author": "若依", "author": "若依",
"license": "MIT", "license": "MIT",

20
src/assets/styles/public.scss
Unescape View File

@ -1416,6 +1416,7 @@
.warn-main-left { .warn-main-left {
display: flex; display: flex;
flex: 1;
.warn-main-img { .warn-main-img {
padding-top: 3px; padding-top: 3px;
@ -1443,7 +1444,11 @@
color: #333333; color: #333333;
margin: 10px 0; margin: 10px 0;
} }
.tixing-duanxin {
display: flex;
align-items: center;
justify-content: space-between;
}
.content-time { .content-time {
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
@ -1481,7 +1486,7 @@
} }
.warn-main-right-status { .warn-main-right-status {
padding: 5px 15px; padding: 0px 15px;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
color: #4EB997; color: #4EB997;
@ -2681,6 +2686,7 @@
justify-content: space-between; justify-content: space-between;
.warn-main-left { .warn-main-left {
display: flex; display: flex;
flex: 1;
.warn-main-img { .warn-main-img {
padding-top: 3px; padding-top: 3px;
img { img {
@ -2690,6 +2696,7 @@
} }
} }
.warn-main-content { .warn-main-content {
flex: 1;
.content-title { .content-title {
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
@ -2701,11 +2708,18 @@
color: #333333; color: #333333;
margin: 10px 0; margin: 10px 0;
} }
.tixing-duanxin {
display: flex;
align-items: center;
}
.content-time { .content-time {
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
color: #737373; color: #737373;
} }
.content-time-two {
margin-left: 10px;
}
} }
} }
.different-left { .different-left {
@ -2734,7 +2748,7 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
.warn-main-right-status { .warn-main-right-status {
padding: 5px 15px; padding: 0px 15px;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
color: #4EB997; color: #4EB997;

24
src/views/home/index.vue
Unescape View File

@ -133,7 +133,11 @@
<div class="warn-main-content"> <div class="warn-main-content">
<div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后填报结束】</div> <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后填报结束】</div>
<div class="content-middle">{{ item.alertContent }}</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> </div>
<div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2"> <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="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-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-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> </div>
<div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId"> <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
@ -149,14 +157,22 @@
<div class="warn-main-content"> <div class="warn-main-content">
<div class="content-title">【{{ item.declarationName }}】</div> <div class="content-title">【{{ item.declarationName }}】</div>
<div class="content-middle">{{ item.alertContent }}</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> </div>
<div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId"> <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-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
<div class="warn-main-content"> <div class="warn-main-content">
<div class="content-title">{{ item.alertContent }}</div> <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> </div>
<div class="warn-main-right"> <div class="warn-main-right">

12
src/views/intelligentReminder/index.vue
Unescape View File

@ -111,6 +111,14 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </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"> <el-col :span="24" v-if="addFrom.alertManner == 1">
<!-- :rules="form.isTime == 0 ? rules.reportTime : [ <!-- :rules="form.isTime == 0 ? rules.reportTime : [
{required: false, message: '请选择填报时间', trigger: 'change' }]" --> {required: false, message: '请选择填报时间', trigger: 'change' }]" -->
@ -215,6 +223,7 @@ export default {
addFrom: { addFrom: {
rulesName:"", rulesName:"",
alertRecipients: 2, alertRecipients: 2,
function: 1,
alertManner: 1, alertManner: 1,
alertTime:"", alertTime:"",
alertContent:"", alertContent:"",
@ -231,6 +240,9 @@ export default {
alertManner:[ alertManner:[
{ required: true, message: '请选择提醒方式', trigger: 'change' }, { required: true, message: '请选择提醒方式', trigger: 'change' },
], ],
function: [
{ required: true, message: '请选择提醒方法', trigger: 'change' },
],
alertTime:[ alertTime:[
{ required: true, message: '请选择日期', trigger: 'change' }, { required: true, message: '请选择日期', trigger: 'change' },
{validator: validateTime, trigger: 'blur'}, {validator: validateTime, trigger: 'blur'},

12
src/views/project/projectInfo/components/tabFive/index.vue
Unescape View File

@ -66,6 +66,14 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </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-col :span="24">
<el-form-item label="提醒时间：" prop="alertTime" class="importFormItem"> <el-form-item label="提醒时间：" prop="alertTime" class="importFormItem">
<el-date-picker <el-date-picker
@ -115,6 +123,7 @@ export default {
rulesName: "", rulesName: "",
alertRecipients: 2, alertRecipients: 2,
alertManner: 1, alertManner: 1,
function: 1,
alertTime: "", alertTime: "",
alertContent: "", alertContent: "",
}, },
@ -128,6 +137,9 @@ export default {
alertManner:[ alertManner:[
{ required: true, message: '请选择提醒方式', trigger: 'change' }, { required: true, message: '请选择提醒方式', trigger: 'change' },
], ],
function:[
{ required: true, message: '请选择提醒方法', trigger: 'change' },
],
alertTime:[ alertTime:[
{ required: true, message: '请选择日期', trigger: 'change' }, { required: true, message: '请选择日期', trigger: 'change' },
], ],

28
src/views/workbench/index.vue
Unescape View File

@ -76,7 +76,12 @@
<div class="warn-main-content"> <div class="warn-main-content">
<div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后建设完成】</div> <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后建设完成】</div>
<div class="content-middle">{{ item.alertContent }}</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> </div>
<div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2"> <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" 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-title-type"><dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
<div class="content-middle">{{ item.alertContent }}</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> </div>
<div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId"> <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
@ -93,14 +103,22 @@
<div class="warn-main-content"> <div class="warn-main-content">
<div class="content-title">【{{ item.declarationName }}】</div> <div class="content-title">【{{ item.declarationName }}】</div>
<div class="content-middle">{{ item.alertContent }}</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> </div>
<div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId"> <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-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
<div class="warn-main-content"> <div class="warn-main-content">
<div class="content-title">{{ item.alertContent }}</div> <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> </div>
<div class="warn-main-right"> <div class="warn-main-right">
@ -279,7 +297,7 @@
</div> </div>
<span class="industry-condition-statistics">【统计数据截至：2024-01】</span> <span class="industry-condition-statistics">【统计数据截至：2024-01】</span>
</div> </div>
<!-- <div class="rightBtn" @click="industryBtn">查看更多数据>></div> --> <div class="rightBtn" @click="industryBtn">查看更多数据>></div>
</div> </div>
<div class="headline-two-main"> <div class="headline-two-main">
<TableFive></TableFive> <TableFive></TableFive>

Write Preview
Loading…
Cancel
Save