2022.9.13 重复任务改版

src/api/axios.js

@@ -7,8 +7,8 @@ import {
 } from './auth.js'
 import qs from 'qs'
 const service = axios.create({
-	baseURL: process.env.VUE_APP_BASE_API, 
-	// baseURL:'https://ding.insys.g107.com/',
+	// baseURL: process.env.VUE_APP_BASE_API, 
+	baseURL:'https://app55493.eapps.dingtalkcloud.com/',
 	timeout: 20000,
 	headers: {
 		'Content-Type': 'application/x-www-form-urlencoded',

src/assets/css/iconfont.css

@@ -14,7 +14,7 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 .titleIcon{
-	color: #99A9BF !important;
+	color: #303133 !important;
 }
 
 .icon-shezhi_jichushezhi:before {

src/assets/css/reset.css

@@ -29,206 +29,239 @@ table { border-collapse:collapse; border-spacing:0; }
   fill: currentColor;
   overflow: hidden;
 }
-.boxMinHeight{
-  min-height: calc(100vh - 110px);
+.boxMinHeight {
+	min-height: calc(100vh - 110px);
 }
 
-.el-form-item__content{
-	line-height:36px !important;
+.el-form-item__content {
+	line-height: 36px !important;
 }
 
 /* 盒子模型 */
 .flex-box {
-  display: -webkit-box;
-  display: -moz-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
 }
 
 /*盒子模型，竖向自适应,垂直排列  */
 .flex-box-v {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-flex-flow: column;
-  flex-flow: column !important;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-webkit-flex-flow: column;
+	flex-flow: column !important;
 }
+
 /*flex-box与 flex-v-ce结合*/
 .flex-box-ce {
-  display: -webkit-box;
-  display: -moz-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	align-items: center;
+	-webkit-align-items: center;
+	-webkit-box-align: center;
 }
 
 /* 水平等列排版（容器左右没缝隙，子元素左右两边自适应） */
 .flex-d-center {
-  justify-content: space-between;
-  -webkit-justify-content: space-between;
+	justify-content: space-between;
+	-webkit-justify-content: space-between;
 }
 
 /* 水平等列排版（子元素两边有缝隙自己适应） */
 .flex-dv-center {
-  justify-content: space-around;
-  -webkit-justify-content: space-around;
+	justify-content: space-around;
+	-webkit-justify-content: space-around;
 }
 
 
 /*水平，垂直居中  */
 .flex-center-center {
-  justify-content: center;
-  -webkit-justify-content: center;
-  -moz-justify-content: center;
-  align-items: center;
-  -webkit-align-items: center;
-  -webkit-box-pack: center;
-  -webkit-box-align: center;
-  -moz-align-items: center;
-  -moz-box-pack: center;
-  -moz-box-align: center;
+	justify-content: center;
+	-webkit-justify-content: center;
+	-moz-justify-content: center;
+	align-items: center;
+	-webkit-align-items: center;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+	-moz-align-items: center;
+	-moz-box-pack: center;
+	-moz-box-align: center;
 }
 
 /*对view中的子元素进行居中，并且位于容器的中间位置 水平居中 */
 .flex-v-zhu,
 .flex-h-zhu {
-  justify-content: center;
-  -webkit-justify-content: center;
-  -webkit-box-pack: center;
+	justify-content: center;
+	-webkit-justify-content: center;
+	-webkit-box-pack: center;
 }
 
 /*对view中的子元素进行居中，并且位于容器的中间位置 垂直居中  */
 .flex-v-ce,
 .flex-h-ce {
-  align-items: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
+	align-items: center;
+	-webkit-align-items: center;
+	-webkit-box-align: center;
 }
 
 /*让所有弹性盒模型对象的子元素都有相同的长度，且忽略它们内部的内容：  */
 .flex-1 {
-  -webkit-box-flex: 1;
-  -moz-box-flex: 1;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
+	-webkit-box-flex: 1;
+	-moz-box-flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	flex: 1;
 }
 
 .flex-2 {
-  -webkit-box-flex: 2;
-  box-flex: 2;
-  -moz-box-flex: 2;
-  -webkit-flex: 2;
-  -ms-flex: 2;
-  flex: 2;
+	-webkit-box-flex: 2;
+	box-flex: 2;
+	-moz-box-flex: 2;
+	-webkit-flex: 2;
+	-ms-flex: 2;
+	flex: 2;
 }
 
 .flex-3 {
-  -webkit-box-flex: 3;
-  box-flex: 3;
-  -moz-box-flex: 3;
-  -webkit-flex: 3;
-  -ms-flex: 3;
-  flex: 3;
+	-webkit-box-flex: 3;
+	box-flex: 3;
+	-moz-box-flex: 3;
+	-webkit-flex: 3;
+	-ms-flex: 3;
+	flex: 3;
 }
 
 .flex-4 {
-  -webkit-box-flex: 4;
-  box-flex: 4;
-  -moz-box-flex: 4;
-  -webkit-flex: 4;
-  -ms-flex: 4;
-  flex: 4;
+	-webkit-box-flex: 4;
+	box-flex: 4;
+	-moz-box-flex: 4;
+	-webkit-flex: 4;
+	-ms-flex: 4;
+	flex: 4;
 }
 
 
 .flex-5 {
-  -webkit-box-flex: 5;
-  box-flex: 5;
-  -moz-box-flex: 5;
-  -webkit-flex: 5;
-  -ms-flex: 5;
-  flex: 5;
+	-webkit-box-flex: 5;
+	box-flex: 5;
+	-moz-box-flex: 5;
+	-webkit-flex: 5;
+	-ms-flex: 5;
+	flex: 5;
 }
 
 /* 水平反方向 */
 .flex-direction-row-reverse {
-  flex-direction: row-reverse;
-  -webkit-flex-direction: row-reverse;
+	flex-direction: row-reverse;
+	-webkit-flex-direction: row-reverse;
 }
 
 /*超出部分用....表示的公用样式  */
 .font-flex-word {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-break: break-all;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.clamp3 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-break: break-all;
+	display: -webkit-box;
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
 }
 
 /* 内容超出部分自动换行 */
 .flex-d-wrap {
-  flex-wrap: wrap;
+	flex-wrap: wrap;
 }
 
 /* 内容超出部分不换行 */
 .flex-no-wrap {
-  flex-wrap: nowrap;
+	flex-wrap: nowrap;
 }
 
 /* 从右边开始排列 */
 .flex-box-end {
-  display: -webkit-box;
-  display: -moz-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: flex-end;
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: flex-end;
 }
 
 /* 字体颜色 */
 .blue {
-	color: #26A2FF!important;
+	color: #26A2FF !important;
 }
 
 .red {
-	color: #F56C6C!important;
+	color: #F56C6C !important;
 }
 
 .yellow {
-	color: #E6A23C!important;
+	color: #FFC910 !important;
+}
+
+.orange {
+	color: #FF9600 !important;
 }
 
 .green {
-	color: #67C23A!important;
+	color: #67C23A !important;
 }
 
-.fontColorB {
-	color: #777777 !important;
+.cyan {
+	color: #00C4CB !important;
+}
+
+.black {
+	color: #141c28 !important;
 }
-.fontColorZ {
-	color: #303133!important;
+
+.fontColorA {
+	color: #303133 !important;
 }
 
-.fontColorF {
+.fontColorB {
 	color: #606266 !important;
 }
 
-.fontColorT {
-	color: #C0C4CC!important;
+.fontColorC {
+	color: #89919F !important;
+}
+
+.fontColorD {
+	color: #BFC7D5 !important;
 }
 
 /* 整体布局样式 */
-.all{
+.all {
 	background-color: #fff;
 	border-radius: 5px;
-	min-height:calc(100vh - 120px);
+	min-height: calc(100vh - 120px);
 	min-width: 800px;
 	position: relative;
 }
+
 .terr-left {
 	width: 200px;
 	box-sizing: border-box;
@@ -236,19 +269,23 @@ table { border-collapse:collapse; border-spacing:0; }
 	max-height: 700px;
 	overflow: auto;
 }
+
 .terr-left::-webkit-scrollbar {
 	width: 3px;
 	height: 3px;
 	background-color: #fff;
 }
+
 .terr-left::-webkit-scrollbar-thumb {
 	background-color: #D9D9D9;
 }
-.terr-right{
+
+.terr-right {
 	padding: 20px;
 	min-width: 600px;
 	box-sizing: border-box;
 }
+
 .border-right:after {
 	content: ' ';
 	position: absolute;
@@ -258,29 +295,35 @@ table { border-collapse:collapse; border-spacing:0; }
 	width: 1px;
 	background: #ebeef5;
 }
+
 .border-right {
 	/* position: relative; */
 }
-.padding-20{
+
+.padding-20 {
 	padding: 20px;
 }
-.margin-bottom{
+
+.margin-bottom {
 	margin-bottom: 20px;
 }
+
 .diy-tip {
 	margin-bottom: 10px !important;
 	background: #f0f9eb !important;
 	color: #67c23a !important;
 	border: 1px solid #67c23a !important;
-	padding:16px !important;
+	padding: 16px !important;
 	min-width: 800px;
 	border-radius: 4px;
 }
-.diy-tip p{
+
+.diy-tip p {
 	color: #67c23a !important;
 }
+
 /* 分页样式 */
-.pagination{
+.pagination {
 	padding: 20px 0;
 	text-align: center;
 }
@@ -288,49 +331,53 @@ table { border-collapse:collapse; border-spacing:0; }
 
 /* EL UI 重置 */
 
-.notifyBox{
+.notifyBox {
 	width: auto !important;
 }
 
 /* 级联选择器长度限制样式 */
 .el-cascader-menu .el-cascader-menu__wrap .el-scrollbar__view li.el-cascader-node {
-  height: auto;
-  max-width: 500px;
+	height: auto;
+	max-width: 500px;
 }
+
 .el-cascader-menu .el-cascader-menu__wrap .el-scrollbar__view li.el-cascader-node .el-cascader-node__label {
-  white-space: initial;
-  overflow: initial;
-  text-overflow: initial;
+	white-space: initial;
+	overflow: initial;
+	text-overflow: initial;
 }
+
 /* // 滚动条样式 */
-.scroll-bar{
-  scroll-behavior: smooth
+.scroll-bar {
+	scroll-behavior: smooth
 }
+
 .scroll-bar::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
+	width: 6px;
+	height: 6px;
 }
 
 /*外层轨道。可以用display:none让其不显示，也可以添加背景图片，颜色改变显示效果*/
 .scroll-bar::-webkit-scrollbar-track {
-  width: 6px;
-  background-color: #fff0;
-  -webkit-border-radius: 2em;
-  -moz-border-radius: 2em;
-  border-radius: 2em;
+	width: 6px;
+	background-color: #fff0;
+	-webkit-border-radius: 2em;
+	-moz-border-radius: 2em;
+	border-radius: 2em;
 
 }
 
 /*滚动条的设置*/
 .scroll-bar::-webkit-scrollbar-thumb {
-  background-color: #fff0;
-  background-clip: padding-box;
-  -webkit-border-radius: 2em;
-  -moz-border-radius: 2em;
-  border-radius: 2em;
+	background-color: #fff0;
+	background-clip: padding-box;
+	-webkit-border-radius: 2em;
+	-moz-border-radius: 2em;
+	border-radius: 2em;
 }
+
 /*滚动条移上去的背景*/
 .scroll-bar:hover::-webkit-scrollbar-thumb {
-  background-color: rgba(144, 147, 153, 0.3);
-  height: 20px;
-}
+	background-color: rgba(144, 147, 153, 0.3);
+	height: 20px;
+}

src/components/EmployeeSelector.vue

@@ -32,14 +32,14 @@
 									</div>
 								</div>
 							</div>
-							<div v-else class="fontColorF" style="text-align: center;margin-top: 50px;">暂无可选人员</div>
+							<div v-else class="fontColorC" style="text-align: center;margin-top: 50px;">暂无可选人员</div>
 						</div>
 					</el-scrollbar>
 				</el-col>
 				<el-col :xs="2" :sm="2" :md="2" :lg="2" :xl="2" class="col-line"><span style="opacity: 0;">空</span></el-col>
 				<el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11" class="scroller-box">
 					<div class="option-box flex-box flex-v-ce">
-						<div class="fontColorF flex-1" v-show="multi">已选择{{ employee_selected_list.length }}个员工</div>
+						<div class="fontColorC flex-1" v-show="multi">已选择{{ employee_selected_list.length }}个员工</div>
 						<el-button type="type" @click="clear_data()">清空</el-button>
 					</div>
 					<el-scrollbar wrap-class="column-wrapper scrollable-items-container" :native="false" style="height: 390px;">

src/components/Review.vue

@@ -25,12 +25,12 @@
                     <span class="green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
                   </strong>
                 </div>
-                <span class="fontColorF" style="font-size:12px;">{{$moment(returnTime(item.time)).format('YYYY-MM-DD HH:mm:ss')}}</span>
+                <span class="fontColorC" style="font-size:12px;">{{$moment(returnTime(item.time)).format('YYYY-MM-DD HH:mm:ss')}}</span>
               </div>
             </div>
           </template>
           <template slot="description" style="">
-			<div class="yellow" >{{item.action_des}}</div>
+			<div class="orange" >{{item.action_des}}</div>
             <div class="fontColorB" style="margin: 5px 0;">{{ item.comment }}</div>
           </template>
         </el-step>

src/components/Steps.vue

@@ -26,7 +26,7 @@
                     <span class="green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
                   </strong>
                 </div>
-                <span class="fontColorF" style="font-size:12px;">{{ item.time }}</span>
+                <span class="fontColorC" style="font-size:12px;">{{ item.time }}</span>
               </div>
             </div>
           </template>

src/components/UserImage.vue

@@ -85,7 +85,7 @@
 <style scoped>
   .user_name_div{
     border-radius: 50%;
-    background: #238dfa;
+    background: #409eff;
     text-align: center;
     color: #fff;
     margin: 0 auto;

src/components/applicationIntegrationPopup.vue

@@ -167,7 +167,7 @@
 			<div class="" v-if="!isShowError">
 				<div style="text-align: center;margin-bottom: 10px;" class="red" v-if="isShowError2">{{errorMsg}}</div>
 				<el-progress :text-inside="true" :stroke-width="24" :percentage="percentage"></el-progress>
-				<div class="yellow" style="text-align: center;padding-top: 10px;" v-if="config.event_review_status&&config.event_apply_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="text-align: center;padding-top: 10px;" v-if="config.event_review_status&&config.event_apply_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<div style="margin-top: 20px;border: 1px solid #f1f1f1;">
 					<div class="flex-box-ce results" style="font-weight: 600;">
 						<div  style="border-right: 1px solid #f1f1f1;width: 50px;">序号</div>

src/components/bonusPointsPopup.vue

@@ -197,7 +197,7 @@
 			<div v-if="!isShowError">
 				<div style="text-align: center;margin-bottom: 10px;" class="red" v-if="isShowError2">{{errorMsg}}</div>
 				<el-progress :text-inside="true" :stroke-width="24" :percentage="percentage"></el-progress>
-				<div class="yellow" style="text-align: center;padding-top: 10px;" v-if="config.event_review_status&&config.event_entry_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="text-align: center;padding-top: 10px;" v-if="config.event_review_status&&config.event_entry_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<div style="margin-top: 20px;border: 1px solid #f1f1f1;max-height: 500px;overflow-y: auto;" class="scroll-bar">
 					<div class="flex-box-ce results" style="font-weight: 600;">
 						<div style="border-right: 1px solid #f1f1f1;width: 50px;">序号</div>

src/components/examinePopup.vue

@@ -20,7 +20,7 @@
 									<div style="margin-left: 5px;">
 										<span v-if="detail_info.status == 1" class="green">审批通过</span>
 										<span v-else-if="detail_info.status == 2" class="red">审批驳回</span>
-										<span v-else-if="detail_info.status == 0" class="yellow">待审批</span>
+										<span v-else-if="detail_info.status == 0" class="orange">待审批</span>
 										<span v-else></span>
 									</div>
 								</div>

src/components/noData.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="flex-box-v flex-v-zhu">
       <img src="../assets/image/nodata.png"  :style="{ width: imgW, height: imgH }" style="margin: 30px auto;">
-      <div class="fontColorF"  style="text-align: center;line-height: 28px;" v-if="!isSolt">{{content}}</div>
+      <div class="fontColorC"  style="text-align: center;line-height: 28px;" v-if="!isSolt">{{content}}</div>
       <slot></slot>
     </div>
 </template>
@@ -48,7 +48,4 @@
     color:#26a2ff;
     cursor: pointer;
   }
-  .fontColorF{
-    color:#909399;
-  }
 </style>

src/components/toLead.vue

@@ -26,7 +26,7 @@
                         <div v-if="tolead.id == 1">
                             <div>共{{toleadall(tolead.error,tolead.success)}}条数据，已处理{{toleadall(tolead.error,tolead.success)}}条，导入情况如下：</div>
                             <div><svg-icon icon-class="leadThenGreen" /> 导入成功{{tolead.success.length}}条</div>
-                            <div><svg-icon icon-class="leadErrRed" /> 导入失败{{tolead.error.length}}条 &nbsp; &nbsp; <span v-if="tolead.error.length > 0" style="cursor:pointer;color: #409EFF;" @click="errClick(tolead.bs_id)">点击下载失败数据</span></div>
+                            <div><svg-icon icon-class="leadErrRed" /> 导入失败{{tolead.error.length}}条 &nbsp; &nbsp; <span v-if="tolead.error.length > 0" style="cursor:pointer;color: #409eff;" @click="errClick(tolead.bs_id)">点击下载失败数据</span></div>
                         </div>
                         <div v-else-if="tolead.id == 0">
                             <span><svg-icon icon-class="leadJgRed" /> 导入异常：{{tolead.name}}</span>
@@ -114,7 +114,7 @@
         margin-right: 5px;
      }
     .indexnow{
-         background-color:#409EFF;
+         background-color:#409eff;
          color: #fff;
          border: 1px solid #fff;
      }

src/home.vue

@@ -194,7 +194,7 @@
 								<div class="noimg" style="width: 150px;height: 150px;margin-top:94px;"></div>
 								<span class="title1">
 									暂无积分数据，
-									<span v-if="$supremeAuthority()!='employee'" @click="$router.push({ path: '/award_punish' })" style="color:#409EFF;cursor:pointer;">去奖扣积分></span>
+									<span v-if="$supremeAuthority()!='employee'" @click="$router.push({ path: '/award_punish' })" style="color:#409eff;cursor:pointer;">去奖扣积分></span>
 								</span>
 							</div>
 							<div v-show="!IntegralFormnone" style="margin-top:20px;"><div ref="IntegralFormChart" :style="{ width: '100%', height: '400px' }"></div></div>
@@ -1597,7 +1597,7 @@ export default {
 // 		padding-left: 10px;
 // 		font-size: 16px;
 // 		font-weight: normal;
-// 		border-left: 2px solid #409EFF;
+// 		border-left: 2px solid #409eff;
 // 	}
 // }
 .left-all-style {

src/index.vue

@@ -27,7 +27,7 @@
 						  <el-popover placement="bottom" width="240" trigger="hover">
 							 <div class="popoverText">
 								 <div class="flex-box-ce"><span>当前使用版本：</span><i>{{ corpMessage.package_name|| '测试环境版本' }}</i></div>
-								 <div class="flex-box-ce"><span>到期时间：</span><i class="yellow">{{ corpMessage.expire_time}}</i></div>
+								 <div class="flex-box-ce"><span>到期时间：</span><i class="orange">{{ corpMessage.expire_time}}</i></div>
 								 <div class="flex-box-ce"><span>企业使用人数：</span><i class="blue">{{ corpMessage.user_count_max }}人</i></div>
 								 <div class="flex-box-end">
 									<el-button size="small" @click="isTz = true" class="upgrade" type="primary" icon="el-icon-upload">续费升级</el-button>
@@ -101,7 +101,7 @@
 			</el-aside>
 			<el-main id="main">
 				<router-view />
-				<div class="fontColorF" style="text-align: center;margin: 10px 0;">Copyright © 2022 广东功道云数字科技有限公司 All Rights Reserved</div>
+				<div class="fontColorC" style="text-align: center;margin: 10px 0;">Copyright © 2022 广东功道云数字科技有限公司 All Rights Reserved</div>
 			</el-main>
 		</el-container>
 		<!-- 续费升级 -->
@@ -109,7 +109,7 @@
 			<div style="border-radius: 15px;border: 1px solid #f1f1f1;padding: 10px; width: 276px;box-sizing: border-box;margin: 0 auto;">
 				<img src="./assets/image/code.png" />
 			</div>
-			<div class="fontColorF" style="text-align: center;margin-top: 15px;font-size: 18px;">手机钉钉扫码，付费升级</div>
+			<div class="fontColorC" style="text-align: center;margin-top: 15px;font-size: 18px;">手机钉钉扫码，付费升级</div>
 		</el-dialog>
 		<el-dialog :close-on-click-modal="false" title="轻松四步落地积分制" :visible.sync="wn_show" width="680px">
 		  <el-row :gutter="0" class="set_role_div" style="border-top:1px solid rgb(234 234 234);">
@@ -645,8 +645,8 @@ export default {
 	border-radius: 4px;
 	padding: 7px 10px;
 	margin-right: 10px;
-	background-color: #409EFF;
-	border-color: #409EFF;
+	background-color: #409eff;
+	border-color: #409eff;
 	color: #fff;
 }
 .upgrade {

src/inform.vue

@@ -3,7 +3,7 @@
 		<header class="header flex-box-ce">
 			<div class="header-title flex-1" >
 				<div class="flex-box-ce" style="cursor: pointer;width: 200px;"  @click="$router.go(-1)">
-					<i class="el-icon-arrow-left fontColorF"></i>
+					<i class="el-icon-arrow-left fontColorC"></i>
 					<div class="text fontColorB font-flex-word">公告列表</div>
 				</div>
 			</div>
@@ -27,7 +27,7 @@
 			</div>
 			<div class="main-right flex-1" v-loading="noticeLoad">
 				<div class="title" style="position: relative;" v-if="announcement.length>0">
-					<span class="fontColorF" style="position: absolute;"> {{ articleOne.create_time ? articleOne.create_time : '' }} {{articleOne.employee_name}}发布</span>
+					<span class="fontColorC" style="position: absolute;"> {{ articleOne.create_time ? articleOne.create_time : '' }} {{articleOne.employee_name}}发布</span>
 					<div style="font-size: 18px;padding-right: 10px;text-align: center;">{{ articleOne.name ? articleOne.name : '' }}</div>
 					<div style="position: absolute;right:20px;top:0px" v-if="$supremeAuthority()!='dept_manager'&&$supremeAuthority()!='employee'">
 						<el-button type="danger" plain size="small" @click="deteleItem">删除</el-button>
@@ -255,7 +255,7 @@ hr {
 	.is-current {
 		.el-tree-node__content {
 			.el-icon-caret-right {
-				// color:#409EFF !important;
+				// color:#409eff !important;
 			}
 			.el-tree-node__label {
 				color: #409eff !important;

src/init.vue

@@ -10,12 +10,12 @@
 		<el-dialog title="通知" :visible.sync="dialogFormVisible" width="480px" :show-close="false" :close-on-click-modal="false">
 			<div>
 				<div style="font-size: 18px;">尊敬的用户:</div>
-				<div style="margin: 10px 0;">您当前的套餐已到期，如需继续使用，请<span @click="bundleOfServices" style="color:#409EFF;cursor:pointer;">联系客服</span>或扫描下方二维码进行续费。</div>
+				<div style="margin: 10px 0;">您当前的套餐已到期，如需继续使用，请<span @click="bundleOfServices" style="color:#409eff;cursor:pointer;">联系客服</span>或扫描下方二维码进行续费。</div>
 			</div>
 			<div style="border-radius: 15px;border: 1px solid #f1f1f1;padding: 10px; width: 276px;box-sizing: border-box;margin: 0 auto;">
 				<img src="./assets/image/code.png"/>
 			</div>
-			<div class="fontColorF" style="text-align: center;margin-top: 15px;font-size: 18px;">手机钉钉扫码，付费升级</div>
+			<div class="fontColorC" style="text-align: center;margin-top: 15px;font-size: 18px;">手机钉钉扫码，付费升级</div>
 		</el-dialog>
 	</div>
 </template>

src/screen.vue

@@ -41,7 +41,7 @@
 											<userImage :user_name="item.employee.name" :img_url="item.employee.img_url" width="54px" height="54px" style="margin: 0 18px;"></userImage>
 											<div>
 												<div style="font-size: 20px;margin-bottom: 5px;">{{ item.employee.name }}</div>
-												<div class="fontColorT" style="font-size: 14px;" v-if="item.dept_list.length>0">
+												<div class="fontColorD" style="font-size: 14px;" v-if="item.dept_list.length>0">
 													{{item.dept_list[0].dept_name}} <span v-if="item.dept_list.length>1">...</span>
 												</div>
 											</div>
@@ -56,7 +56,7 @@
 											<userImage :user_name="item.employee.name" :img_url="item.employee.img_url" width="54px" height="54px" style="margin: 0 18px;"></userImage>
 											<div>
 												<div style="font-size: 20px;margin-bottom: 5px;">{{ item.employee.name }}</div>
-												<div class="fontColorT" style="font-size: 14px;" v-if="item.dept_list.length>0">
+												<div class="fontColorD" style="font-size: 14px;" v-if="item.dept_list.length>0">
 													{{item.dept_list[0].dept_name}}<span v-if="item.dept_list.length>1">...</span>
 												</div>
 											</div>
@@ -125,7 +125,7 @@
 			<el-dialog title="输入密码" :visible.sync="isShowCode" width="450px" :show-close="false" :close-on-click-modal="false" :close-on-press-escape="false">
 				<div style="margin: 10px 0;">
 					<el-input style="width: 300px;" v-model="code" placeholder="请输入随机密码"></el-input>
-					<div class="yellow">密码可在系统后台 “访问大屏” 功能中获取</div>
+					<div class="orange">密码可在系统后台 “访问大屏” 功能中获取</div>
 				</div>
 				<div class="flex-box-end"><el-button type="primary" :disabled="isShowlog" :loading="isShowlog" @click="opneWebSocket()">确定</el-button></div>
 			</el-dialog>
@@ -171,7 +171,7 @@
 											<userImage :user_name="item.employee.name" :img_url="item.employee.img_url" width="30px" height="30px" style="margin: 0 6px;"></userImage>
 											<div>
 												<div style="font-size: 14px;">{{ item.employee.name }}</div>
-												<div class="fontColorT" style="font-size: 12px;margin-top: 5px;" v-if="item.dept_list.length>0">
+												<div class="fontColorD" style="font-size: 12px;margin-top: 5px;" v-if="item.dept_list.length>0">
 													{{item.dept_list[0].dept_name}} <span v-if="item.dept_list.length>1">...</span>
 												</div>
 											</div>
@@ -186,7 +186,7 @@
 											<userImage :user_name="item.employee.name" :img_url="item.employee.img_url" width="30px" height="30px" style="margin: 0 6px;"></userImage>
 											<div>
 												<div style="font-size: 14px;">{{ item.employee.name }}</div>
-												<div class="fontColorT" style="font-size: 12px;margin-top: 5px;" v-if="item.dept_list.length>0">
+												<div class="fontColorD" style="font-size: 12px;margin-top: 5px;" v-if="item.dept_list.length>0">
 													{{item.dept_list[0].dept_name}} <span v-if="item.dept_list.length>1">...</span>
 												</div>
 											</div>
@@ -256,7 +256,7 @@
 			<el-dialog title="输入密码" :visible.sync="isShowCode" width="450px" :show-close="false" :close-on-click-modal="false" :close-on-press-escape="false">
 				<div style="margin: 10px 0;">
 					<el-input style="width: 300px;" v-model="code" placeholder="请输入随机密码"></el-input>
-					<div class="yellow">密码可在系统后台 “访问大屏” 功能中获取</div>
+					<div class="orange">密码可在系统后台 “访问大屏” 功能中获取</div>
 				</div>
 				<div class="flex-box-end"><el-button type="primary" :disabled="isShowlog" :loading="isShowlog" @click="opneWebSocket()">确定</el-button></div>
 			</el-dialog>

src/views/abPoint/apply_list.vue

@@ -10,7 +10,7 @@
 		<div class="flex-box-ce" style="margin-bottom: 15px;">
 			<div class="flex-1">
 				<el-button type="primary" @click="dialogVisible = true">申请积分</el-button>
-				<span class="yellow" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_apply_review">复核开启后，积分需管理员复核后才计入排名和统计</span>
+				<span class="orange" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_apply_review">复核开启后，积分需管理员复核后才计入排名和统计</span>
 			</div>
 			<el-input style="width: 250px;" v-model="formData.keyword" placeholder="输入申请内容" @keyup.enter.native="searchFun">
 				<el-button slot="append" @click="searchFun" size="medium" icon="el-icon-search"></el-button>
@@ -300,7 +300,7 @@
 			<div v-if="ding_report.contents.length > 0">
 				<div class="contents" v-for="(item, index) in ding_report.contents" :key="index">
 					<div class="key">{{ item.key }}</div>
-					<div class="value fontColorF">
+					<div class="value fontColorC">
 						<span v-if="item.value">{{ item.value }}</span>
 						<span v-else>未填写</span>
 					</div>

src/views/abPoint/award_punish.vue

@@ -9,7 +9,7 @@
 			<div class="flex-1">
 				<el-button type="primary" @click="point_b">奖扣B分</el-button>
 				<el-button type="primary" @click="point_a" plain>奖扣A分</el-button>
-				<span class="yellow" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_entry_review">复核开启后，积分需管理员复核后才计入排名和统计</span>
+				<span class="orange" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_entry_review">复核开启后，积分需管理员复核后才计入排名和统计</span>
 			</div>
 			<div class="flex-box-ce">
 				<el-select  v-if="tabs=='success'" v-model="select_employee_id" filterable clearable placeholder="请输入或选择人员" style="width: 200px;margin-right: 10px;">
@@ -253,7 +253,7 @@
 		</el-drawer>
 
 		<bonusPointsPopup :isBreak="isBreak" :title="popuTitle" :visible.sync="popupVisible" :ruleOnoff="ruleOnoff" :refresh.sync="refreshData" :integralType.sync="integralType">
-			<div style=" position: absolute;top: 0px;right: 0;" class="yellow">最多只能选择30人</div>
+			<div style=" position: absolute;top: 0px;right: 0;" class="orange">最多只能选择30人</div>
 		</bonusPointsPopup>
 	</div>
 </template>

src/views/common/repeatTaskDetailsPopup.vue

@@ -9,14 +9,14 @@
 						<div class="label">任务内容</div>
 						<div class="content_text">{{ workDetailData.name }}</div>
 					</li>
-					<li class="flex-box">
+					<li class="flex-box" v-if="workDetailData.remark">
 						<div class="label">任务描述</div>
 						<div class="content_text">{{ workDetailData.remark }}</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData">
 						<div class="label">执行周期</div>
 						<div class="content_text">
-							{{ workDetailData.task_expire_day }}{{ workDetailData.task_cycle == 1 ? '天' : workDetailData.task_cycle == 2 ? '周' : '月' }}
+							{{workDetailData.target_info.length>0? '临时任务-':'悬赏任务-'}}{{ workDetailData.task_cycle_mark }}
 						</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData.point_config">
@@ -27,7 +27,7 @@
 						</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData.file_list && workDetailData.file_list.length > 0">
-						<div class="label">附件</div>
+						<div class="label">任务附件</div>
 						<div class="content_text">
 							<el-image
 								v-for="(item, index) in workDetailData.file_list"
@@ -49,11 +49,11 @@
 					<li class="flex-box">
 						<div class="label">截止时间</div>
 						<div class="content_text">
-							<span v-if="workDetailData.task_cycle == '1'">每天{{ dayTime(workDetailData.task_cycle_value) }}截止</span>
+							<span v-if="workDetailData.task_cycle == '1'">{{workDetailData.task_cycle_mark}}{{ dayTime(workDetailData.task_cycle_value) }}截止</span>
 							<span v-if="workDetailData.task_cycle == '2'">
-								<span>每周{{ weekList[workDetailData.task_cycle_value - 1] }}截止</span>
+								<span>{{workDetailData.task_cycle_mark}}{{ weekList[workDetailData.task_cycle_value - 1] }}截止</span>
 							</span>
-							<span v-if="workDetailData.task_cycle == '3'">每月{{ workDetailData.task_cycle_value }}号截止</span>
+							<span v-if="workDetailData.task_cycle == '3'">{{workDetailData.task_cycle_mark}}{{ workDetailData.task_cycle_value }}号截止</span>
 						</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData.department_info">
@@ -64,24 +64,15 @@
 							<span v-if="(workDetailData.department_info.length - 1) > index"> ,</span>
 						</span>
 						</div>
-							<div class="content_text" v-else>全公司</div>
+						<div class="content_text" v-else>全公司</div>
 					</li>
-					<template slot-scope="scope">
-						<span v-if="scope.row.task_cycle == '1'">每天0点自动发布，{{ dayTime(scope.row.task_cycle_value) }}截止</span>
-						<span v-if="scope.row.task_cycle == '2'">
-							<span>每周一自动发布，周{{ weekList[scope.row.task_cycle_value - 1] }}截止</span>
-						</span>
-						<span v-if="scope.row.task_cycle == '3'">每月1号自动发布，{{ scope.row.task_cycle_value }}号截止</span>
-					</template>
-					
-					
 					<li class="flex-box" v-if="workDetailData.point_config && workDetailData.point_config.ahead_award_point">
 						<div class="label">提前奖分</div>
 						<div class="content_text">{{ workDetailData.point_config.ahead_award_point }}/天</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData.point_config && workDetailData.point_config.ahead_award_point_limit">
 						<div class="label">奖分上限</div>
-						<div class="content_text">{{ workDetailData.point_config.ahead_award_point_limit }}</div>
+						<div class="content_text">{{ workDetailData.point_config.ahead_award_point_limit }}{{ workDetailData.pt_id == 2 ? 'A分' : workDetailData.pt_id == 3 ? 'B分' : '' }}</div>
 					</li>
 
 					<li class="flex-box" v-if="workDetailData.point_config && workDetailData.point_config.timeout_deduction_point">
@@ -90,7 +81,7 @@
 					</li>
 					<li class="flex-box" v-if="workDetailData.point_config && workDetailData.point_config.timeout_deduction_point_limit">
 						<div class="label">扣分上限</div>
-						<div class="content_text">{{ workDetailData.point_config.timeout_deduction_point_limit }}</div>
+						<div class="content_text">{{ workDetailData.point_config.timeout_deduction_point_limit }}{{ workDetailData.pt_id == 2 ? 'A分' : workDetailData.pt_id == 3 ? 'B分' : '' }}</div>
 					</li>
 				</ul>
 				<div v-show="workDetailData.point_config && (workDetailData.point_config.item_info||workDetailData.point_config.rule_info)">
@@ -122,7 +113,7 @@
 						</div>
 					</el-col>
 				</el-row>
-				<el-row v-if="workDetailData.target_info">
+				<el-row v-if="workDetailData.target_info.length>0">
 					<el-col :span="24" style="line-height: 30px;">执行人</el-col>
 					<el-col :span="24">
 						<div v-for="(item, index) in workDetailData.target_info" :key="index" style="margin-bottom: 10px;display:flex;">
@@ -159,6 +150,7 @@ export default {
 
 			loading: false,
 			workDetailData: {
+				target_info:[],
 				department_info:[],
 				point_config:{
 					rule_info:''
@@ -229,9 +221,6 @@ export default {
 		}
 	}
 }
-.fontColorF {
-	color: #909399;
-}
 .details_content {
 	padding: 20px;
 	height: calc(100vh - 60px);

src/views/common/rewardTask.vue

@@ -1,10 +1,10 @@
 <template>
 	<div>
 		<!-- 悬赏任务弹窗 -->
-		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="3%">
+		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="660px" top="3%">
 			<div v-loading="forTheTaskLoading">
-				<div class="yellow" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
-				<el-form :model="formData" ref="formData" label-width="80px">
+				<div class="orange" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<el-form :model="formData" ref="formData" label-width="90px">
 					<el-form-item
 						label="任务内容"
 						prop="task_name"
@@ -100,7 +100,21 @@
 							</span>
 						</el-dialog>
 					</el-form-item>
-
+					<el-form-item label="重复周期" prop="task_cycle">
+						<template slot="label">
+							<el-tooltip  effect="dark" placement="top">
+							  <div slot="content">
+								  每日重复任务将于明天0点执行自动发布<br/>
+								  每周重复任务将于下周一执行自动发布<br/>
+								  每月重复任务将于下个月1号执行自动发布
+								</div>
+							  <span>重复周期<i style="padding-left: 5px;font-size: 16px;" class="el-icon-question fontColorD"></i></span>
+							</el-tooltip>
+						</template>
+						<el-select v-model="formData.task_cycle" placeholder="请选择重复周期">
+							<el-option v-for="(item, index) in task_cycle_arr" :key="index" :label="item.name" :value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
 
 					<el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
 						<el-date-picker
@@ -154,11 +168,6 @@
 							（最多选择3张）
 						</upload>
 					</el-form-item>
-					<el-form-item label="重复周期" prop="task_cycle">
-						<el-select v-model="formData.task_cycle" placeholder="请选择重复周期">
-							<el-option v-for="(item, index) in task_cycle_arr" :key="index" :label="item.name" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
 					<el-form-item label="谁可以看" prop="dept_ids">
 						<el-cascader
 							size="medium"
@@ -708,23 +717,44 @@ export default {
 			add.forEach(item => {
 				this.deletedata(data, item);
 			});
-
+			let is=true;
+			if(this.formData.task_cycle==1&&this.formData.task_expire_day<=moment().format('HH')){
+				is=false  
+			}else if(this.formData.task_cycle==2&&this.formData.task_expire_day<=moment().day()){
+				is=false  
+			}else if(this.formData.task_cycle==3&&this.formData.task_expire_day<=moment().format('D')){
+				is=false  
+			}
 			this.forTheTaskLoading = true;
-			self.$axios('post', self.formData.task_cycle == 0 ? '/api/integral/task/publish' : '/api/integral/schedule/publish/task', data)
-				.then(res => {
-					if (res.data.code == 1) {
+			this.$axios('post', this.formData.task_cycle == 0 ? '/api/integral/task/publish' : '/api/integral/schedule/publish/task', data).then(res => {
+					this.$message.success(res.data.msg);
+					if(this.formData.task_cycle&&is){//是否重复任务
+						let str=this.formData.task_cycle==1? '您发布的每日重复任务将于明天0点执行自动发布，是否需要立即发布一条任务？':this.formData.task_cycle==2? '您发布的每周重复任务将于下周一执行自动发布，是否需要立即发布一条任务？':'您发布的每月重复任务将于下个月1号执行自动发布，是否需要立即发布一条任务？'
+						this.$confirm(str, '提示', {
+						  confirmButtonText: '发布',
+						  cancelButtonText: '不需要',
+						  type: 'warning'
+						}).then(() => {
+							this.executeTask(res.data.data)
+						}).catch(() => { 
+							this.$parent.get_list();
+						});
+					}else{
 						this.$parent.get_list();
-						this.resetForm('formData');
-						self.$message.success(res.data.msg);
-					} else {
-						self.$message.error(res.data.msg);
 					}
-				})
-				.finally(() => {
-					setTimeout(() => {
-						this.forTheTaskLoading = false;
-					}, 300);
-				});
+					this.resetForm('formData');
+			}).finally(() => {
+				setTimeout(() => {
+					this.forTheTaskLoading = false;
+				}, 300);
+			});
+		},
+		//执行周期任务
+		executeTask(id){
+			this.$axios('POST', '/api/integral/schedule/hand_exec',{schedule_id:id}).then(res => {
+				this.$message.success('已发布');
+				this.$parent.get_list();
+			});
 		},
 		// 审核人
 		reviewer_confirm(data) {

src/views/common/rewardTaskAmend.vue

@@ -3,7 +3,7 @@
 		<!-- 悬赏任务弹窗 -->
 		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="5%">
 			<div v-loading="forTheTaskLoading">
-				<div class="yellow" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<el-form :model="formData" ref="formData" label-width="80px">
 					<el-form-item
 						label="任务内容"
@@ -94,7 +94,6 @@
 						</el-dialog>
 					</el-form-item>
 
-
 					<el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
 						<el-date-picker
 							v-model="formData.expire_time"

src/views/common/rewardTaskDetailsPopup.vue

@@ -60,11 +60,11 @@
 					</li>
 					<li class="flex-box">
 						<div class="label">任务类型</div>
-						<div class="content_text">{{workDetailData.type_mark}}</div>
+						<div class="content_text">{{ workDetailData.type_mark }}</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData.point_config">
 						<div class="label">任务积分</div>
-						<div class="content_text">{{workDetailData.point_config.base_point}}{{$getTypsName(workDetailData.pt_id)}}</div>
+						<div class="content_text">{{ workDetailData.point_config.base_point }}{{ $getTypsName(workDetailData.pt_id) }}</div>
 					</li>
 					<li class="flex-box">
 						<div class="label">审批人</div>
@@ -92,13 +92,13 @@
 					</li>
 					<li class="flex-box" v-if="workDetailData.department_info">
 						<div class="label">可见范围</div>
-						<div class="content_text" v-if="workDetailData.department_info.length>0">
-						<span v-for="(item,index) in workDetailData.department_info" :key="index">
-							{{item.name}}
-							<span v-if="(workDetailData.department_info.length - 1) > index"> ,</span>
-						</span>
+						<div class="content_text" v-if="workDetailData.department_info.length > 0">
+							<span v-for="(item, index) in workDetailData.department_info" :key="index">
+								{{ item.name }}
+								<span v-if="workDetailData.department_info.length - 1 > index">,</span>
+							</span>
 						</div>
-							<div class="content_text" v-else>全公司</div>
+						<div class="content_text" v-else>全公司</div>
 					</li>
 					<li class="flex-box" v-if="workDetailData.complete_task && workDetailData.complete_task.remark">
 						<div class="label">完成备注</div>
@@ -107,16 +107,16 @@
 					<li class="flex-box" v-if="workDetailData.complete_task && workDetailData.complete_task.files && workDetailData.complete_task.files.length > 0">
 						<div class="label"></div>
 						<div class="content_text">
-						<el-image
-							v-for="(item, index) in workDetailData.complete_task.files"
-							:key="index"
-							style="width: 100px; height: 100px;margin-right:8px"
-							:src="item"
-							:preview-src-list="workDetailData.complete_task.files"
-						></el-image>
+							<el-image
+								v-for="(item, index) in workDetailData.complete_task.files"
+								:key="index"
+								style="width: 100px; height: 100px;margin-right:8px"
+								:src="item"
+								:preview-src-list="workDetailData.complete_task.files"
+							></el-image>
 						</div>
 					</li>
-        </ul>
+				</ul>
 				<div v-show="workDetailData.point_config && workDetailData.point_config.item_info">
 					<p class="row_title">规则依据</p>
 					<el-row :gutter="10" v-if="workDetailData.point_config.rule_info">
@@ -129,10 +129,11 @@
 					</el-row>
 					<el-row v-if="workDetailData.point_config.item_info">
 						<el-col :span="4">积分</el-col>
-						<el-col :span="19" v-show="workDetailData.point_config.item_info.min_point == workDetailData.point_config.item_info.max_point">{{ workDetailData.point_config.item_info.min_point }} {{$getTypsName(workDetailData.pt_id)}}</el-col>
+						<el-col :span="19" v-show="workDetailData.point_config.item_info.min_point == workDetailData.point_config.item_info.max_point">
+							{{ workDetailData.point_config.item_info.min_point }} {{ $getTypsName(workDetailData.pt_id) }}
+						</el-col>
 						<el-col :span="19" v-show="workDetailData.point_config.item_info.min_point != workDetailData.point_config.item_info.max_point">
-							{{ workDetailData.point_config.item_info.min_point }} ~ {{ workDetailData.point_config.item_info.max_point }}
-              {{$getTypsName(workDetailData.pt_id)}}
+							{{ workDetailData.point_config.item_info.min_point }} ~ {{ workDetailData.point_config.item_info.max_point }} {{ $getTypsName(workDetailData.pt_id) }}
 						</el-col>
 					</el-row>
 				</div>
@@ -231,12 +232,6 @@ export default {
 		}
 	}
 }
-.fontColorF {
-	color: #909399;
-}
-.yellow {
-	color: #e6a23c;
-}
 .details_content {
 	padding: 20px;
 	height: calc(100vh - 60px);

src/views/common/taskDetailsPopup.vue

@@ -138,13 +138,13 @@
 														<span v-if="item.point * 1 > 0">+{{ item.point }}</span>
 														<span v-if="item.point * 1 < 0">{{ item.point }}</span>
 													</div>
-													<div class="d_date fontColorF">{{ item.time }} <span class="delete_jfjl" v-if="item.recorder_id == userId && workDetailData.status < 3 " @click="deletejf_cli(index,0)"><i class="el-icon-delete"></i></span> </div>
+													<div class="d_date fontColorC">{{ item.time }} <span class="delete_jfjl" v-if="item.recorder_id == userId && workDetailData.status < 3 " @click="deletejf_cli(index,0)"><i class="el-icon-delete"></i></span> </div>
 												</div>
 												<div class="fontColorB" style="margin-top: 5px;word-break: break-all;">{{ item.remark }}</div>
 											</div>
 										</div>
 									</div>
-									<div v-if="text_list.length==0" class="fontColorF" style="text-align: center;">暂无工作记录</div>
+									<div v-if="text_list.length==0" class="fontColorC" style="text-align: center;">暂无工作记录</div>
 								</div>
 							</el-tab-pane>
 							<el-tab-pane label="记分记录" name="participation">
@@ -165,13 +165,13 @@
 														<span class="red" v-if="item.point * 1 > 0">+{{ item.point }}</span>
 														<span class="green" v-if="item.point * 1 < 0">{{ item.point }}</span>
 													</div>
-													<div class="d_date fontColorF">{{ item.time }} <span class="delete_jfjl" v-if="userId == item.recorder_id && workDetailData.status < 3" @click="deletejf_cli(index,1)"><i class="el-icon-delete"></i></span> </div>
+													<div class="d_date fontColorC">{{ item.time }} <span class="delete_jfjl" v-if="userId == item.recorder_id && workDetailData.status < 3" @click="deletejf_cli(index,1)"><i class="el-icon-delete"></i></span> </div>
 												</div>
 												<div class="fontColorB" style="margin-top: 5px;word-break: break-all;">{{ item.remark }}</div>
 											</div>
 										</div>
 									</div>
-									<div v-if="point_list.length==0" class="fontColorF" style="text-align: center;">暂无积分记录</div>
+									<div v-if="point_list.length==0" class="fontColorC" style="text-align: center;">暂无积分记录</div>
 								</div>
 							</el-tab-pane>
 						</el-tabs>
@@ -183,7 +183,7 @@
 		<!-- 更新进度 -->
 		<el-dialog title="更新进度" :close-on-click-modal="false" :visible.sync="isSlider" :before-close="publicClose" width="40%">
 			<div class="slider">
-			<div class="fontColorF">拖动滑杆更新进度</div>
+			<div class="fontColorC">拖动滑杆更新进度</div>
 			<el-slider v-model="progress"></el-slider>
 			</div>
 			<span slot="footer">
@@ -528,9 +528,6 @@ export default {
 		}
 	}
 }
-.fontColorF {
-	color: #909399;
-}
 .details_content {
 	padding: 20px;
 	height: calc(100vh - 60px);

src/views/common/temporaryTask.vue

@@ -3,7 +3,7 @@
 		<!-- 临时任务弹窗 -->
 		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="3%">
 			<div>
-				<div class="yellow" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<el-form :model="formData" ref="formData" label-width="80px" v-loading="taskload">
 					<el-form-item
 						label="任务内容"
@@ -120,6 +120,12 @@
 							</span>
 						</el-dialog>
 					</el-form-item>
+					
+					<el-form-item label="重复周期" prop="task_cycle">
+						<el-select v-model="formData.task_cycle" placeholder="请选择重复周期">
+							<el-option v-for="(item, index) in task_cycle_arr" :key="index" :label="item.name" :value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
 
 					<el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
 						<el-date-picker
@@ -143,7 +149,7 @@
 							<el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
 						</el-select>
 					</el-form-item>
-
+					
 					<el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
 						<el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
 							<el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
@@ -175,12 +181,6 @@
 						</upload>
 					</el-form-item>
 
-					<el-form-item label="重复周期" prop="task_cycle">
-						<el-select v-model="formData.task_cycle" placeholder="请选择重复周期">
-							<el-option v-for="(item, index) in task_cycle_arr" :key="index" :label="item.name" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-
 					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位，每 提前/逾期 一天 加分/扣分</div>
 					<el-form-item label="提前奖分" prop="ahead_award_point">
 						<el-input v-model="formData.ahead_award_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日奖分" style="width: 150px;"></el-input>
@@ -700,24 +700,47 @@ export default {
 			add.forEach(item => {
 				this.deletedata(data, item);
 			});
+			let is=true;
+			if(this.formData.task_cycle==1&&this.formData.task_expire_day<=moment().format('HH')){
+				is=false  
+			}else if(this.formData.task_cycle==2&&this.formData.task_expire_day<=moment().day()){
+				is=false  
+			}else if(this.formData.task_cycle==3&&this.formData.task_expire_day<=moment().format('D')){
+				is=false  
+			}
 			this.taskload = true;
-			self.$axios('post', self.formData.task_cycle == 0 ? '/api/integral/work/publish' : '/api/integral/schedule/publish/work', data)
-				.then(res => {
-					if (res.data.code == 1) {
+			this.$axios('post', this.formData.task_cycle == 0 ? '/api/integral/work/publish' : '/api/integral/schedule/publish/work', data).then(res => {
+				let msg=res.data.msg;
+				if(this.config.event_review_status&&this.config.event_task_review){
+					msg+='！复核开启后，积分需管理员复核后才计入排名和统计'
+				}
+				this.$message.success(msg);
+				if(this.formData.task_cycle&&is){//是否重复任务
+					let str=this.formData.task_cycle==1? '您发布的每日重复任务将于明天0点执行自动发布，是否需要立即发布一条任务？':this.formData.task_cycle==2? '您发布的每周重复任务将于下周一执行自动发布，是否需要立即发布一条任务？':'您发布的每月重复任务将于下个月1号执行自动发布，是否需要立即发布一条任务？'
+					this.$confirm(str, '提示', {
+					  confirmButtonText: '发布',
+					  cancelButtonText: '不需要',
+					  type: 'warning'
+					}).then(() => {
+						this.executeTask(res.data.data)
+					}).catch(() => { 
 						this.$parent.get_list();
-						this.resetForm('formData');
-						let msg=res.data.msg;
-						if(this.config.event_review_status&&this.config.event_task_review){
-							msg+='！复核开启后，积分需管理员复核后才计入排名和统计'
-						}
-						self.$message.success(msg);
-					} else {
-						self.$message.error(res.data.msg);
-					}
-				})
-				.finally(() => {
-					this.taskload = false;
-				});
+					});
+				}else{
+					this.$parent.get_list();
+				}
+				
+				this.resetForm('formData');
+			}).finally(() => {
+				this.taskload = false;
+			});
+		},
+		//执行周期任务
+		executeTask(id){
+			this.$axios('POST', '/api/integral/schedule/hand_exec',{schedule_id:id}).then(res => {
+				this.$message.success('已发布');
+				this.$parent.get_list();
+			});
 		},
 		// 执行者
 		approval_confirm(data) {

src/views/common/temporaryTaskAmend.vue

@@ -3,7 +3,7 @@
 		<!-- 临时任务弹窗 -->
 		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="5%">
 			<div>
-				<div class="yellow" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="text-align: center;padding-bottom: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<el-form :model="formData" ref="formData" label-width="80px" v-loading="taskload">
 					<el-form-item
 						label="任务内容"

src/views/ranking/JfDetail.vue

@@ -9,7 +9,7 @@
 				<userImage :user_name="userInfo.name" :img_url="userInfo.img_url" width="50px" height="50px"></userImage>
 				<div style="padding-left: 10px;" class="flex-1">
 					<div style="font-weight: 700;font-size: 18px;margin-bottom: 5px;">{{ userInfo.name }}</div>
-					<div class="flex-box-ce fontColorF">
+					<div class="flex-box-ce fontColorC">
 						<div v-for="(item, index) in userInfo.dept_list" :key="index">{{ item.dept_name }}<span v-if="userInfo.dept_list.length-index>1"> ， </span></div>
 					</div>
 				</div>
@@ -206,7 +206,7 @@
 			<div v-if="ding_report.contents.length > 0">
 				<div class="contents" v-for="(item, index) in ding_report.contents" :key="index">
 					<div class="key">{{ item.key }}</div>
-					<div class="value fontColorF">
+					<div class="value fontColorC">
 						<span v-if="item.value">{{ item.value }}</span>
 						<span v-else>未填写</span>
 					</div>

src/views/ranking/custom_rank.vue

@@ -13,7 +13,7 @@
 								<span slot="title">{{ item.name }}</span>
 							</el-menu-item>
 						</el-menu>
-						<div v-else style="text-align: center;margin-top: 10%;" class="fontColorF">
+						<div v-else style="text-align: center;margin-top: 10%;" class="fontColorC">
 							<img src="@/assets/image/nodata.png" style="width: 180px;height: 120px;margin: 30px auto;" />
 							<div>还没有自定义分组</div>
 						</div>

src/views/ranking/department_statistics.vue

@@ -61,7 +61,7 @@
 									<div class="noimg" style="width: 150px;height: 160px;margin-top:80px;"></div>
 									<span class="title1">
 										暂无积分数据 ，
-										<span @click="$router.push({ path: '/award_punish' })" style="color:#409EFF;cursor:pointer;">去奖扣积分></span>
+										<span @click="$router.push({ path: '/award_punish' })" style="color:#409eff;cursor:pointer;">去奖扣积分></span>
 									</span>
 								</div>
 								<div v-show="!IntegralFormnone"><div ref="IntegralFormChart" :style="{ width: '100%', height: '350px' }"></div></div>

src/views/ranking/individual_statistics.vue

@@ -105,7 +105,7 @@
 										<div class="noimg" style="width: 150px;height: 150px;margin-top:80px;"></div>
 										<span class="title1">暂无积分数据</span>
 									</div>
-									<div v-show="!IntegralFormnone"><div ref="IntegralFormChart" :style="{ width: '100%', height: '350px' }"></div></div>
+									<div v-show="!IntegralFormnone"><div ref="IntegralFormChart" :style="{ width: '100%', height: '380px' }"></div></div>
 								</div>
 							</el-row>
 						</el-row>
@@ -571,11 +571,11 @@ export default {
 						{
 							type: 'scroll',
 							orient: 'vertical',
-							icon: 'square',
+							// icon: 'square',
 							left: left1,
-							align: 'left',
+							// align: 'left',
 							top: '10%',
-							itemGap: 20,
+							itemGap: 14,
 							textStyle: { fontSize: 14, color: 'rgb(48, 49, 51)' },
 							data: legendData1
 						}
@@ -638,7 +638,6 @@ export default {
 					let dadalist = [];
 					//分为两列展示
 					// let listLeng = Math.ceil((lists.length)/2)
-
 					for (let i in lists) {
 						if (lists[i].name.length > 15) {
 							lists[i].name = lists[i].name.slice(0, 15) + '...';
@@ -649,11 +648,11 @@ export default {
 						// }else{
 						//   legendData2.push(lists[i].name+' '+'奖'+lists[i].reward+' '+'扣'+lists[i].deduction+' '+lists[i].ratio+'%')
 						// }
-						if (i < 8) {
+						// if (i < 8) {
 							legendData1.push(lists[i].name + ' ' + '奖' + lists[i].reward + ' ' + '扣' + lists[i].deduction + ' ' + lists[i].ratio + '%');
-						} else {
-							legendData2.push(lists[i].name + ' ' + '奖' + lists[i].reward + ' ' + '扣' + lists[i].deduction + ' ' + lists[i].ratio + '%');
-						}
+						// } else {
+						// 	legendData2.push(lists[i].name + ' ' + '奖' + lists[i].reward + ' ' + '扣' + lists[i].deduction + ' ' + lists[i].ratio + '%');
+						// }
 						let dataListDx = {};
 						if (lists[i].ratio < 0) {
 							dataListDx.value = 0;

src/views/ranking/integral_event.vue

@@ -262,7 +262,7 @@
 			<div v-if="ding_report.contents.length > 0">
 				<div class="contents" v-for="(item, index) in ding_report.contents" :key="index">
 					<div class="key">{{ item.key }}</div>
-					<div class="value fontColorF">
+					<div class="value fontColorC">
 						<span v-if="item.value">{{ item.value }}</span>
 						<span v-else>未填写</span>
 					</div>

src/views/ranking/integral_event_two.vue

@@ -214,7 +214,7 @@
 			<div v-if="ding_report.contents.length > 0">
 				<div class="contents" v-for="(item, index) in ding_report.contents" :key="index">
 					<div class="key">{{ item.key }}</div>
-					<div class="value fontColorF">
+					<div class="value fontColorC">
 						<span v-if="item.value">{{ item.value }}</span>
 						<span v-else>未填写</span>
 					</div>

src/views/ranking/manager_statistics.vue

@@ -59,7 +59,7 @@
 						<el-form-item><el-button type="primary" plain @click="exportExcel" size="medium" style="margin-left:20px">导出报表</el-button></el-form-item>
 					</el-form>
 					<div class="flex-box-end">
-						<span class="yellow">*管理者奖扣任务均为B分，对A分不做要求*</span>
+						<span class="orange">*管理者奖扣任务均为B分，对A分不做要求*</span>
 					</div>
 					<el-table :data="last" style="width: 100%;cursor: pointer;" v-loading="loading"  @row-click="openDetail">
 						<el-table-column label="管理者">
@@ -165,7 +165,7 @@
 						</el-form-item>
 					</el-form>
 					<div class="flex-box-end">
-						<span class="yellow">*管理者奖扣任务均为B分，对A分不做要求*</span>
+						<span class="orange">*管理者奖扣任务均为B分，对A分不做要求*</span>
 					</div>
 					<el-table :data="list" style="width: 100%;cursor: pointer;" v-loading="loading" @row-click="open_detail">
 						<el-table-column label="管理者">

src/views/set/framework.vue

@@ -463,7 +463,7 @@ export default {
 						if(data.employee_detail.superior_list){
 							let employeeD = data.employee_detail
 							if(employeeD.superior_id != 0){
-								this.dirSupervisor = employeeD.superior_list.filter(x => x.id == employeeD.superior_id)[0]
+								this.dirSupervisor = employeeD.superior_list.filter(x => x.id == employeeD.superior_id)[0]||{}
 							}else{
 								this.dirSupervisor = {}
 							}

src/views/set/jurisdiction.vue

@@ -23,11 +23,11 @@
 							</el-button>
 							<el-button type="text" size="medium" plain v-if="item_info.code != 'employee'" @click="open_right(item_info)">刷新</el-button>
 						</div>
-						<div class="user_text fontColorF" v-if="item_info.code == 'creator'">创始人默认为开通【功道云积分制】的人，拥有所有的功能及管理权限</div>
-						<div class="user_text fontColorF" v-if="item_info.code == 'admin'">公司管理员一般为合伙人、股东等高级管理人员，可管理多个部门和人员</div>
-						<div class="user_text fontColorF" v-if="item_info.code == 'point_manager'">积分专员一般为人事、行政等管理督办人员，可管理多个部门和人员</div>
-						<div class="user_text fontColorF" v-if="item_info.code == 'dept_manager'">部门管理员一般为部门/团队经理、主管、组长，可管理一部分人员</div>
-						<div class="user_text fontColorF" v-if="item_info.code == 'employee'">员工为默认角色，每个人都拥有员工角色的功能权限，该角色不可修改</div>
+						<div class="user_text fontColorC" v-if="item_info.code == 'creator'">创始人默认为开通【功道云积分制】的人，拥有所有的功能及管理权限</div>
+						<div class="user_text fontColorC" v-if="item_info.code == 'admin'">公司管理员一般为合伙人、股东等高级管理人员，可管理多个部门和人员</div>
+						<div class="user_text fontColorC" v-if="item_info.code == 'point_manager'">积分专员一般为人事、行政等管理督办人员，可管理多个部门和人员</div>
+						<div class="user_text fontColorC" v-if="item_info.code == 'dept_manager'">部门管理员一般为部门/团队经理、主管、组长，可管理一部分人员</div>
+						<div class="user_text fontColorC" v-if="item_info.code == 'employee'">员工为默认角色，每个人都拥有员工角色的功能权限，该角色不可修改</div>
 					</div>
 					<div class="flex-box btns flex-v-ce margin-bottom" v-if="item_info.code != 'employee'">
 						<div class="flex-1">
@@ -614,7 +614,7 @@
 		<!-- 添加老板 -->
 		<el-dialog title="添加创始人" :visible.sync="dialogFormVisible" top="5vh" width="700px">
 			<EmployeeSelector v-if="dialogFormVisible" ref="boss" :multi="false" :user_no_select="false" @confirm="selectBoss"></EmployeeSelector>
-			<div style="text-align: center;" class="fontColorT">创始人至少有一位，创始人不能删除自己</div>
+			<div style="text-align: center;" class="fontColorD">创始人至少有一位，创始人不能删除自己</div>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="dialogFormVisible = false" :disabled="isShowBoss">取 消</el-button>
 				<el-button type="primary" :loading="isShowBoss" :disabled="isShowBoss" @click="add_creator()">确 定</el-button>
@@ -703,7 +703,7 @@
 		<!-- 同步人员 -->
 		<el-dialog  title="提示" :visible.sync="isShowTb" :before-close="closeTb" width="500px">
 			<p style="font-size: 18px;font-weight: 600;margin-bottom: 10px;">
-				<i class="el-icon-warning yellow" style="font-size: 22px;"></i>
+				<i class="el-icon-warning orange" style="font-size: 22px;"></i>
 				确认同步所选择的人员吗？
 			</p>
 			<span slot="footer">

src/views/set/log.vue

@@ -26,7 +26,7 @@
 				</el-table-column>
 				<el-table-column label="状态">
 					<template slot-scope="scope">
-						<span v-if="scope.row.enable == 0" class="yellow">已禁用</span>
+						<span v-if="scope.row.enable == 0" class="orange">已禁用</span>
 						<span v-else class="green">已启用</span>
 					</template>
 				</el-table-column>

src/views/set/screenSet.vue

@@ -94,7 +94,7 @@
 					<div class="blue" style="padding-left: 10px;cursor: pointer;" @click="copy('2')">复制密码</div>
 				</div>
 				<div class="fontColorB" style="font-size: 12px;margin-bottom: 10px;">刷新后原有的密码将失效</div>
-				<div class="yellow">每个链接仅支持3个窗口同时在线访问，超出后无法获取数据</div>
+				<div class="orange">每个链接仅支持3个窗口同时在线访问，超出后无法获取数据</div>
 			</div>
 			<div class="flex-box-end" style="margin: 10px 0;">
 				<el-button @click="preview({},1)" type="primary" plain>打开大屏</el-button>
@@ -165,7 +165,7 @@
 										<img v-if="config.company.logo" :src="config.company.logo" class="avatar" />
 										<i v-else class="el-icon-plus avatar-uploader-icon"></i>
 									</upload>
-									<div class="yellow" style="font-size: 12px;">比例为1:1,最大不超过5M</div>
+									<div class="orange" style="font-size: 12px;">比例为1:1,最大不超过5M</div>
 								</el-form-item>
 							</div>
 						</div>
@@ -252,7 +252,7 @@
 							</div>
 							<div class="formBox">
 <!-- 								<div style="color: #333;font-weight: 700;margin-bottom: 10px;">占比说明 </div>
-								<div class="fontColorF" style="line-height: 23px;margin-bottom: 10px;">获得积分人员占比=获得积分的人数/参与积分的总人数</br>执行奖扣管理人员占比=有执行奖扣的人/总管理者人数</br>基准标尺为执行下限，要求活跃度在标尺之上执行才算执行到位</div> -->
+								<div class="fontColorC" style="line-height: 23px;margin-bottom: 10px;">获得积分人员占比=获得积分的人数/参与积分的总人数</br>执行奖扣管理人员占比=有执行奖扣的人/总管理者人数</br>基准标尺为执行下限，要求活跃度在标尺之上执行才算执行到位</div> -->
 								<el-form-item label="部门">
 									<el-cascader
 										v-model="config.active.deptArr"

src/views/set/systemLayout.vue

@@ -9,13 +9,13 @@
 						当前系统审批流程
 						<a @click="approvalProcess">查看图例</a>
 					</p>
-					<div style="margin-top:5px;" class="fontColorF"><span>指定规则的审批或奖扣分，均可直接通过</span></div>
+					<div style="margin-top:5px;" class="fontColorC"><span>指定规则的审批或奖扣分，均可直接通过</span></div>
 				</div>
 				
 				<div class="integralApproval">
 					<b>积分复核<el-switch style="margin-left:30px;" :active-value="1" :inactive-value="0" v-model="event_review_status"></el-switch></b>
 					<div style="margin-top:5px;line-height: 30px;"  v-if="event_review_status">
-						<div>开启后，以下来源的积分需要在<span class="yellow">复核通过</span>后才计入排名和统计</div>
+						<div>开启后，以下来源的积分需要在<span class="orange">复核通过</span>后才计入排名和统计</div>
 						<div>哪些来源的积分需要复核（至少选择一项）</div>
 						<div class="flex-box-ce">
 						  <el-checkbox v-model="event_apply_review" label="积分申请" border size="small"></el-checkbox>
@@ -32,7 +32,7 @@
 						福利模块
 						<el-switch style="margin-left:30px;" :active-value="1" :inactive-value="0" v-model="shop_status"></el-switch>
 					</b>
-					<div style="margin-top:5px;" class="fontColorF">
+					<div style="margin-top:5px;" class="fontColorC">
 						<div>开启后，通过“功勋点”可兑换公司的福利奖品；</div>
 						<div>员工可通过公司定期统一发放或挣更多个人B分来获得功勋点</div>
 					</div>
@@ -43,7 +43,7 @@
 						提交积分时，必须选择积分规则
 						<el-switch style="margin-left:30px;" v-model="ruleOnoff"></el-switch>
 					</b>
-					<div style="margin-top:5px;" class="fontColorF">
+					<div style="margin-top:5px;" class="fontColorC">
 						<div>开启后，申请积分或奖扣积分时，必须选择积分规则提交；</div>
 						<div>此配置不影响积分审批和任务发布</div>
 					</div>
@@ -53,7 +53,7 @@
 						指定规则的审批或奖扣分免审
 						<el-switch style="margin-left:30px;" v-model="examine"></el-switch>
 					</b>
-					<div style="margin-top:5px;" class="fontColorF">
+					<div style="margin-top:5px;" class="fontColorC">
 						<div>开启后，按照系统已有的积分规则制度提交的审批或者奖扣可直接通过；</div>
 						<div>即使审批人/录分人的权限分不足，也能审批通过</div>
 					</div>
@@ -66,7 +66,7 @@
 					<div class="flex-box flex-v-ce" style="margin-top:10px;" v-if="isApB">
 						1A分=<el-input v-model.number="pointNum" autofocus="0" size="mini" class="pointNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>B分
 					</div>
-					<div style="margin-top:10px;" class="fontColorF">
+					<div style="margin-top:10px;" class="fontColorC">
 						<div>开启后，每奖/扣1条A分，额外产生一条分值按比例转换后的B分记录；</div>
 						<div>例如：设置1A分=10B分时，因表现出色奖10A分的同时，额外奖100B分。</div>
 					</div>
@@ -76,7 +76,7 @@
 						管理者审批计入奖扣分目标
 						<el-switch style="margin-left:30px;" v-model="task_review"></el-switch>
 					</b>
-					<div style="margin-top:5px;" class="fontColorF">
+					<div style="margin-top:5px;" class="fontColorC">
 						<div>系统默认的管理者奖扣目标只包含管理者主动给员工奖扣的积分；</div>
 						<div>开启后，审批员工申请的积分和任务也会记入Ta的奖扣分目标内</div>
 					</div>

src/views/set/voluntarilyPoint.vue

@@ -948,24 +948,7 @@ export default {
 				color: #909399 !important;
 			}
 		}
-		// li:hover .el-submenu__title {
-		// 	background: #e7f6ff;
-		// }
-		// ul {
-		// 	li.is-active {
-		// 		background-color: #e7f6ff !important;
-		// 	}
-		// }
 	}
-	// ::v-deep .is-opened .el-submenu__title .title_top {
-	// 	color: #409eff !important;
-	// }
-	// ::v-deep .is-opened .el-menu .el-menu-item span {
-	// 	color: #333;
-	// }
-	// ::v-deep .is-opened .el-menu .is-active span {
-	// 	color: #409eff;
-	// }
 }
 ::v-deep .el-submenu__title {
 	height: 47px !important;

src/views/subassembly/update_notice.vue

@@ -138,10 +138,10 @@ export default {
     .is-current{
 		.el-tree-node__content{
 			.el-icon-caret-right{
-				// color:#409EFF !important;
+				// color:#409eff !important;
 			}
 			.el-tree-node__label{
-				color:#409EFF !important;
+				color:#409eff !important;
 			}
 		}
 		.el-tree-node__children{

src/views/task/allTask.vue

@@ -40,7 +40,7 @@
 			</el-form>
 
 			<div>
-				<div class="yellow" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_task_review">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<el-table :data="list" ref="elTable" style="width: 100%" v-loading="loading"  @sort-change="sortChange">
 					<el-table-column label="执行人" prop="employee_id">
 					  <template slot-scope="scope">

src/views/task/myExamine.vue

@@ -29,7 +29,7 @@
 			</el-form>
 
 			<div>
-				<div class="yellow" style="padding-left: 10px;" v-if="config.event_review_status">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="padding-left: 10px;" v-if="config.event_review_status">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<el-table :data="list" style="width: 100%" v-loading="loading">
 					<el-table-column label="执行人" prop="employee_id">
 					  <template slot-scope="scope">

src/views/task/my_issue.vue

@@ -99,7 +99,7 @@
 					<el-table-column label="审批人" width="100px" prop="reviewer_name"></el-table-column>
 					<el-table-column label="状态" prop="owner_id" width="100px">
 						<template slot-scope="scope">
-							<span class="yellow" v-if="scope.row.status == 1">进行中</span>
+							<span class="orange" v-if="scope.row.status == 1">进行中</span>
 							<span class="green" v-else-if="scope.row.status == 2">已完成</span>
 							<span class="red" v-else-if="scope.row.status == 3">退回</span>
 							<span class="green" v-else-if="scope.row.status == 4">已审批</span>
@@ -162,8 +162,8 @@
 					</el-table-column>
 					<el-table-column label="状态" prop="owner_id" width="100px">
 						<template slot-scope="scope">	
-						<span class="yellow" v-if="scope.row.status == 1">待领取</span>			
-				<span class="yellow" v-else-if="scope.row.status == 2">进行中</span>			
+						<span class="orange" v-if="scope.row.status == 1">待领取</span>			
+				<span class="orange" v-else-if="scope.row.status == 2">进行中</span>			
 				<span class="green" v-else-if="scope.row.status == 3">已完成</span>			
 				<span class="fontColorZ" v-else-if="scope.row.status == 4">已撤回</span>	
 						<span class="red" v-else>已过期</span>

src/views/task/my_task.vue

@@ -77,7 +77,7 @@
 					<el-table-column label="审批人" prop="reviewer_name"></el-table-column>
 					<el-table-column label="状态" prop="review_status">
 						<template slot-scope="scope">
-							  <div class="yellow" v-if="scope.row.review_status == 0">待处理</div>
+							  <div class="orange" v-if="scope.row.review_status == 0">待处理</div>
 							  <div class="green" v-if="scope.row.review_status ==1">已通过</div>
 							  <div class="red" v-if="scope.row.review_status == 2">已驳回</div>
 						</template>

src/views/welfare/conversion.vue

@@ -68,7 +68,7 @@
 				</el-table-column>
 				<el-table-column prop="status" label="状态" align="center">
 					<template slot-scope="scope">
-						<span v-if="scope.row.status == 0" class="fontColorT">未发放</span>
+						<span v-if="scope.row.status == 0" class="fontColorD">未发放</span>
 						<span v-if="scope.row.status == 1" class="green">已发放</span>
 						<span v-if="scope.row.status == 2" class="red">已取消</span>
 					</template>
@@ -199,7 +199,7 @@
 							</div>
 						</div>
 					</div>
-					<div v-if="detailData.status == 0" class="fontColorT" style="font-size: 16px;">未发放</div>
+					<div v-if="detailData.status == 0" class="fontColorD" style="font-size: 16px;">未发放</div>
 					<div v-if="detailData.status == 1" class="green" style="font-size: 16px;">已发放</div>
 					<div v-if="detailData.status == 2" class="red" style="font-size: 16px;">已取消</div>
 				</div>

src/views/welfare/flManagement.vue

@@ -121,14 +121,14 @@
 		<!-- 转换设置 -->
 		<el-dialog title="转换设置" :visible.sync="isZh" width="500px" top="10%">
 			<div class="flex-box-ce" style="margin-bottom: 20px;">
-				<span class="yellow flex-1">B分转换功勋点将按以下比例进行转换</span>
+				<span class="orange flex-1">B分转换功勋点将按以下比例进行转换</span>
 				<span style="cursor: pointer;" class="blue" @click="innerVisible = true">历史修改记录</span>
 			</div>
 			<div class="flex-box-ce flex-center-center" style="margin-bottom: 10px;font-size: 16px;">
 				<span>转换比例 1：</span>
 			    <el-input type="text" class="width-250" v-model="zhNum" placeholder="请输入比例" @input="[zhNum=zhNum.replace(/[^\d]/g,'')]"/>
 			</div>
-			<div style="text-align: center;"><i class="el-icon-d-arrow-left fontColorT" style="font-size: 30px;transform: rotate(-90deg);"></i></div>
+			<div style="text-align: center;"><i class="el-icon-d-arrow-left fontColorD" style="font-size: 30px;transform: rotate(-90deg);"></i></div>
 			<div style="text-align: center;font-size: 22px;margin: 10px 0 30px 0;">
 				1 B分 =
 				<span class="blue">{{ zhNum }}</span>
@@ -152,7 +152,7 @@
 		<!-- 发放/回收/转换 -->
 		<el-dialog :title="czText + '功勋点'" :visible.sync="isCz" width="500px" top="10%">
 			<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
-				<div v-if="isEmployee&&czText!='发放'" class="yellow" style="text-align: center;margin-bottom: 17px;">
+				<div v-if="isEmployee&&czText!='发放'" class="orange" style="text-align: center;margin-bottom: 17px;">
 					<span v-if="czText=='回收'">该操作将会{{czText}}所选对象的全部功勋点，请谨慎操作</span>
 					<span v-else>该操作将会{{czText}}所选对象的全部可转B分，请谨慎操作</span>
 				</div>
@@ -220,7 +220,7 @@
 				<div class="flex-box-ce">
 					<div class="titled" v-for="(item,index) in detailData" :key="index">
 						<div class="num" :class="item.num>=0? 'blue':'red'">{{item.num}}</div>
-						<div class="fontColorF">{{item.name}}</div>
+						<div class="fontColorC">{{item.name}}</div>
 					</div>
 				</div>
 				<div class="flex-box-end " style="margin-bottom: 10px;">

src/views/welfare/prize.vue

@@ -10,7 +10,7 @@
 							<span slot="title">{{ item.name }}</span>
 						</el-menu-item>
 					</el-menu>
-					<div v-else style="text-align: center;margin-top: 10%;" class="fontColorF">
+					<div v-else style="text-align: center;margin-top: 10%;" class="fontColorC">
 						<img src="@/assets/image/nodata.png" style="width: 180px;height: 120px;margin: 30px auto;" />
 						<div>还没有自定义分类</div>
 					</div>
@@ -64,7 +64,7 @@
 						<el-table-column label="状态" align="center" prop="status" min-width="100">
 							<template slot-scope="scope">
 								<span v-if="scope.row.status == 1" class="green">已上架</span>
-								<span v-else class="fontColorT">未上架</span>
+								<span v-else class="fontColorD">未上架</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="操作" min-width="200">
@@ -143,7 +143,7 @@
 								<img v-if="newForm.image" :src="newForm.image" class="avatar" />
 								<i v-else class="el-icon-plus avatar-uploader-icon" style="border: 1px solid #f1f1f1;border-radius: 5px;"></i>
 							</upload>
-							<div class="yellow" style="font-size: 12px;">建议图片尺寸200*200</div>
+							<div class="orange" style="font-size: 12px;">建议图片尺寸200*200</div>
 						</div>
 						<el-button style="margin-left: 20px;height: 30px;" size="small" @click="deleteImg" type="danger" plain v-if="newForm.image">删除</el-button>
 					</div>

src/views/workbench/alreadySp.vue

@@ -18,7 +18,7 @@
 				<el-form-item style="margin-left: 10px;"><el-input v-model="formData.keyword" placeholder="请输入审批内容" clearable></el-input></el-form-item>
 			</el-form>
 			<div>
-				<div class="yellow" style="padding-left: 10px;" v-if="config.event_review_status">复核开启后，积分需管理员复核后才计入排名和统计</div>
+				<div class="orange" style="padding-left: 10px;" v-if="config.event_review_status">复核开启后，积分需管理员复核后才计入排名和统计</div>
 				<el-table :data="list" style="cursor: pointer;" v-loading="loading" class="listTable" @row-click="openDetail">
 					<el-table-column label="审批标题" prop="task_name">
 						<template slot-scope="scope">

src/views/workbench/review.vue

@@ -298,7 +298,7 @@
 			<div v-if="ding_report.contents.length > 0">
 				<div class="contents" v-for="(item, index) in ding_report.contents" :key="index">
 					<div class="key">{{ item.key }}</div>
-					<div class="value fontColorF">
+					<div class="value fontColorC">
 						<span v-if="item.value">{{ item.value }}</span>
 						<span v-else>未填写</span>
 					</div>