钉钉1.4期 中

src/api/auth.js

@@ -9,6 +9,7 @@ export function getUserData () {
 export function setUserData (data) {
      localStorage.setItem(UserIdKey,JSON.stringify(data))
 }
+// 获取积分类型
 export function getTyps (id) {
 	 if(id){
 		 var arr=JSON.parse(localStorage.getItem(TypesKey));
@@ -20,7 +21,11 @@ export function getTyps (id) {
 		 return JSON.parse(localStorage.getItem(TypesKey));
 	 }
 }
-
+// 获取积分类型名称
+export function getTypsName (id) {
+	return getTyps(id).name
+}
+// 判断是否创始人
 export function getIsCreator (key) {
 	 let is=false;
 	 getUserData().employee_detail.role_list.forEach(item=>{ 
@@ -60,3 +65,5 @@ export function setToken (token) {
      localStorage.setItem(TokenKey, token)
 }
 
+
+

src/assets/css/reset.css

@@ -1,8 +1,7 @@
 body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, form, fieldset, legend, button, input, textarea, th, td { margin:0; padding:0; }
 body, button, input, select, textarea {
 	font-size:14px;
-  color: #303133;
-    /* font-family:"楷体","楷体_GB2312"; */
+	color: #303133;
     font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
 	-webkit-font-smoothing: antialiased;
 	-webkit-tap-highlight-color: transparent;

src/components/UserImage.vue

@@ -36,7 +36,7 @@
       },
       fontSize:{
         type: String,
-        default: '0.32'
+        default: '0.8'
       }
     },
     watch:{

src/components/applicationIntegrationPopup.vue

@@ -33,7 +33,7 @@
 							</el-dialog>
 						</el-form-item>
 						<el-form-item label="指定规则">
-							<el-switch v-model="item.rule_switch" @change="switchChange(index, item.rule_switch)" active-color="#13ce66"></el-switch>
+							<el-switch v-model="item.rule_switch" @change="switchChange(index, item.rule_switch)"></el-switch>
 						</el-form-item>
 						
 						<el-form-item
@@ -56,11 +56,11 @@
 						<el-form-item v-if="item.rule_switch && item.rule_id">
 							<div style="line-height: 24px;" v-show="item.rule_item_details.range_type == 1">
 								{{ item.rule_item_details.min_point }}
-								<span class="blue">{{ get_point_name(item.rule_item_details.pt_id) }}</span>
+								<span class="blue">{{ $getTypsName(item.rule_item_details.pt_id)}}</span>
 							</div>
 							<div style="line-height: 24px;" v-show="item.rule_item_details.range_type == 2">
 								{{ item.rule_item_details.min_point }} ~ {{ item.rule_item_details.max_point }}
-								<span class="blue">{{ get_point_name(item.rule_item_details.pt_id) }}</span>
+								<span class="blue">{{ $getTypsName(item.rule_item_details.pt_id) }}</span>
 							</div>
 							<div style="line-height: 24px;">{{ item.rule_item_details.name }}</div>
 						</el-form-item>
@@ -568,10 +568,6 @@ export default {
 			}
 			item.show_approval_selector = false;
 		},
-		// 获取积分名称
-		get_point_name(id) {
-			return this.$getTyps(id).name;
-		},
 	}
 };
 </script>

src/components/bonusPointsPopup.vue

@@ -36,7 +36,7 @@
 						</div>
 
 						<el-form-item label="指定规则">
-							<el-switch @change="switchChange(index, item.rule_switch)" v-model="item.rule_switch" active-color="#13ce66"></el-switch>
+							<el-switch @change="switchChange(index, item.rule_switch)" v-model="item.rule_switch"></el-switch>
 						</el-form-item>
 
 						<el-form-item
@@ -76,11 +76,11 @@
 						<el-form-item>
 							<div style="line-height: 24px;" v-show="item.rule_item_details.range_type == 1">
 								{{ item.rule_item_details.min_point }}
-								<span class="blue">{{ get_point_name(ptid) }}</span>
+								<span class="blue">{{ $getTypsName(ptid) }}</span>
 							</div>
 							<div style="line-height: 24px;" v-show="item.rule_item_details.range_type == 2">
 								{{ item.rule_item_details.min_point }} ~ {{ item.rule_item_details.max_point }}
-								<span class="blue">{{ get_point_name(ptid) }}</span>
+								<span class="blue">{{ $getTypsName(ptid) }}</span>
 							</div>
 							<div style="line-height: 24px;">{{ item.rule_item_details.name }}</div>
 						</el-form-item>
@@ -644,10 +644,6 @@ export default {
 			item.reviewer_id ? (item.pointShow = 3) : '';
 			item.show_approval_selector = false;
 		},
-		// 获取积分名称
-		get_point_name(id) {
-			return this.$getTyps(id).name;
-		},
 		// 关闭弹窗
 		closePopup() {
 			//关闭重置窗口状态

src/components/examinePopup.vue

@@ -7,24 +7,24 @@
 					<el-row :gutter="10" style="padding-bottom:20px;border-bottom:1px #f8f8f8 solid;position: relative;">
 						<el-col :span="24">
 							<template>
-								<userImage :user_name="detail_info.employee_name" :img_url="detail_info.employee_img" class="fl" width="50px" height="50px"></userImage>
+								<userImage class="fl" :user_name="detail_info.employee_name" :img_url="detail_info.employee_img"  width="50px" height="50px"></userImage>
 							</template>
 							<template>
-								<span style="line-height:50px; margin-left:10px;margin-right:4px;">{{ detail_info.employee_name }}</span>
-								<span class="color_red point" v-show="detail_info.point >= 0 && detail_info.point">
-									<span v-if="(detail_info.review_point == 0 ? detail_info.point : detail_info.review_point) >= 0">+</span>
-									{{ detail_info.review_point == 0 ? detail_info.point : detail_info.review_point }}
-								</span>
-								<span class="color_green point" v-show="detail_info.point < 0 && detail_info.point">{{ detail_info.point }}</span>
-							</template>
-							<br />
-							<template>
-								<b style="font-size:13px;position: absolute;left:65px;top:45px">
-									<span v-if="detail_info.status == 1" style="color:#67C23A;">审批通过</span>
-									<span v-else-if="detail_info.status == 2" style="color:#F56C6C;">审批驳回</span>
-									<span v-else-if="detail_info.status == 0" style="color:#E6A23C;">待审批</span>
-									<span v-else></span>
-								</b>
+								<div class="flex-box flex-v-ce">
+									<span style="line-height:50px; margin-left:10px;margin-right:10px;">{{ detail_info.employee_name }}</span>
+									<span class="point" v-show="detail_info.point >= 0 && detail_info.point">
+										<span class="red" v-if="(detail_info.review_point == 0 ? detail_info.point : detail_info.review_point) > 0">+{{ detail_info.review_point == 0 ? detail_info.point : detail_info.review_point }}</span>
+										<span v-else class="green">{{ detail_info.review_point == 0 ? detail_info.point : detail_info.review_point }}</span>
+										<span style="margin-left: 5px;"> {{$getTypsName(detail_info.pt_id)}}</span>
+									</span>
+									<div style="margin-left: 5px;">
+										<span class="green point" v-show="detail_info.point < 0 && detail_info.point">{{ detail_info.point }}</span>
+										<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></span>
+									</div>
+								</div>
 							</template>
 						</el-col>
 					</el-row>
@@ -93,9 +93,9 @@
 									<template slot="title">
 										<div style="color: #303133;font-size:14px;margin-top:-2px;">
 											{{ item.name }} &nbsp;
-											<span v-if="item.remark == '待审核'" style="color:#E6A23C;font-size:13px">待审批</span>
-											<span v-else-if="item.remark == '审核通过'" style="color:#67C23A;font-size:13px">审批通过</span>
-											<span v-else-if="item.remark == '审核驳回'" style="color:#F56C6C;font-size:13px">审批驳回</span>
+											<span v-if="item.remark == '待审核'" class="yellow">待审批</span>
+											<span v-else-if="item.remark == '审核通过'" class="green">审批通过</span>
+											<span v-else-if="item.remark == '审核驳回'" class="red">审批驳回</span>
 											<span v-else>{{ item.remark }}</span>
 											<span style="color: #909399;font-size:12px;float:right">{{ item.time }}</span>
 										</div>
@@ -128,21 +128,13 @@
 				<el-form-item
 					label="审批意见"
 					prop="remark"
-					:rules="[
-						{ required: true, message: '请输入审批意见', trigger: 'blur' },
-						{
-							min: 3,
-							max: 50,
-							message: '长度在 3 到 50 个字符',
-							trigger: 'blur'
-						}
-					]"
+					:rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' },{min: 3,max: 50,message: '长度在 3 到 50 个字符',trigger: 'blur'}]"
 				>
 					<el-input type="textarea" :rows="4" v-model="rejectForm.remark" placeholder="请输入审批意见(限50字)"></el-input>
 				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="confirmReject('rejectForm')">确认驳回</el-button>
+				<el-form-item style="text-align: right; margin-bottom: 0">
 					<el-button @click="cancelReject('rejectForm')">取消</el-button>
+					<el-button type="primary" @click="confirmReject('rejectForm')">确认驳回</el-button>
 				</el-form-item>
 			</el-form>
 		</el-dialog>
@@ -150,7 +142,7 @@
 		<el-dialog title="审批通过" :visible.sync="adoptShow" width="571px" :before-close="adoptClose">
 			<el-form :model="adoptForm" ref="adoptForm" label-width="80px" v-loading="determinedBy">
 				<el-form-item label="指定规则" v-if="!detail_info.rule_id && !detail_info.item_id && detail_info.source_type != 4">
-					<el-switch v-model="adoptForm.ruleOrItem" active-color="#13ce66"></el-switch>
+					<el-switch v-model="adoptForm.ruleOrItem"></el-switch>
 				</el-form-item>
 				<el-form-item
 					label="分类"
@@ -241,7 +233,7 @@
 					<el-input :rows="4" type="textarea" v-model="adoptForm.remark" placeholder="说点什么(限100字)"></el-input>
 				</el-form-item>
 				<div style="padding-left: 80px">奖票用于优秀表现和重要事项的表彰</div>
-				<el-form-item label="发放奖票"><el-switch v-model="adoptForm.switch" active-color="#13ce66"></el-switch></el-form-item>
+				<el-form-item label="发放奖票"><el-switch v-model="adoptForm.switch"></el-switch></el-form-item>
 				<el-form-item label="递交审批">
 					<el-row>
 						<el-col :span="18">

src/home.vue

@@ -147,7 +147,6 @@
 										</div>
 									</div>
 									<userImage
-										:id="item.employee_id"
 										:img_url="item.employee_img_url"
 										fontSize="1"
 										:user_name="item.employee_name"
@@ -318,7 +317,7 @@
 								    ></userImage>
 								    <div class="rightexamineAndApproveList2">
 								      <p style="width:160px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#303133;font-size:16px"><b>{{item.employee_name}}{{item.source_type==1?'的积分任务':item.source_type==2?'的积分申请':item.source_type==3?'的积分录入':item.source_type==4?'的绩效工作':''}}</b></p>
-								      <p style="padding:10px 0;font-size:13px;line-height:20px;color:rgb(48, 49, 51);overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2; ">{{item.remark.rule || item.remark.customize}}</p>
+								      <p style="padding:10px 0;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2; ">{{item.remark.rule || item.remark.customize}}</p>
 								      <div style="display:flex;padding-bottom:10px;justify-content: space-between;">
 								        <span style="color:#909399">{{item.event_time}}</span>
 								        <div>
@@ -327,7 +326,7 @@
 								      </div>
 								    </div>
 								</div>
-							<div class="more" v-show="auditList.length >= 3" style="text-align: center;color: rgb(144, 147, 153);font-size: 14px; padding:16px 16px 0 16px; cursor: pointer;"  @click="$router.push({path: '/approval_list'})">查看更多</div>
+							<div class="more" v-show="auditList.length >= 3" style="text-align: center;color: #909399;font-size: 14px; padding:16px 16px 0 16px; cursor: pointer;"  @click="$router.push({path: '/approval_list'})">查看更多</div>
 						</div>
 					</div>
 				</el-row>
@@ -341,7 +340,7 @@
 						</div>
 
 						<div v-else style="display:flex;padding:20px 0 20px 0;">
-							<userImage width="45px" height="45px" :id="prize.id" :user_name="prize.name" fontSize=".9" style="margin-right:8px"></userImage>
+							<userImage width="45px" height="45px"  :user_name="prize.name" fontSize=".9" style="margin-right:8px"></userImage>
 							<div class="rightexamineAndApproveList" style="border:0px">
 								<p
 									style="width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#73767c;font-size:16px;display:flex;justify-content: space-between;"
@@ -353,7 +352,7 @@
 									</span>
 								</p>
 								<p
-									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:rgb(48, 49, 51);overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
 								>
 									{{ prize.remark ? prize.remark.customize : '' }}
 								</p>
@@ -372,7 +371,7 @@
 						</div>
 
 						<div v-else style="display:flex;padding:20px 0 20px 0;">
-							<userImage width="45px" height="45px" :id="buckle.id" :user_name="buckle.name" fontSize=".9" style="margin-right:8px"></userImage>
+							<userImage width="45px" height="45px"  :user_name="buckle.name" fontSize=".9" style="margin-right:8px"></userImage>
 							<div class="rightexamineAndApproveList">
 								<p
 									style="width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#73767c;font-size:16px;display:flex;justify-content: space-between;"
@@ -381,7 +380,7 @@
 									<span style="color:#FF9600;font-size:16px;">{{ buckle.point }} B分</span>
 								</p>
 								<p
-									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:rgb(48, 49, 51);overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
 								>
 									{{ buckle.remark ? buckle.remark.customize : '' }}
 								</p>

src/index.vue

@@ -127,11 +127,13 @@ export default {
 		this.routers=[
 			{name:'首页',children:this.returnRoutersArr('home'),icon:'icon-xuanzhong_shouye'},
 			{name:'A/B分',children:this.returnRoutersArr('abPoint'),icon:'icon-PC_gongzuotai_ABfen'},
-			{name:'任务',children:this.returnRoutersArr('task'),icon:'icon-PC_gongzuotai_renwu'},
-			{name:'工作台',children:this.returnRoutersArr('workbench'),icon:'icon-PC_gongzuotai_renwu'},
+			{name:'任务',children:this.returnRoutersArr('task'),icon:'icon-kaoqin_kaoqinyuebaobiao'},
 			{name:'统计',children:this.returnRoutersArr('ranking'),icon:'icon-dingdingPC_tongji'},
 			];
 		//this.$authoritys('权限名') 判断权限
+		if(this.$authoritys('creator') || this.$authoritys('admin') || this.$authoritys('point_manager')||this.$authoritys('dept_manager')){
+			this.routers.splice(3,0,{name:'工作台',children:this.returnRoutersArr('workbench'),icon:'icon-PC_gongzuotai_renwu'});
+		}
 		if(this.$authoritys('creator') || this.$authoritys('admin') || this.$authoritys('point_manager')){
 			this.routers.push({name:'设置',children:this.returnRoutersArr('set'),icon:'icon-dingdingPC_shezhi'})
 		}

src/init.vue

@@ -29,7 +29,7 @@ export default {
 			isRefresh: false,
 			disabled: false,
 			showBtnCunt: 0,
-			dialogFormVisible:false
+			dialogFormVisible:true
 		};
 	},
 	watch: {},

src/main.js

@@ -13,15 +13,15 @@ import service from './api/axios'
 import echarts from 'echarts'
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css'
-import { getToken, setToken,getUserData,setUserData,getTyps,setTyps,getIsCreator,supremeAuthority,authoritys} from './api/auth';
+import { getToken, setToken,getUserData,setUserData,getTyps,setTyps,getIsCreator,supremeAuthority,authoritys,getTypsName} from './api/auth';
 
 // 头像
 import userImage from '@/components/UserImage'
 Vue.component('userImage', userImage)
 Vue.use(ElementUI);
-// if (process.env.NODE_ENV === 'development') {
-//   new VConsole()
-// }
+if (process.env.NODE_ENV === 'development') {
+  new VConsole()
+}
 
 Vue.prototype.$echarts = echarts
 Vue.prototype.$dd=dd;
@@ -31,6 +31,7 @@ Vue.prototype.$getUserData = getUserData
 Vue.prototype.$setUserData = setUserData
 Vue.prototype.$getTyps = getTyps
 Vue.prototype.$setTyps = setTyps
+Vue.prototype.$getTypsName=getTypsName
 Vue.prototype.$getIsCreator = getIsCreator
 Vue.prototype.$supremeAuthority = supremeAuthority
 Vue.prototype.$authoritys = authoritys

src/views/abPoint/apply_list.vue

@@ -18,12 +18,12 @@
 		<el-table :data="dataList" stripe fit v-loading="table_loading" v-if="tabs == 'complete'" @row-click="openDetail">
 			<el-table-column label="申请内容" prop="remark">
 				<template slot-scope="scope">
-					{{ scope.row.remark.customize || scope.row.remark.rule }}
+					<span class="font-flex-word" style="max-width: 200px;">{{  scope.row.remark.customize  ||  scope.row.remark.rule}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="积分" prop="review_point" width="120">
 				<template slot-scope="scope">
-					<span :class="{ color_green: scope.row.review_point < 0, color_red: scope.row.review_point > 0 }">
+					<span :class="{ green: scope.row.review_point < 0, red: scope.row.review_point > 0 }">
 						<span v-show="scope.row.review_point > 0">+</span>
 						{{ scope.row.review_point }} {{ scope.row.pt_id == 3 ? 'B分' : scope.row.pt_id == 2 ? 'A分' : scope.row.pt_id == 1 ? '绩效分' : '' }}
 					</span>
@@ -112,15 +112,10 @@
 							<p style="margin-left: 10px;">{{ detail_info.employee_name }}</p>
 							<div v-show="detail_info.review_point != 0">
 								<p v-if="detail_info.status == 1">
-									<span
-										v-show="
+									<span v-show="
 											(detail_info.review_point >= 0 && detail_info.item_prize_type == 1) ||
 												(detail_info.review_point >= 0 && detail_info.item_prize_type == -1) ||
-												(detail_info.review_point >= 0 && detail_info.item_prize_type == 0)
-										"
-										style="color:#f56c6c;font-size:16px;padding-left:8px"
-									>
-										+{{ detail_info.review_point }}
+												(detail_info.review_point >= 0 && detail_info.item_prize_type == 0)"style="color:#f56c6c;padding-left:8px">+{{ detail_info.review_point }}
 									</span>
 									<span
 										v-show="
@@ -128,7 +123,7 @@
 												(detail_info.review_point <= 0 && detail_info.item_prize_type == -1) ||
 												(detail_info.review_point <= 0 && detail_info.item_prize_type == 0)
 										"
-										style="color:#67C23A;font-size:16px;padding-left:8px"
+										style="color:#67C23A;padding-left:8px"
 									>
 										{{ detail_info.review_point }}
 									</span>
@@ -330,13 +325,6 @@ export default {
 	padding: 20px;
 	min-height: calc(100vh - 160px);
 }
-.color_green {
-	color: #4bd964;
-}
-.color_red {
-	color: #f56c6c;
-}
-
 .detail_popup {
 	padding: 20px;
 	height: 90vh;

src/views/abPoint/award_punish.vue

@@ -29,12 +29,12 @@
 			
 			<el-table-column show-overflow-tooltip label="奖扣内容">
 				<template slot-scope="scope">
-					{{ scope.row.remark_data.customize }}
+					<span class="font-flex-word" style="max-width: 200px;">{{  scope.row.remark_data.customize}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column  label="积分" width="120">
 				<template slot-scope="scope">
-					<span :class="{ color_green: scope.row.point < 0, color_red: scope.row.point > 0 }">
+					<span :class="{green: scope.row.point < 0, red: scope.row.point > 0 }">
 						<span v-show="scope.row.point > 0">+</span>
 						{{ scope.row.point }} {{ point_name(scope.row.pt_id) }}
 					</span>
@@ -96,9 +96,9 @@
 						<div class="flex-box flex-v-ce">
 							<userImage :user_name="detail_info.employee_name" :img_url="detail_info.img_url" width="50px" height="50px" fontSize="1"></userImage>
 							<span style="line-height:50px; margin-left:10px;margin:0px 10px;">{{ detail_info.employee_name }}</span>
-							<span class="color_red point" v-show="detail_info.point >= 0 && detail_info.point"> +{{ detail_info.point }}</span>
-							<span class="color_green point" v-show="detail_info.point < 0 && detail_info.point"> {{ detail_info.point }}</span>
-							<span v-show="detail_info.point"> {{ detail_info.pt_id == 1 ? '绩效分' : detail_info.pt_id == 2 ? 'A分' : detail_info.pt_id == 3 ? 'B分' : '' }}</span>
+							<span class="red point" v-show="detail_info.point >= 0 && detail_info.point"> +{{ detail_info.point }}</span>
+							<span class="green point" v-show="detail_info.point < 0 && detail_info.point"> {{ detail_info.point }}</span>
+							<span v-show="detail_info.point" style="margin-left: 5px;"> {{ detail_info.pt_id == 1 ? '绩效分' : detail_info.pt_id == 2 ? 'A分' : detail_info.pt_id == 3 ? 'B分' : '' }}</span>
 						</div>
 					</el-col>
 				</el-row>
@@ -172,14 +172,11 @@
 									<userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
 								</template>
 								<template slot="title">
-									<div style="color: #303133;font-size:14px;margin-top:-2px;">
-										{{ item.name }} {{ item.remark }}
-										<!-- <span v-show="item.point !== 0">{{item.point}}</span> -->
-									</div>
+									<div style="color: #303133;font-size:14px;margin-top:-2px;">{{ item.name }} {{ item.remark }}</div>
 								</template>
 								<template slot="description" style="display:flex;">
-									<div style="color:rgb(130 130 130);">{{ item.time }}</div>
-									<div style="color:rgb(113 113 113);font-size:14px;margin-bottom:15px;">{{item.review_remark}}</div>
+									<div style="color:#828282;">{{ item.time }}</div>
+									<div style="color:#717171;font-size:14px;margin-bottom:15px;">{{item.review_remark}}</div>
 								</template>
 							</el-step>
 						</el-steps>
@@ -198,10 +195,10 @@
 					<el-col :span="24" >
 						<div class="flex-box flex-v-ce">
 						<userImage :user_name="detail_info.employee_name" width="50px" height="50px" fontSize="1"></userImage>
-						<span style="line-height:50px; margin-left:10px;margin:0px 10px;">{{ getEmployeeName(detail_info.applyor_id) }}</span>
-						<span class="color_red point" v-show="detail_info.point >= 0 && detail_info.point">+{{ detail_info.point }}</span>
-						<span class="color_green point" v-show="detail_info.point < 0 && detail_info.point">{{ detail_info.point }}</span>
-						<span v-show="detail_info.point">{{ detail_info.pt_id == 1 ? '绩效分' : detail_info.pt_id == 2 ? 'A分' : detail_info.pt_id == 3 ? 'B分' : '' }}</span>
+						<span style="line-height:50px; margin-left:10px;margin:0px 10px;">{{ detail_info.employee_name }}</span>
+						<span class="red point" v-show="detail_info.point >= 0 && detail_info.point">+{{ detail_info.point }}</span>
+						<span class="green point" v-show="detail_info.point < 0 && detail_info.point">{{ detail_info.point }}</span>
+						<span v-show="detail_info.point" style="margin-left: 5px;">{{ detail_info.pt_id == 1 ? '绩效分' : detail_info.pt_id == 2 ? 'A分' : detail_info.pt_id == 3 ? 'B分' : '' }}</span>
 						</div>
 					</el-col>
 				</el-row>
@@ -251,7 +248,7 @@
 									</div>
 								</template>
 								<template slot="description" style="">
-									<div style="color:rgb(130 130 130)">{{ item.time }}</div>
+									<div style="color:#828282">{{ item.time }}</div>
 								</template>
 							</el-step>
 						</el-steps>
@@ -545,12 +542,6 @@ export default {
 	padding: 20px;
 	min-height: calc(100vh - 160px);
 }
-.color_green {
-	color: #4bd964;
-}
-.color_red {
-	color: #f56c6c;
-}
 .detail_popup {
 	padding: 20px;
 	height: calc(100vh - 60px);

src/views/common/below/repeatTaskDetailsPopup.vue

@@ -41,7 +41,7 @@
           <el-col :span="24" style="line-height: 30px;">审批人</el-col>
           <el-col :span="24">
             <div style="display:flex">
-              <userImage class="fl" :id="workDetailData.reviewer_id" :user_name="workDetailData.reviewer_name" width="50px" height="50px" style=" margin-right: 15px;" fontSize="1"></userImage>
+              <userImage :user_name="workDetailData.reviewer_name" width="50px" height="50px" style=" margin-right: 15px;" fontSize="1"></userImage>
               <p style="margin: 0; line-height: 50px;">{{workDetailData.reviewer_name}}</p>
             </div>
           </el-col>
@@ -50,7 +50,7 @@
           <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;">
-              <userImage class="fl" :id="item.id" :user_name="item.name" width="50px" height="50px" style=" margin-right: 15px;" fontSize="1"></userImage>
+              <userImage  :user_name="item.name" width="50px" height="50px" style=" margin-right: 15px;" fontSize="1"></userImage>
               <p style="margin: 0; line-height: 50px;">{{item.name}}</p>
             </div>
           </el-col>

src/views/common/below/rewardTaskDetailsPopup.vue

@@ -7,9 +7,12 @@
         <el-row>
           <el-col :span="24">
             <div class="flex-box flex-v-ce">
-              <userImage style="margin-right: 15px;" width="50px" height="50px" class="fl" :id="workDetailData.owner_id" :user_name="workDetailData.owner_name" :img_url="workDetailData.owner_img_url"></userImage>
+              <userImage style="margin-right: 15px;" width="50px" height="50px" :user_name="workDetailData.owner_name" :img_url="workDetailData.owner_img_url"></userImage>
               <div>
-                <div style="line-height: 25px;">我悬赏的{{get_point_name(workDetailData.pt_id)}}任务    {{workDetailData.point_config.base_point}}{{get_point_name(workDetailData.pt_id)}}</div>
+                <div style="line-height: 25px;">我悬赏的{{$getTypsName(workDetailData.pt_id)}}任务 
+				<span v-if="workDetailData.point_config.base_point>0" class="red">+{{workDetailData.point_config.base_point}}</span>
+				<span v-else class="green">{{workDetailData.point_config.base_point}}</span>   
+				{{$getTypsName(workDetailData.pt_id)}}</div>
                 <div style="color: #909399; line-height: 25px;"><b>{{workDetailData.receiver_name}}</b> {{workDetailData.status_mark}}</div>
               </div>
             </div>
@@ -35,7 +38,7 @@
           </li>
           <li class="flex-box" v-if="workDetailData.point_config">
             <div class="label">任务积分</div>
-            <div class="content_text yellow">{{workDetailData.point_config.base_point}}{{get_point_name(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>
@@ -48,7 +51,7 @@
           <li class="flex-box" v-if="workDetailData.department_info" >
             <div class="label">可见范围</div>
             <div class="content_text">
-              <span v-for="(item,index) in workDetailData.department_info">{{item.name}}，</span>
+              <span v-for="(item,index) in workDetailData.department_info" :key="index">{{item.name}},</span>
             </div>
           </li>
           <li class="flex-box">
@@ -87,7 +90,6 @@
         workDetailData:{
           point_config:{base_point:''}
         },
-        point_types: JSON.parse(localStorage.getItem('types'))
       }
     },
     components: {},
@@ -114,16 +116,6 @@
           self.loading = false
         })
       },
-      // 获取积分名称
-      get_point_name(id){
-        let name = ''
-        this.point_types.forEach(element => {
-          if (element.id == id) {
-            name = element.name
-          }
-        });
-        return name
-      },
     }
   }
 </script>

src/views/common/below/taskDetailsPopup.vue

@@ -10,8 +10,13 @@
             <div>{{workDetailData.employee_name}}</div>
             <div v-if="detailType != 2 && workDetailData.dept_list[0]">{{workDetailData.dept_list[0].dept_name}}</div>
           </div>
-          <!-- 为了在抽屉打开之后获取焦点 -->
-          <el-button type="text" style="padding: 0; margin: 0; visibility: hidden;">test</el-button>
+		  <div style="margin-left: 5px;" class="flex-box flex-v-ce">
+			  <div v-if="workDetailData.point_config.base_point>0" class="red">+{{workDetailData.point_config.base_point}}</div>
+			  <div v-else class="green">{{workDetailData.point_config.base_point}}</div>
+			  <div style="margin-left: 5px;"> {{$getTypsName(workDetailData.pt_id)}}</div>
+			 
+		  </div>
+		  
         </div>
         <ul>
           <li class="flex-box">
@@ -24,11 +29,11 @@
           </li>
           <li class="flex-box">
             <div class="label">任务积分</div>
-            <div class="content_text yellow">{{workDetailData.point_config.base_point}}{{workDetailData.pt_name}}</div>
+            <div class="content_text">{{workDetailData.point_config.base_point}}{{workDetailData.pt_name}}</div>
           </li>
           <li class="flex-box" v-if="workDetailData.point_config.review_point">
             <div class="label">最终分</div>
-            <div class="content_text yellow">{{workDetailData.point_config.review_point}}</div>
+            <div class="content_text">{{workDetailData.point_config.review_point}}</div>
           </li>
           <li class="flex-box">
             <div class="label">截止时间</div>
@@ -136,10 +141,9 @@
       }
     },
     data() {
-      // let getId = this.id
       return {
         Delay_to_open:false,//打开抽屉
-        
+
         loading: false,
         workDetailData:{
           process:[],
@@ -154,14 +158,11 @@
         point_total:0,
         isIntegral:false,
         point_list:[],
-        // userId:this.$store.getters.user_info.id,
         activeName: "work",
         getDataUrl: '/api/integral/work',
-        params: {}
+        params: {},
       }
     },
-    components: {},
-    watch:{},
     mounted() {
       this.detailType == 2?this.getDataUrl = '/api/integral/schedule':this.getDataUrl = '/api/integral/work'
       this.$nextTick(() => {
@@ -169,9 +170,7 @@
         this.Delay_to_open = this.visible//更换打开抽屉时机，避免打开两次
       })
     },
-    created() {
-    },
-    methods: {
+    methods: {	
       // 关闭弹窗
       handleClose(){
         this.$emit('update:visible', false)
@@ -203,7 +202,6 @@
     }
     & .d_userMessage div:nth-child(1){
       font-size: 16px;
-      margin-bottom: 8px;
     }
     & .d_userMessage div:nth-child(2){
       font-size: 12px;

src/views/ranking/attendance_rating.vue

@@ -47,7 +47,7 @@
 				<el-table-column label="姓名" align="left">
 					<template slot-scope="scope">
 						<div style="display:flex;">
-							<userImage class="fl" :id="scope.row.id" :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
+							<userImage :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
 							<span style="line-height: 50px; padding-left: 10px;">{{ scope.row.name }}</span>
 						</div>
 					</template>

src/views/ranking/custom_rank code.vue

@@ -61,7 +61,7 @@
 							<el-table-column label="姓名" align="left">
 								<template slot-scope="scope">
 									<div class="flex-box">
-										<userImage class="fl" :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
+										<userImage  :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
 										<span style="line-height: 50px; padding-left: 10px;">{{ scope.row.name }}</span>
 									</div>
 								</template>
@@ -127,7 +127,7 @@
 					<el-input v-model="newGroupFormRules" placeholder="全部规则分类"></el-input>
 					<div @click="ruleDialogTableVisibles" style="height:36px; position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: 9;cursor:pointer"></div>
 					<div style="margin-bottom:12px;">
-						<span style="font-size:13px;color:rgb(138 138 138);position: absolute; top: 30px; left: 0;">{{ ruleHint }}</span>
+						<span style="font-size:13px;color:#8a8a8a;position: absolute; top: 30px; left: 0;">{{ ruleHint }}</span>
 					</div>
 					<el-dialog title="选择规则" width="800px" :visible.sync="ruleDialogTableVisible" append-to-body :before-close="handleClose">
 						<div style="display:flex;position: relative;width:100%;height:40px">
@@ -435,7 +435,6 @@ export default {
 		export_quarter_confirm(val) {
 			this.time.quarter = val;
 			this.params.page = 1;
-			console.log('1');
 			this.open_right(this.clickItem);
 		},
 		//此方法：拿到当前点击规则分类的所有子节点ID,（为了包含子分类 规则）
@@ -722,15 +721,12 @@ export default {
 		},
 		// 打开右边列表
 		open_right(item) {
-			console.log(item);
 			this.table_loading = true;
 			this.clickItem = item;
-
 			if (!item) {
 				this.table_loading = false;
 				return false;
 			}
-
 			let data = JSON.parse(JSON.stringify(this.params));
 			data.rule ? '' : delete data.rule;
 			data.group_id = item.id;

src/views/ranking/custom_rank.vue

@@ -93,8 +93,6 @@
 							<template slot-scope="scope">
 								<div class="flex-box">
 									<userImage
-										class="fl"
-										:id="scope.row.employee_id"
 										:user_name="scope.row.name"
 										:img_url="scope.row.img_url"
 										width="50px"
@@ -160,7 +158,7 @@
 					<el-input auto-complete="off" v-model="newGroupFormRules" placeholder="全部规则分类"></el-input>
 					<div @click="ruleDialogTableVisibles" style="height:36px; position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: 9;cursor:pointer"></div>
 					<div style="margin-bottom:12px;">
-						<span style="font-size:13px;color:rgb(138 138 138);position: absolute; top: 30px; left: 0;">{{ ruleHint }}</span>
+						<span style="font-size:13px;color:#8a8a8a;position: absolute; top: 30px; left: 0;">{{ ruleHint }}</span>
 					</div>
 					<el-dialog title="选择规则" width="952px" :visible.sync="ruleDialogTableVisible" @close="closeNone" append-to-body :before-close="handleClose">
 						<div style="display:flex;position: relative;width:100%;height:40px">
@@ -433,28 +431,10 @@ export default {
 				selectionID = diff.concat(tmp);
 			} else {
 				//全选
-				console.log('true');
 			}
 			selecteds = [...new Set(selectionID)];
 			this.valuesOrLength = selecteds;
 		},
-		// //获取分类规则
-		// get_rule_trees() {
-		//   let self = this;
-		//   let params = {
-		//     pt_id: '3'
-		//   };
-		//   self.$axios('get','/api/integral/rule/trees',params)
-		//     .then(res => {
-		//       if (res.data.code == 1) {
-		//         self.treedata = res.data.data.rule_tree; //分类
-		//         this.itemList = res.data.data.item_list; //规则
-		//       } else {
-		//         self.$message.error(res.data.data.msg);
-		//       }
-		//     })
-		//     .finally(() => {});
-		// },
 		// 递归判断列表，把最后的children设为undefined
 		getTreeData(data) {
 			for (var i = 0; i < data.length; i++) {
@@ -570,7 +550,6 @@ export default {
 		},
 		onTableSelect(rows, row) {
 			let selected = rows.length && rows.indexOf(row) !== -1;
-			// console.log(selected)  // true就是选中，0或者false是取消选中
 			if (selected) {
 				selecteds.push(row.id);
 			} else {
@@ -580,7 +559,6 @@ export default {
 					}
 				}
 			}
-			// console.log(selecteds)
 		},
 		//规则弹窗选中时
 		handleSelectionChange(val) {},
@@ -618,7 +596,6 @@ export default {
 		},
 		// 树型菜单点击筛选
 		handleCheckChange(check, param) {
-			// console.log("ddd");
 		},
 		getRuletableData_rule(data) {
 			let tableData_ruleP = [];
@@ -639,10 +616,6 @@ export default {
 		},
 
 		treeOpen() {
-			// let that = this;
-			// setTimeout(function() {
-			//   that.getHeight();
-			// }, 500)
 		},
 
 		//点击编辑
@@ -845,7 +818,6 @@ export default {
 		},
 		open_right(item, tim) {
 			if (tim) {
-				// console.log(this.newGroupForm.date_interval)
 				this.time = {
 					year: moment().format('YYYY'), //年
 					quarter: moment().format('YYYYQ'), //季度

src/views/ranking/department_statistics.vue

@@ -189,7 +189,7 @@
                         />
                       </b>
                       <span
-                        style="color:rgb(48, 49, 51);font-size:14px;margin-top:5px;display:block;"
+                        style="color:#303133;font-size:14px;margin-top:5px;display:block;"
                         >{{ item.name }}</span
                       >
                     </p>
@@ -316,7 +316,6 @@
                 <userImage
                   width="45px"
                   height="45px"
-                  :id="prize.id"
                   :user_name="prize.name"
                   fontSize=".9"
                   style="margin-right:8px"
@@ -334,7 +333,7 @@
                     >
                   </p>
                   <p
-                    style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:rgb(48, 49, 51);overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+                    style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
                   >
                     {{ prize.remark ? prize.remark.customize : "" }}
                   </p>
@@ -362,7 +361,6 @@
                 <userImage
                   width="45px"
                   height="45px"
-                  :id="buckle.id"
                   :user_name="buckle.name"
                   fontSize=".9"
                   style="margin-right:8px"
@@ -379,7 +377,7 @@
                     >
                   </p>
                   <p
-                    style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:rgb(48, 49, 51);overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+                    style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
                   >
                     {{ buckle.remark ? buckle.remark.customize : "" }}
                   </p>

src/views/ranking/deptRankSwiper.vue

@@ -17,7 +17,7 @@
               <el-row  v-for="(item,index) in list" :key="index" class="row">
                 <el-col :span="4">
                   <center>
-                    <userImage :id="item.employee_id" :user_name="item.employee_name" :img_url="item.employee_img_url" fontSize="1.8" width="80px" height="80px"></userImage>
+                    <userImage  :user_name="item.employee_name" :img_url="item.employee_img_url" fontSize="1.8" width="80px" height="80px"></userImage>
                   </center>
                 </el-col>
                 <el-col :span="20">
@@ -25,7 +25,7 @@
                     <el-row>
                       <el-col :span="8">{{item.employee_name}}</el-col>
                       <el-col :span="16">
-                        <span style="margin-left: 30px;" :class="item.point>0?'color_red':'color_green'">{{item.point>0?'+'+item.point:item.point}}分</span>
+                        <span style="margin-left: 30px;" :class="item.point>0 ? 'red':'green'">{{item.point>0?'+'+item.point:item.point}}分</span>
                       </el-col>
                     </el-row>
                   </p>
@@ -155,10 +155,4 @@
       }
     }
   }
-  .color_red{
-    color: red;
-  }
-  .color_green{
-    color:green
-  }
 </style>

src/views/ranking/dept_rank.vue

@@ -106,7 +106,7 @@
 				<el-table-column label="姓名" align="left">
 					<template slot-scope="scope">
 							<div class="flex-box">
-								<userImage	class="fl" :user_name="scope.row.employee_name"	:img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
+								<userImage	:user_name="scope.row.employee_name" :img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
 								<span style="line-height: 50px; padding-left: 10px;">{{ scope.row.employee_name }}</span>
 							</div>
 					</template>
@@ -302,7 +302,6 @@ export default {
 				// for (var i in val) {
 				//   dept_id.push(val[i][0]);
 				// }
-				// console.log(dept_id);
 				// this.formData.dept_id = dept_id;//传入选中的部门ID,是数组
 				this.formData.dept_id = val[val.length - 1];
 			} else {
@@ -578,9 +577,6 @@ export default {
 .date-picker-width {
 	width: 100% !important;
 }
-.color_green {
-	color: #67c23a;
-}
 .nopoint_box {
 	display: inline-block;
 	text-align: center;
@@ -697,15 +693,3 @@ export default {
 	padding: 9px 20px 7px 10px;
 }
 </style>
-<style lang="scss">
-// .el-cascader-menu .el-cascader-menu__wrap .el-scrollbar__view li.el-cascader-node {
-//   height: auto;
-//   max-width: 500px;
-//   .el-cascader-node__label {
-//     white-space: initial;
-//     overflow: initial;
-//     text-overflow: initial;
-//   }
-// }
-</style>
-<!--  -->

src/views/ranking/individual_statistics.vue

@@ -52,7 +52,7 @@
 							<el-row :gutter="40" style="margin:0;padding:0;">
 								<el-col :span="24" class="user_info" style="display:flex;" v-loading="personnelMessage">
 									<div class="headimg fl" style=" margin: 0 10px 0 20%;">
-										<userImage :id="personnel.id" :img_url="personnel.img_url" :user_name="personnel.name" fontSize="1" width="50px" height="50px"></userImage>
+										<userImage  :img_url="personnel.img_url" :user_name="personnel.name" fontSize="1" width="50px" height="50px"></userImage>
 									</div>
 									<div style="width:100%;">
 										<div
@@ -661,8 +661,6 @@ export default {
 						} else {
 							legendData2.push(lists[i].name + ' ' + '奖' + lists[i].reward + ' ' + '扣' + lists[i].deduction + ' ' + lists[i].ratio + '%');
 						}
-						// console.log(lists.length/2)
-
 						let dataListDx = {};
 						if (lists[i].ratio < 0) {
 							dataListDx.value = 0;
@@ -674,7 +672,6 @@ export default {
 						dadalist.push(dataListDx);
 					}
 					//分为两列展示，多传legendData2
-					// this.drawLine(legendData1, legendData2, dadalist); //图表
 					this.drawLine(legendData1, dadalist); //图表
 				})
 				.finally(() => {
@@ -1032,6 +1029,6 @@ box-sizing: content-box;
 }
 .popperSPBOX {
 	max-width: calc(100vh - 400px);
-	background-color: rgb(255, 255, 255);
+	background-color:#fff;
 }
 </style>

src/views/ranking/integral_event.vue

@@ -67,7 +67,7 @@
 					<el-table-column prop="employee_name" label="姓名" align="left" width="200px">	
 						<template slot-scope="scope">
 							<div class="flex-box">
-								<userImage	class="fl" :user_name="scope.row.employee_name"	:img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
+								<userImage :user_name="scope.row.employee_name"	:img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
 								<span style="line-height: 50px; padding-left: 10px;">{{ scope.row.employee_name }}</span>
 							</div>
 						</template>
@@ -75,7 +75,7 @@
 					<el-table-column prop="dept" label="部门" align="left" width="200px"></el-table-column>
 					<el-table-column prop="point" label="积分" align="left" width="80px">
 						<template slot-scope="scope">
-							<span :class="scope.row.point < 0 ? 'color_green' : 'color_red'">{{ scope.row.point }} {{ point_name(scope.row.pt_id) }}</span>
+							<span :class="scope.row.point < 0 ? 'green' : 'red'">{{ scope.row.point }} {{ point_name(scope.row.pt_id) }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column prop="remark" show-overflow-tooltip label="事件" align="left"></el-table-column>
@@ -121,8 +121,8 @@
 					<div class="flex-box flex-v-ce">
 						<userImage :user_name="detail_info.employee_name" width="50px" height="50px" fontSize="1"></userImage>
 						<span style="font-size: 18px;line-height:50px; margin-left:10px;margin-right:4px;">{{ detail_info.employee_name }}</span>
-						<span class="color_red point" v-show="detail_info.point >= 0">+{{ detail_info.point }} {{ point_name(detail_info.pt_id) }}</span>
-						<span class="color_green point" v-show="detail_info.point < 0">{{ detail_info.point }} {{ point_name(detail_info.pt_id) }}</span>
+						<span class="red point" v-show="detail_info.point >= 0">+{{ detail_info.point }} {{ point_name(detail_info.pt_id) }}</span>
+						<span class="green point" v-show="detail_info.point < 0">{{ detail_info.point }} {{ point_name(detail_info.pt_id) }}</span>
 					</div>
 				</el-row>
 
@@ -190,8 +190,8 @@
 									<div style="color: #303133;font-size:14px;margin-top:-2px;">
 										{{ item.name }} {{ item.remark }}
 										<strong style="font-weight: 500;">
-											<span class="color_red point" v-show="item.review_point > 0">+{{ item.review_point }}</span>
-											<span class="color_green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
+											<span class="red point" v-show="item.review_point > 0">+{{ item.review_point }}</span>
+											<span class="green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
 										</strong>
 									</div>
 								</template>
@@ -645,9 +645,6 @@ header.el-drawer__header {
 		width: 330px;
 	}
 }
-.color_green {
-	color: #67c23a;
-}
 .pagination {
 	padding: 20px 0;
 }
@@ -677,12 +674,6 @@ header.el-drawer__header {
 		}
 	}
 }
-.color_red {
-	color: #f56c6c;
-}
-.color_green {
-	color: #67c23a;
-}
 span.point {
 	font-size: 16px;
 }

src/views/ranking/lotteryTicket_statistics.vue

@@ -56,7 +56,6 @@
               <div style="display:flex">
                 <span class="fl">
                   <userImage
-                    :id="scope.row.id"
                     width="50px"
                     height="50px"
                     fontSize="1"

src/views/ranking/manager_statistics.vue

@@ -63,7 +63,7 @@
 						<el-table-column label="管理者">
 							<template slot-scope="scope">
 								<div class="flex-box flex-v-ce">
-									<userImage class="fl" :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
+									<userImage :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
 									<span style=" margin-left: 10px; line-height: 50px; display: inline-block;">{{ scope.row.name }}</span>
 								</div>
 							</template>
@@ -161,7 +161,7 @@
 						<el-table-column label="管理者">
 							<template slot-scope="scope">
 								<div class="flex-box flex-v-ce">
-									<userImage class="fl" :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
+									<userImage  :user_name="scope.row.name" :img_url="scope.row.img_url" width="50px" height="50px"></userImage>
 									<span style=" margin-left: 10px; line-height: 50px; display: inline-block;">{{ scope.row.name }}</span>
 								</div>
 							</template>
@@ -637,9 +637,9 @@ export default {
 
 // 滚动条样式
 .chart_content::-webkit-scrollbar-track {
-	-webkit-box-shadow: inset 0 0 5px rgb(255, 255, 255);
+	-webkit-box-shadow: inset 0 0 5px #fff;
 	border-radius: 5px;
-	background-color: rgb(255, 255, 255);
+	background-color: #fff;
 }
 .chart_content::-webkit-scrollbar {
 	width: 5px;
@@ -648,7 +648,7 @@ export default {
 .chart_content::-webkit-scrollbar-thumb {
 	border-radius: 5px;
 	-webkit-box-shadow: inset 0 0 5px rgb(153, 145, 145) (160, 154, 154);
-	background-color: rgb(168, 167, 167);
+	background-color: #a8a7a7;
 }
 
 .dataItem {

src/views/ranking/total_rank.vue

@@ -37,7 +37,7 @@
 				<el-table-column label="姓名" align="left">
 					<template slot-scope="scope">
 						<div class="flex-box">
-							<userImage	class="fl" :user_name="scope.row.employee_name"	:img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
+							<userImage :user_name="scope.row.employee_name"	:img_url="scope.row.employee_img_url" width="50px" height="50px"></userImage>
 							<span style="line-height: 50px; padding-left: 10px;">{{ scope.row.employee_name }}</span>
 						</div>
 					</template>
@@ -265,9 +265,6 @@ export default {
 .date-picker-width {
 	width: 100% !important;
 }
-.color_green {
-	color: #67c23a;
-}
 .nopoint_box {
 	display: inline-block;
 	text-align: center;

src/views/set/framework.vue

@@ -67,14 +67,9 @@
 						<el-table-column prop="accedence_time" label="入职时间"></el-table-column>
 						<el-table-column prop="accedence_time" label="是否参与排名" align="center">
 							<template slot-scope="scope">
-								<span
-									class="participateRank"
-									:style="scope.row.is_ranking == 1 ? 'color:#409eff' : 'color:rgb(255 83 70)'"
-									@click="rankingtakePartIn(scope.row.id, scope.row.is_ranking)"
-								>
+								<span class="participateRank" :style="scope.row.is_ranking == 1 ? 'color:#409eff' : 'color:#F56C6C'"   @click="rankingtakePartIn(scope.row.id, scope.row.is_ranking)">
 									{{ scope.row.is_ranking == 1 ? '参与' : '不参与' }}
 								</span>
-								<!-- <span>不参与</span> -->
 							</template>
 						</el-table-column>
 						<el-table-column label="启用积分管理">

src/views/set/jurisdiction.vue

@@ -49,7 +49,7 @@
 							<el-table-column prop="name" label="姓名">
 								<template slot-scope="scope">
 									<div class="flex-box flex-v-ce">
-										<userImage class="fl" width="50px" height="50px" :img_url="scope.row.img_url" :user_name="scope.row.name"></userImage>
+										<userImage  width="50px" height="50px" :img_url="scope.row.img_url" :user_name="scope.row.name"></userImage>
 										<span style="margin-left: 10px; line-height: 50px;">{{ scope.row.name }}</span>
 									</div>
 								</template>
@@ -90,7 +90,7 @@
 						<el-table-column prop="name" label="姓名" width="150" fixed>
 							<template slot-scope="scope">
 								<div class="flex-box flex-v-ce">
-									<userImage class="fl" width="50px" height="50px" :img_url="scope.row.img_url" :user_name="scope.row.name"></userImage>
+									<userImage width="50px" height="50px" :img_url="scope.row.img_url" :user_name="scope.row.name"></userImage>
 									<span style="margin-left: 10px; line-height: 50px;">{{ scope.row.name }}</span>
 								</div>
 							</template>

src/views/set/log.vue

@@ -10,7 +10,7 @@
 				<el-table-column label="日志名称" prop="name"></el-table-column>
 				<el-table-column label="日志积分规则">
 					<template slot-scope="scope">
-						<span>{{ getMoney(scope.row.interval) }}{{ scope.row.config.upper_limit }}汇报,每次奖{{ scope.row.config.point }} B分</span>
+						<span>{{getMoney(scope.row.interval)}}<span v-if="scope.row.config.upper_limit>0">{{scope.row.config.upper_limit }}</span>汇报,每次奖{{ scope.row.config.point }} B分</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="状态">
@@ -19,7 +19,7 @@
 						<span v-else class="green">已启用</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="">
+				<el-table-column label="操作">
 					<template slot-scope="scope">
 						<div @click.stop="openSet(scope.row)"><span class="lookQrcode">设置</span></div>
 					</template>
@@ -31,14 +31,26 @@
 		</div>
 		<el-dialog title="设置" :visible.sync="dialogVisible" top="25vh" width="520px">
 			<el-form label-width="110px" :model="selectItem" ref="setForm">
-				<el-form-item label="是否启用"><el-switch v-model="selectItem.enable" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch></el-form-item>
+				<el-form-item label="是否启用"><el-switch v-model="selectItem.enable"></el-switch></el-form-item>
 				<el-form-item label="日志名称" prop="name" :rules="[{ required: true, message: '请输入日志名称'}]">
-					  <el-popover placement="top-start" title="温馨提示" width="200" trigger="hover" content="日志名称必须与钉钉预设模板名称一致,否则可能会无法同步钉钉的日志记录">
-						 <el-input style="width: 200px;" v-model="selectItem.name" slot="reference"></el-input>
-					  </el-popover>
+					 <div class="flex-box flex-v-ce">
+						 <div class="font-flex-word name">{{selectItem.name}}</div>
+						 <div class="blue" @click="showName(selectItem.name)">修改</div>
+					 </div>
+					 <el-dialog title="设置名称" :visible.sync="isShowName" top="25vh" width="520px" append-to-body>
+						 <div style="text-align: center;">
+							  <!-- <el-popover placement="top-start" title="温馨提示" width="200" trigger="hover" content="日志名称必须与钉钉预设模板名称一致,否则可能会无法同步钉钉的日志记录"> -->
+								 <el-input style="width: 200px;" v-model="nameVal" slot="reference"></el-input>
+							  <!-- </el-popover> -->
+							  <div  class="yellow" style="margin-top: 10px;">*日志名称必须与钉钉预设模板名称一致,<br/>否则可能会无法同步钉钉的日志记录*</div>
+							  <div class="flex-box-end" style="margin-top: 20px;">
+								  <el-button @click="isShowName = false">取消</el-button>
+								  <el-button type="primary" @click="submitName()">确定</el-button>
+							  </div>
+						  </div>
+					 </el-dialog>
 				</el-form-item>
-				<!-- <div style="margin-left: 110px;" class="yellow">*日志名称必须与钉钉预设模板名称一致</div> -->
-				<div class="title">日志汇报要求</div>
+				<div class="title">日志积分规则</div>
 				<el-form-item label="日志汇报要求" prop="interval" :rules="[{ required: true, message: '请选择汇报要求'}]">
 					  <el-select class="widthInput"  v-model="selectItem.interval" placeholder="请选择">
 					    <el-option v-for="item in options"  :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -89,12 +101,26 @@ export default {
 			  value: 3,
 			  label: '每月'
 			}],
+			isShowName:false,
+			nameVal:"",
 		};
 	},
 	mounted() {
 		this.getList();
 	},
 	methods: {
+		submitName(){
+			if(!this.nameVal||this.nameVal==null||this.nameVal==undefined){
+				this.$message.error("请输入日志名称");
+				return
+			}
+			this.selectItem.name=this.nameVal
+			this.isShowName=false;
+		},
+		showName(name){
+			this.nameVal=name;
+			this.isShowName=true;
+		},
 		submit(fromName) {
 			this.$refs[fromName].validate(valid => {
 				if (valid) {
@@ -179,4 +205,8 @@ export default {
 .lookQrcode:hover {
 	color: #2490fd;
 }
+.name{
+	max-width: 200px;
+	margin-right: 10px;
+}
 </style>

src/views/set/systemLayout.vue

@@ -2,31 +2,47 @@
 	<div class="all padding-20" v-loading="loading">
 		<el-tabs v-model="activeName" @tab-click="handleClick" class="tab-container">
 			<el-tab-pane label="基本设置" name="first">
-				<div class="integralApproval">
+				<div class="integralApproval" style="margin-top: 30px;">
 					<b>积分审批</b>
-					<p>当前系统审批流程<a @click="approvalProcess">查看图例</a></p>
-					<div style="margin-top:10px;">
-						<span>指定规则的审批或奖扣分，均可直接通过</span>
-						<el-tooltip placement="top">
-							<div class="toolCont" slot="content">开启后，按照系统已有的积分规则制度提交的审批或者奖扣可即使审批人/录分人的权限分不足，也能审批通过</div>
-							<span class="initia_mark">?</span>
-						</el-tooltip>
-						<el-switch style="margin-left:30px;" v-model="examine" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch>
+					<p>
+						当前系统审批流程
+						<a @click="approvalProcess">查看图例</a>
+					</p>
+					<div style="margin-top:5px;" class="fontColorF"><span>指定规则的审批或奖扣分，均可直接通过</span></div>
+				</div>
+				<div class="integralApproval">
+					<b>
+						指定规则的审批或奖扣分免审
+						<el-switch style="margin-left:30px;" v-model="examine"></el-switch>
+					</b>
+					<div style="margin-top:5px;" class="fontColorF">
+						<div>开开启后，按照系统已有的积分规则制度提交的审批或者奖扣可直接通过；</div>
+						<div>即使审批人/录分人的权限分不足，也能审批通过</div>
 					</div>
 				</div>
 				<div class="integralApproval">
-					<b>A分转B分 <el-switch style="margin-left:30px;" v-model="isApB" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch></b>
-					<div class="flex-box flex-v-ce" style="margin-top:10px;" v-if="isApB">1A分=<el-input v-model.number="pointNum" autofocus="0" class="pointNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input> B分</div>
-					<div style="margin-top:10px;">
-						<div>开启后,每奖/扣1条A分,额外产生一条分值按比例转换后的B分记录;</div>
-						<div>列如:设置1A分=10B分时,因表现出色奖励10A分的同时,额外奖励100B分。</div>
+					<b>
+						A分转B分
+						<el-switch style="margin-left:30px;" v-model="isApB"></el-switch>
+					</b>
+					<div class="flex-box flex-v-ce" style="margin-top:10px;" v-if="isApB">
+						1A分=
+						<el-input v-model.number="pointNum" autofocus="0" class="pointNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+						B分
+					</div>
+					<div style="margin-top:5px;" class="fontColorF">
+						<div>开启后，每奖/扣1条A分，额外产生一条分值按比例转换后的B分记录；</div>
+						<div>例如：设置1A分=10B分时，因表现出色奖10A分的同时，额外奖100B分。</div>
 					</div>
 				</div>
 				<div class="integralApproval">
-					<b>管理者审批计入奖扣分任务 <el-switch style="margin-left:30px;" v-model="task_review" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch></b>
-					<div style="margin-top:10px;">
-						<div>系统默认的管理者奖扣任务只包含管理者主动给员工奖扣的积分;</div>
-						<div>开启后,审批员工申请的积分和任务也会记入Ta的奖扣分任务内</div>
+					<b>
+						管理者审批计入奖扣分任务
+						<el-switch style="margin-left:30px;" v-model="task_review"></el-switch>
+					</b>
+					<div style="margin-top:5px;" class="fontColorF">
+						<div>系统默认的管理者奖扣任务只包含管理者主动给员工奖扣的积分；</div>
+						<div>开启后，审批员工申请的积分和任务也会记入Ta的奖扣分任务内</div>
 					</div>
 				</div>
 				<el-button type="primary" class="save" @click="saveFirst('first')">保存</el-button>
@@ -36,10 +52,26 @@
 					<div v-for="(item, index) in informText" :key="index" style="margin-top:30px;">
 						<p>
 							<b style="font-size:16px;">{{ item.title }}</b>
-							<el-switch v-if="item.switchs == 0" style="margin:-6px 0 0 30px;" v-model="individualPoints" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch>
-							<el-switch v-if="item.switchs == 1" style="margin:-6px 0 0 30px;" v-model="pointManagement" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch>
-							<el-switch v-if="item.switchs == 2" style="margin:-6px 0 0 30px;" v-model="taskToInform" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch>
-							<el-switch v-if="item.switchs == 3" style="margin:-6px 0 0 30px;" v-model="approvalNotice" active-color="#13ce66" inactive-color="rgb(202 202 202)"></el-switch>
+							<el-switch
+								v-if="item.switchs == 0"
+								style="margin:-6px 0 0 30px;"
+								v-model="individualPoints"
+							></el-switch>
+							<el-switch
+								v-if="item.switchs == 1"
+								style="margin:-6px 0 0 30px;"
+								v-model="pointManagement"
+							></el-switch>
+							<el-switch
+								v-if="item.switchs == 2"
+								style="margin:-6px 0 0 30px;"
+								v-model="taskToInform"
+							></el-switch>
+							<el-switch
+								v-if="item.switchs == 3"
+								style="margin:-6px 0 0 30px;"
+								v-model="approvalNotice"
+							></el-switch>
 						</p>
 						<p>{{ item.ram }}</p>
 						<p v-if="item.checkboxs && individualPoints">
@@ -77,16 +109,13 @@ export default {
 			],
 			dialogVisible: false,
 			//A转B
-			pointNum:0,
-			isApB:false,
-			
+			pointNum: 0,
+			isApB: false,
+
 			// 管理者奖扣记入
-			task_review:false,
+			task_review: false
 		};
 	},
-	components: {},
-	watch: {},
-	created() {},
 	mounted() {
 		this.cheakAx('first');
 	},
@@ -104,17 +133,17 @@ export default {
 			let data = {};
 			if (name == 'first') {
 				data.rule_limit_check = this.examine ? 0 : 1;
-				data.task_review=this.task_review ? 1:0;
-				if(this.isApB){
-					if(this.pointNum==0||!this.pointNum){
+				data.task_review = this.task_review ? 1 : 0;
+				if (this.isApB) {
+					if (this.pointNum == 0 || !this.pointNum) {
 						this.$message({
-							message: "A转B分,分值不能空或者零",
+							message: 'A转B分,分值不能空或者零',
 							type: 'error'
 						});
 						return;
 					}
 				}
-				this.isApB ? (data.a2b = this.pointNum):(data.a2b = 0)
+				this.isApB ? (data.a2b = this.pointNum) : (data.a2b = 0);
 			} else {
 				data.report_integral_daily = this.individualPoints ? 1 : 0;
 				this.individualPoints ? (data.report_integral_daily_a = this.checked ? 1 : 0) : '';
@@ -143,9 +172,9 @@ export default {
 					let data = res.data.data;
 					if (name == 'first') {
 						this.examine = data.rule_limit_check == 0 ? true : false;
-						this.isApB=data.a2b== 0 ? false : true;
-						this.task_review=data.task_review==1?true:false
-						this.pointNum=data.a2b
+						this.isApB = data.a2b == 0 ? false : true;
+						this.task_review = data.task_review == 1 ? true : false;
+						this.pointNum = data.a2b;
 					} else {
 						this.individualPoints = data.report_integral_daily == 1 ? true : false;
 						this.checked = this.individualPoints ? (data.report_integral_daily_a == 1 ? true : false) : false;
@@ -163,11 +192,16 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.el-input__inner {
+	height: 35px;
+	line-height: 35px;
+}
 .integralApproval {
-	margin-top: 20px;
-	.pointNum{
+	margin-bottom: 40px;
+	.pointNum {
 		width: 100px;
 		margin: 0 10px;
+		height: 35px;
 	}
 	b {
 		font-size: 16px;

src/views/set/voluntarilyPoint.vue

@@ -62,8 +62,7 @@
 								<template slot-scope="scope">
 									<div style="display:flex">
 										<span class="fl">
-											<userImage
-												:id="scope.row.employee_id"
+											<userImage	
 												width="50px"
 												height="50px"
 												:user_name="scope.row.employee.name"
@@ -288,17 +287,6 @@ export default {
 			]
 		};
 	},
-	watch:{
-		// add_employee_show(val){
-		// 	this.add_employee_visible=val;
-		// },
-	},
-	// computed:{
-	// 	returnIndex(str,str2){
-	// 		console.log(str);
-	// 		return str+"-"+str2;
-	// 	}
-	// },
 	components: {
 		EmployeeSelector,
 		noData

src/views/subassembly/update_notice.vue

@@ -131,7 +131,7 @@ export default {
       border-bottom:1px #f0f0f0 solid;
     }
      .el-tree-node__content{
-	  background-color: rgb(255, 255, 255);
+	  background-color: #fff;
       height:56px;
       line-height:56px;
     }

src/views/task/get_task.vue

@@ -1,346 +1,330 @@
 <template>
-  <div>
-    <div class="box">
-      <el-tabs v-model="active" type="card">
-        <el-tab-pane label="待领取" name="unclaimed">
-        </el-tab-pane>
-        <el-tab-pane label="已领取" name="received">
-        </el-tab-pane>
-      </el-tabs>
-      <div v-show="active === 'unclaimed'">
-        <el-table :data="list" style="width: 100%" v-loading="loading" @row-click="openDetail" >
-          <el-table-column label="任务内容" prop="task_name"></el-table-column>
-          <el-table-column label="积分" prop="base_point"></el-table-column>
-          <el-table-column label="截止时间" prop="expire_time"></el-table-column>
-          <el-table-column label="操作" prop="owner_id">
-            <template slot-scope="scope">
-              <el-link type="primary" :underline='false'>查看</el-link>
-              <!-- <span>{{scope.row.receiver_id == owner_id?'（发布人）':''}}</span> -->
-            </template>
-          </el-table-column>
-          <template slot="empty">
+	<div>
+		<div class="box">
+			<el-tabs v-model="active" type="card">
+				<el-tab-pane label="待领取" name="unclaimed"></el-tab-pane>
+				<el-tab-pane label="已领取" name="received"></el-tab-pane>
+			</el-tabs>
+			<div v-show="active === 'unclaimed'">
+				<el-table :data="list" style="width: 100%" v-loading="loading" @row-click="openDetail">
+					<el-table-column label="任务内容" prop="task_name">
+						<template slot-scope="scope">
+							<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="积分" prop="base_point"></el-table-column>
+					<el-table-column label="截止时间" prop="expire_time"></el-table-column>
+					<el-table-column label="操作" prop="owner_id">
+						<template slot-scope="scope">
+							<el-link type="primary" :underline="false">查看</el-link>
+						</template>
+					</el-table-column>
+					<template slot="empty">
 						<noData></noData>
-          </template>
-        </el-table>
-      </div>
+					</template>
+				</el-table>
+			</div>
 
-      <div v-show="active === 'received'">
-        <el-table :data="list" style="width: 100%" v-loading="loading" @row-click="openDetail" >
-          <el-table-column label="执行人" prop="receiver_id">
-            <template slot-scope="scope">
-              <div style="display:flex">
-                <userImage class="fl" :id="scope.row.receiver_id" :user_name="scope.row.receiver_name" :img_url="scope.row.receiver_img_url" width="50px" height="50px" ></userImage>
-                <span style="line-height: 50px; padding-left: 10px;">{{scope.row.receiver_name}}</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="任务内容" prop="task_name"></el-table-column>
-          <el-table-column label="积分" prop="base_point"></el-table-column>
-          <el-table-column label="截止时间" prop="expire_time"></el-table-column>
-          <template slot="empty">
+			<div v-show="active === 'received'">
+				<el-table :data="list" style="width: 100%" v-loading="loading" @row-click="openDetail">
+					<el-table-column label="执行人" prop="receiver_id">
+						<template slot-scope="scope">
+							<div style="display:flex">
+								<userImage
+									class="fl"
+									:id="scope.row.receiver_id"
+									:user_name="scope.row.receiver_name"
+									:img_url="scope.row.receiver_img_url"
+									width="50px"
+									height="50px"
+								></userImage>
+								<span style="line-height: 50px; padding-left: 10px;">{{ scope.row.receiver_name }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="任务内容" prop="task_name">
+						<template slot-scope="scope">
+							<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="积分" prop="base_point"></el-table-column>
+					<el-table-column label="截止时间" prop="expire_time"></el-table-column>
+					<template slot="empty">
 						<noData></noData>
-          </template>
-        </el-table>
-      </div>
+					</template>
+				</el-table>
+			</div>
 
 			<center style="padding: 20px 0;">
 				<el-pagination
 					background
 					@size-change="handleSizeChange"
 					@current-change="handleCurrentChange"
-				  :page-sizes="[10, 20, 50, 100]"
+					:page-sizes="[10, 20, 50, 100]"
 					layout="total, sizes, prev, pager, next"
-          :current-page="formData.page"
+					:current-page="formData.page"
 					:page-size="formData.page_size"
-					:total="total">
-				</el-pagination>
+					:total="total"
+				></el-pagination>
 			</center>
 
-      <el-drawer
-        title="我是标题"
-        :custom-class="'drawer_details'"
-        :visible.sync="detailShow"
-        :with-header="false"
-        size="500px">
-        <div class="details_title">任务详情</div>
-        <div class="details_content" v-loading="detail_loading">
-          <el-row style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">
-            <el-col :span="24">
-              <div class="flex-box flex-v-ce">
-                <userImage :user_name="active=='unclaimed'?detailInfo.owner_name:detailInfo.receiver_name" :id="active=='unclaimed'?detailInfo.owner_id:detailInfo.receiver_id" :img_url="active=='unclaimed'?detailInfo.owner_img_url:detailInfo.receiver_img_url" class="fl" width="50px" height="50px" fontSize="1.1"></userImage>
-                <span style="line-height:50px; margin-left:10px;margin-right:4px;">{{active=='unclaimed'?detailInfo.owner_name:detailInfo.receiver_name}}</span>
-                <span class="color_red point" v-show="detailInfo.point_config.base_point >= 0"> +{{detailInfo.point_config.base_point}}</span>
-                <span class="color_green point" v-show="detailInfo.point_config.base_point < 0"> {{detailInfo.point_config.base_point}}</span>
-              </div>
-              <!-- {{point_name(detailInfo.pt_id)}} -->
-              <!-- {{point_name(detailInfo.pt_id)}} -->
-            </el-col>
-          </el-row>
+			<el-drawer title="我是标题" :custom-class="'drawer_details'" :visible.sync="detailShow" :with-header="false" size="500px">
+				<div class="details_title">任务详情</div>
+				<div class="details_content" v-loading="detail_loading">
+					<el-row style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">
+						<el-col :span="24">
+							<div class="flex-box flex-v-ce">
+								<userImage
+									:user_name="active == 'unclaimed' ? detailInfo.owner_name : detailInfo.receiver_name"
+									:img_url="active == 'unclaimed' ? detailInfo.owner_img_url : detailInfo.receiver_img_url"
+									width="50px"
+									height="50px"
+								></userImage>
+								<span style="line-height:50px; margin-left:10px;margin-right:4px;">
+									{{ active == 'unclaimed' ? detailInfo.owner_name : detailInfo.receiver_name }}
+								</span>
+								<span class="red point" v-show="detailInfo.point_config.base_point >= 0">+{{ detailInfo.point_config.base_point }}</span>
+								<span class="green point" v-show="detailInfo.point_config.base_point < 0">{{ detailInfo.point_config.base_point }}</span>
+								<span style="margin-left: 5px;">{{ $getTypsName(detailInfo.pt_id)}}</span>
+							</div>
+						</el-col>
+					</el-row>
 
-          <el-row v-if="detailInfo.task_name!==''">
-            <el-col :span="4">任务内容</el-col>
-            <el-col :span="20">{{detailInfo.task_name}}</el-col>
-          </el-row>
+					<el-row v-if="detailInfo.task_name !== ''">
+						<el-col :span="4">任务内容</el-col>
+						<el-col :span="20">{{ detailInfo.task_name }}</el-col>
+					</el-row>
 
-          <el-row v-if="detailInfo.task_remark!==''">
-            <el-col :span="4">任务描述</el-col>
-            <el-col :span="20">{{detailInfo.task_remark}}</el-col>
-          </el-row>
+					<el-row v-if="detailInfo.task_remark !== ''">
+						<el-col :span="4">任务描述</el-col>
+						<el-col :span="20">{{ detailInfo.task_remark }}</el-col>
+					</el-row>
 
-          <el-row v-if="detailInfo.type_mark!==''">
-            <el-col :span="4">任务类型</el-col>
-            <el-col :span="20">{{detailInfo.type_mark}}</el-col>
-          </el-row>
+					<el-row v-if="detailInfo.type_mark !== ''">
+						<el-col :span="4">任务类型</el-col>
+						<el-col :span="20">{{ detailInfo.type_mark }}</el-col>
+					</el-row>
 
-          <el-row  v-if="get_point_name(detailInfo.pt_id)!==''">
-            <el-col :span="4">积分类型</el-col>
-            <el-col :span="20">{{get_point_name(detailInfo.pt_id)}}</el-col>
-          </el-row>
+					<el-row v-if="$getTypsName(detailInfo.pt_id) !== ''">
+						<el-col :span="4">积分类型</el-col>
+						<el-col :span="20">{{ $getTypsName(detailInfo.pt_id) }}</el-col>
+					</el-row>
 
-          <el-row v-if="detailInfo.expire_time!==''">
-            <el-col :span="4">截止时间</el-col>
-            <el-col :span="20">{{detailInfo.expire_time}}</el-col>
-          </el-row>
+					<el-row v-if="detailInfo.expire_time !== ''">
+						<el-col :span="4">截止时间</el-col>
+						<el-col :span="20">{{ detailInfo.expire_time }}</el-col>
+					</el-row>
+					<el-row v-if="detailInfo.reviewer_name">
+						<el-col :span="4">审批人</el-col>
+						<el-col :span="20">{{ detailInfo.reviewer_name }}</el-col>
+					</el-row>
 
-          <!-- <el-row v-if="active =='unclaimed'">
-            <el-col :span="4">审批人</el-col>
-            <el-col :span="20">{{detailInfo.reviewer_name}}</el-col>
-          </el-row>
+					<el-row v-if="detailInfo.owner_name">
+						<el-col :span="4">发布人</el-col>
+						<el-col :span="20">{{ detailInfo.owner_name }}</el-col>
+					</el-row>
 
-          <el-row v-if="active !=='unclaimed'">
-            <el-col :span="4">发布人</el-col>
-            <el-col :span="20">{{detailInfo.owner_name}}</el-col>
-          </el-row> -->
-           <el-row v-if="detailInfo.reviewer_name">
-            <el-col :span="4">审批人</el-col>
-            <el-col :span="20">{{detailInfo.reviewer_name}}</el-col>
-          </el-row>
+					<el-row v-if="detailInfo.task_file_list !== null && detailInfo.task_file_list.length !== 0">
+						<el-col :span="4">图片附件</el-col>
+						<el-col :span="20">
+							<el-image style="width: 100px; height: 100px" :src="detailInfo.task_file_list[0]" :preview-src-list="detailInfo.task_file_list"></el-image>
+						</el-col>
+					</el-row>
 
-          <el-row v-if="detailInfo.owner_name">
-            <el-col :span="4">发布人</el-col>
-            <el-col :span="20">{{detailInfo.owner_name}}</el-col>
-          </el-row>
-
-          <el-row  v-if="detailInfo.task_file_list !== null && detailInfo.task_file_list.length !== 0">
-            <el-col :span="4">图片附件</el-col>
-            <el-col :span="20">
-              <el-image
-                style="width: 100px; height: 100px"
-                :src="detailInfo.task_file_list[0]"
-                :preview-src-list="detailInfo.task_file_list">
-              </el-image>
-            </el-col>
-          </el-row>
-
-          <div style="position: absolute; bottom: 20px; display: block; right: 20px;" v-if="detailInfo.status == '1' && user_id != detailInfo.owner_id && detailInfo.reviewer_id != user_id && !this.$authoritys('creator')">
-            <el-button plain @click="detailShow = false">取消</el-button>
-            <el-button type="primary" @click="collectTask" :loading="receiveLoad">领取任务</el-button>
-          </div>
-        </div>
-      </el-drawer>
-
-    </div>
-  </div>
+					<div
+						style="position: absolute; bottom: 20px; display: block; right: 20px;"
+						v-if="detailInfo.status == '1' && user_id != detailInfo.owner_id && detailInfo.reviewer_id != user_id && !this.$authoritys('creator')"
+					>
+						<el-button plain @click="detailShow = false">取消</el-button>
+						<el-button type="primary" @click="collectTask" :loading="receiveLoad">领取任务</el-button>
+					</div>
+				</div>
+			</el-drawer>
+		</div>
+	</div>
 </template>
 
 <script>
-  import noData from '@/components/noData';
-  export default {
-    name: 'get_task',
-    data() {
-      return {
-        active: 'unclaimed',
-        list: [],
-        loading: false,
-        receiveLoad: false,
-        total: null,
-        formData: {
-          page: 1,
-          page_size: 10
-        },
-        detailShow: false,
-        detail_loading: false,
-        detailInfo: {
-          point_config:{},
-          task_file_list: []
-        },
-        point_types: JSON.parse(localStorage.getItem('types')),
-        user_id: this.$getUserData().id
-      }
-    },
-    mounted() {
-      this.get_list()
-    },
-    components: {noData},
-    watch:{
-      active(val){
-        this.list = []
-        this.get_list()
-      }
-    },
-    methods: {
-      // 领取任务
-      collectTask(){
-        let self = this
-        self.receiveLoad = true
-        self.$axios('POST','/api/integral/task',{task_id: this.detailInfo.id}).then((res) => {
-          if (res.data.code == 1) {
-            self.$message.success('领取成功')
-            self.list.forEach((element,index) => {
-              if (element.id == self.detailInfo.id) {
-                self.list.splice(index, 1)
-              }
-            });
-            self.detailShow = false
-          }else{
-            self.$message.error(res.data.msg)
-          }
-        }).finally(()=>{
-					self.receiveLoad = false
-				})
-      },
-			// 页面变更
-      handleCurrentChange(val) {
-				this.formData.page = val
-				this.get_list()
+import noData from '@/components/noData';
+export default {
+	name: 'get_task',
+	data() {
+		return {
+			active: 'unclaimed',
+			list: [],
+			loading: false,
+			receiveLoad: false,
+			total: null,
+			formData: {
+				page: 1,
+				page_size: 10
 			},
-      handleSizeChange(val){
-        this.formData.page_size = val
-        this.get_list()
-      },
-
-      // 打开详情弹窗
-      openDetail(item){
-        this.detailShow = true
-        this.getDetailInfo(item)
-      },
-      // 获取详情信息
-      getDetailInfo(item){
-        let self = this
-        self.detail_loading = true
-        let data = {task_id: item.id}
-        self.$axios('get','/api/integral/task',data).then((res) => {
-          if (res.data.code == 1) {
-            self.detailInfo = JSON.parse(JSON.stringify(res.data.data))
-          }else{
-            self.$message.error(res.data.data.msg)
-          }
-        }).finally(() => {
-          self.detail_loading = false
-        })
-      },
-      // 获取列表信息
-      get_list(){
-        let self = this
-        self.loading = true
-        let data = JSON.parse(JSON.stringify(this.formData))
-        if (self.active == 'unclaimed') {
-          data.hall_type = 'waiting'
-        }else{
-          data.hall_type = 'catch'
-        }
-        self.$axios('get','/api/integral/task/hall',data).then((res) => {
-          if (res.data.code == 1) {
-						self.list = res.data.data.list
-						self.total = res.data.data.total
-          }else{
-            self.$message.error(res.data.data.msg)
-          }
-        }).finally(() => {
-          self.loading = false
-        })
-      },
-      // point_name(id){
-      //   return this.point_types.find((item)=>{if (item.id == id) {return item.name}}).name
-      // },
-      // 获取积分名称
-      get_point_name(id){
-        let name = ''
-        this.point_types.forEach(element => {
-          if (element.id == id) {
-            name = element.name
-          }
-        });
-        return name
-      },
+			detailShow: false,
+			detail_loading: false,
+			detailInfo: {
+				point_config: {},
+				task_file_list: []
+			},
+			user_id: this.$getUserData().id
+		};
+	},
+	mounted() {
+		this.get_list();
+	},
+	components: { noData },
+	watch: {
+		active(val) {
+			this.list = [];
+			this.get_list();
+		}
+	},
+	methods: {
+		// 领取任务
+		collectTask() {
+			let self = this;
+			self.receiveLoad = true;
+			self.$axios('POST', '/api/integral/task', { task_id: this.detailInfo.id })
+				.then(res => {
+					if (res.data.code == 1) {
+						self.$message.success('领取成功');
+						self.list.forEach((element, index) => {
+							if (element.id == self.detailInfo.id) {
+								self.list.splice(index, 1);
+							}
+						});
+						self.detailShow = false;
+					} else {
+						self.$message.error(res.data.msg);
+					}
+				})
+				.finally(() => {
+					self.receiveLoad = false;
+				});
+		},
+		// 页面变更
+		handleCurrentChange(val) {
+			this.formData.page = val;
+			this.get_list();
+		},
+		handleSizeChange(val) {
+			this.formData.page_size = val;
+			this.get_list();
+		},
 
-      
-    }
-  }
+		// 打开详情弹窗
+		openDetail(item) {
+			this.detailShow = true;
+			this.getDetailInfo(item);
+		},
+		// 获取详情信息
+		getDetailInfo(item) {
+			let self = this;
+			self.detail_loading = true;
+			let data = { task_id: item.id };
+			self.$axios('get', '/api/integral/task', data)
+				.then(res => {
+					if (res.data.code == 1) {
+						self.detailInfo = JSON.parse(JSON.stringify(res.data.data));
+					} else {
+						self.$message.error(res.data.data.msg);
+					}
+				})
+				.finally(() => {
+					self.detail_loading = false;
+				});
+		},
+		// 获取列表信息
+		get_list() {
+			let self = this;
+			self.loading = true;
+			let data = JSON.parse(JSON.stringify(this.formData));
+			if (self.active == 'unclaimed') {
+				data.hall_type = 'waiting';
+			} else {
+				data.hall_type = 'catch';
+			}
+			self.$axios('get', '/api/integral/task/hall', data)
+				.then(res => {
+					if (res.data.code == 1) {
+						self.list = res.data.data.list;
+						self.total = res.data.data.total;
+					} else {
+						self.$message.error(res.data.data.msg);
+					}
+				})
+				.finally(() => {
+					self.loading = false;
+				});
+		},
+	}
+};
 </script>
 
 <style scoped lang="scss">
-  .box{
-    min-height: calc(100vh - 184px);
-    min-width: 800px;
-    background-color: #fff;
-    padding: 20px;
-  }
-  .color_red{
-    color: #F56C6C;
-  }
-  .color_green{
-    color: #67C23A;
-  }
-  .details_content{
-    .row_title{
-      position:relative;
-      margin:0 0 20px 0;
-      padding-top: 12px;
-      font-size: 16px;
-      color: #303133;
-      line-height: 22px;
-    }
-    .row_title:before{
-      position: absolute;
-      top: 0;
-      content: " ";
-      width: 100%;
-      border-top: 1px #f8f8f8 solid;
-    }
-    .el-row {
-      margin-bottom:10px;
-      font-size: 14px;
-      .el-col-4{
-        color: #606266;
-      }
-    }
-  }
-   ::v-deep .el-table tr:hover{
-    cursor:pointer
-  }
+.box {
+	min-height: calc(100vh - 184px);
+	min-width: 800px;
+	background-color: #fff;
+	padding: 20px;
+}
+.details_content {
+	.row_title {
+		position: relative;
+		margin: 0 0 20px 0;
+		padding-top: 12px;
+		font-size: 16px;
+		color: #303133;
+		line-height: 22px;
+	}
+	.row_title:before {
+		position: absolute;
+		top: 0;
+		content: ' ';
+		width: 100%;
+		border-top: 1px #f8f8f8 solid;
+	}
+	.el-row {
+		margin-bottom: 10px;
+		font-size: 14px;
+		.el-col-4 {
+			color: #606266;
+		}
+	}
+}
+::v-deep .el-table tr:hover {
+	cursor: pointer;
+}
 
-  
-  .details_content {
-    padding: 20px;
-    height: calc(100vh - 60px);
-    overflow: auto;
-    .row_title {
-      position: relative;
-      margin: 0 0 20px 0;
-      padding-top: 12px;
-      font-size: 16px;
-      color: #303133;
-      line-height: 22px;
-    }
-    .row_title:before {
-      position: absolute;
-      top: 0;
-      content: ' ';
-      width: 100%;
-      border-top: 1px #f8f8f8 solid;
-    }
-    .el-row {
-      margin-bottom: 10px;
-      font-size: 14px;
-      .el-col-4 {
-        color: #606266;
-      }
-    }
-  }
-  .details_title {
-    font-size: 18px;
-    padding: 20px;
-    border-bottom: 1px #efefef solid;
-  }
+.details_content {
+	padding: 20px;
+	height: calc(100vh - 60px);
+	overflow: auto;
+	.row_title {
+		position: relative;
+		margin: 0 0 20px 0;
+		padding-top: 12px;
+		font-size: 16px;
+		color: #303133;
+		line-height: 22px;
+	}
+	.row_title:before {
+		position: absolute;
+		top: 0;
+		content: ' ';
+		width: 100%;
+		border-top: 1px #f8f8f8 solid;
+	}
+	.el-row {
+		margin-bottom: 10px;
+		font-size: 14px;
+		.el-col-4 {
+			color: #606266;
+		}
+	}
+}
+.details_title {
+	font-size: 18px;
+	padding: 20px;
+	border-bottom: 1px #efefef solid;
+}
 </style>

src/views/task/my_issue.vue

@@ -43,19 +43,14 @@
           <el-table-column label="执行人" prop="task_name" width='250px'>
             <template slot-scope="scope">
               <div style="display:flex">
-                <userImage class="fl" width="50px" height="50px" :id="scope.row.employee_id" :user_name="scope.row.employee_name"></userImage>
+                <userImage  width="50px" height="50px" :user_name="scope.row.employee_name"></userImage>
                 <span style="line-height: 50px; padding-left: 10px;">{{scope.row.employee_name}}的{{scope.row.pt_name}}任务</span>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="任务内容" prop="task_name">
             <template slot-scope="scope">
-              <el-popover trigger="hover" placement="top">
-                <span>{{ scope.row.task_name }}</span>
-                <div slot="reference" class="name-wrapper">
-                  <span style="white-space: normal; overflow: hidden;">{{ scope.row.task_name }}</span>
-                </div>
-              </el-popover>
+				<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="积分" prop="point_config.base_point" width="100px">
@@ -71,7 +66,7 @@
           </el-table-column>
           <el-table-column label="状态" prop="owner_id" width="100px">
             <template slot-scope="scope">
-              <span :class="scope.row.status == 1?'color_yelllo':scope.row.status == 2?'color_green':scope.row.status == 3?'color_3':scope.row.status == 4?'color_4':scope.row.status == 5?'color_5':''">{{scope.row.status == 1?'进行中':scope.row.status == 2?'已完成':scope.row.status == 3?'已退回':scope.row.status == 4?'已审批':scope.row.status == 5?'已撤销':''}}</span>
+              <span :class="scope.row.status == 1?'yellow':scope.row.status == 2?'green':scope.row.status == 3?'color_3':scope.row.status == 4?'color_4':scope.row.status == 5?'color_5':''">{{scope.row.status == 1?'进行中':scope.row.status == 2?'已完成':scope.row.status == 3?'已退回':scope.row.status == 4?'已审批':scope.row.status == 5?'已撤销':''}}</span>
             </template>
           </el-table-column>
 
@@ -80,7 +75,6 @@
               <el-dropdown placement="bottom" :show-timeout="150" :hide-timeout="150" >
               <span class="el-dropdown-links">···</span>
               <el-dropdown-menu  slot="dropdown" >
-                <!-- <el-dropdown-item :disabled="false" v-if="scope.row.source_type==1"><el-button type="text" class="color-red" v-loading.fullscreen.lock="bodyLoad" @click.stop="issueAmend1(scope.row)">修改</el-button></el-dropdown-item> -->
                 <el-dropdown-item :disabled="false" v-if="scope.row.status==1"><el-button type="text" class="color-red" v-loading.fullscreen.lock="bodyLoad" @click.stop="issueAmend1(scope.row)">修改</el-button></el-dropdown-item>
                 <el-dropdown-item :disabled="false"><el-button type="text" class="color-red" v-loading.fullscreen.lock="bodyLoad" @click.stop="deletes(scope.row,0)">删除</el-button></el-dropdown-item>
               </el-dropdown-menu>
@@ -99,19 +93,14 @@
           <el-table-column label="发布人" prop="employee_id">
             <template slot-scope="scope">
               <div style="display:flex">
-                <userImage class="fl" width="50px" height="50px" :id="scope.row.owner_id" :img_url="scope.row.owner_img_url" :user_name="scope.row.owner_name" ></userImage>
+                <userImage  width="50px" height="50px" :img_url="scope.row.owner_img_url" :user_name="scope.row.owner_name" ></userImage>
                 <span style="line-height: 50px; padding-left: 10px;">我发布的{{scope.row.pt_name}}任务</span>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="任务内容" prop="task_name">
             <template slot-scope="scope">
-              <el-popover trigger="hover" placement="top">
-                <span>{{ scope.row.task_name }}</span>
-                <div slot="reference" class="name-wrapper">
-                  <span style="white-space: normal; overflow: hidden;">{{ scope.row.task_name }}</span>
-                </div> 
-              </el-popover>
+			  <span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="积分" prop="base_point" width="100px">
@@ -127,13 +116,10 @@
           </el-table-column>
           <el-table-column label="状态" prop="owner_id" width="100px">
             <template slot-scope="scope">
-                <!-- <el-button class="color_yelllo" v-show="scope.row.status == 1" type="text">待领取</el-button> -->
-                <!-- <el-button class="color_yelllo" v-show="scope.row.status == 1" type="text">待领取</el-button> -->
-                <!-- <el-button class="color_yelllo" v-show="scope.row.status == 1" type="text">待领取</el-button> -->
               <span class="color_3" v-show="scope.row.status == -1">已过期</span>
               <span class="color_yelllo" v-show="scope.row.status == 1">待领取</span>
               <span class="color_yelllo2"  v-show="scope.row.status == 2">待处理</span>
-              <span class="color_green" v-show="scope.row.status == 3">已完成</span>
+              <span class="green" v-show="scope.row.status == 3">已完成</span>
               <span class="color_5" v-show="scope.row.status == 4">已撤回</span>
             </template>
           </el-table-column>
@@ -151,7 +137,7 @@
           </el-table-column>
 
           <template slot="empty">
-						<noData></noData>
+				<noData></noData>
           </template>
         </el-table>
       </div>
@@ -168,7 +154,7 @@
           </el-table-column>
           <el-table-column label="任务内容" prop="remark">
             <template slot-scope="scope">
-              {{scope.row.name || scope.row.remark}}
+				<span class="font-flex-word" style="max-width: 200px;">{{scope.row.name || scope.row.remark}}</span>
             </template>
           </el-table-column>
           <el-table-column label="任务积分" prop="point_config.base_point">
@@ -213,7 +199,7 @@
           background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-				  :page-sizes="[10, 20, 50, 100]"
+		  :page-sizes="[10, 20, 50, 100]"
           layout="total, sizes, prev, pager, next"
           :page-size="formData.page_size"
           :current-page="formData.page"
@@ -351,7 +337,6 @@
         let params = {
           task_id:item.id
         }
-        // this.rewardTaskAmendData = item
         this.$axios('get','/api/integral/task',params).then(res => {
             if (res.data.code == 1) {
               this.rewardTaskAmendData = res.data.data
@@ -389,17 +374,15 @@
             } else {
               self.$message.error(res.data.msg);
             }
-          }).finally(() => {
-              // self.bodyLoad = false;
           })
         })
       },
 
       // 点击详情
       rowClick(row) {
+		console.log(row);
         this.showDetailPopup = true
         this.detailId = parseInt(row.id)
-        // console.log(this.detailId)
       },
       // 重复任务详情
       repetitiveTasksClick(row) {
@@ -411,10 +394,6 @@
         this.showRewardTaskDetailsPopup = true
         this.detailId = parseInt(row.id)
       },
-      // 编辑重复任务
-      editRepeatTask(item){
-        console.log(item)
-      },
       // 发布临时任务 和 悬赏任务
       downClick(val){
         if(val == 1){
@@ -429,28 +408,15 @@
         point.unshift({code: "all",id: 0,name: "全部"})
         return point
       },
-			// 页码变更
+	 // 页码变更
       handleCurrentChange(val) {
-				this.formData.page = val
-				this.get_list()
-			},
+		this.formData.page = val
+		this.get_list()
+	  },
       handleSizeChange(val){
         this.formData.page_size = val
         this.get_list()
       },
-
-       //此函数判断当前账号与发布者是否一致、。。此处任务返回就是登录账号发布的任务，所以不需要
-      // operation_none_fei(publisher_id){
-      //   let SET_EMPLOYEE_MAP = [];
-      //   for(let i in JSON.parse(localStorage.getItem('SET_EMPLOYEE_MAP'))){
-      //     SET_EMPLOYEE_MAP.push(JSON.parse(localStorage.getItem('SET_EMPLOYEE_MAP'))[i])
-      //   }
-      //   if(publisher_id == SET_EMPLOYEE_MAP[0].id){
-      //     this.operation_if = true  
-      //   }else{
-      //     this.operation_if = false
-      //   }
-      // },
       get_list(){
         let self = this
         self.loading = true
@@ -471,9 +437,7 @@
            //数据过多的情况延迟较大
           if (res.data.code == 1) {
             //传入发布者ID进行判断
-            // this.operation_none_fei(res.data.data.list[0].publisher_id)//我指派的 :发布者ID
-            // this.operation_none_fei(res.data.data.list[0].owner_id)//我悬赏的 :发布者ID
-			      self.list = res.data.data.list
+			self.list = res.data.data.list
             self.total = res.data.data.total
           }else{
             self.$message.error(res.data.data.msg)
@@ -494,19 +458,19 @@
     background-color: #fff;
     padding: 20px;
     & .color_yelllo{
-      color: #ffce2f;
+      color: #E6A23C;
     }
     & .color_green{
-      color: #49d3a7;
+      color: #67C23A;
     }
     & .color_3{
-      color: #ff4753;
+      color: #F56C6C;
     }
     & .color_4{
-      color: #49d3a7;
+      color: #67C23A;
     }
     & .color_5{
-      color: #f04b56;
+      color: #F56C6C;
     }
     & .color_yelllo2{
       color: #ffa939;
@@ -514,7 +478,7 @@
   }
 
 
-$red: #f56c6c;
+$red: #F56C6C;
 .color-red{
   color: $red;
   &:hover{
@@ -529,7 +493,7 @@ $red: #f56c6c;
 .el-dropdown-links {
     font-size: 20px;
     cursor: pointer;
-    color: #a6a8aa;
+    color: #606266;
   }
 
  ::v-deep .el-table tr:hover{

src/views/task/my_task.vue

@@ -20,11 +20,14 @@
 
       <div v-if="formData.status == 'running'">
         <el-table :data="list" style="width: 100%" v-loading="loading" @row-click="openDetail" >
-          <el-table-column label="任务内容" prop="task_name"></el-table-column>
+          <el-table-column label="任务内容" prop="task_name">
+			  <template slot-scope="scope">
+					<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}驱蚊器翁请问请问恶趣味恶趣味</span>
+			  </template>
+		  </el-table-column>
           <el-table-column label="积分">
             <template slot-scope="scope">
               <span>{{scope.row.point_config.base_point}}</span>
-              <!-- {{scope.row.pt_name}} -->
             </template>
           </el-table-column>
           <el-table-column label="截止时间" prop="expire_time"></el-table-column>
@@ -41,7 +44,11 @@
 
       <div v-else>
         <el-table :data="list" style="width: 100%" v-loading="loading" @row-click="openDetail">
-          <el-table-column label="任务内容" prop="task_name"></el-table-column>
+          <el-table-column label="任务内容" prop="task_name">
+			  <template slot-scope="scope">
+			  	<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
+			  </template>
+		  </el-table-column>
           <el-table-column label="积分">
             <template slot-scope="scope">
               <span>{{scope.row.point_config.base_point}}</span>

src/views/workbench/approval_list.vue

@@ -39,7 +39,7 @@
           <el-table-column label="审批标题" prop="task_name">
             <template slot-scope="scope">
 			  <div class="flex-box flex-v-ce">
-				  <userImage   class="fl" width="50px" height="50px"  :user_name="scope.row.employee_name"></userImage>
+				  <userImage  width="50px" height="50px"  :user_name="scope.row.employee_name"></userImage>
 				  <div style="margin-left: 5px;">
 					  <span class="tableTitle" v-show="scope.row.source_type == 1" >{{ scope.row.employee_name }}的积分任务</span>
 					  <span class="tableTitle" v-show="scope.row.source_type == 2">{{ scope.row.employee_name }}的积分申请</span>
@@ -51,16 +51,7 @@
           </el-table-column>
           <el-table-column label="审批内容" prop="remark.rule">
             <template slot-scope="scope">
-              <el-popover trigger="hover" placement="top" popper-class="popperSPBOX">
-                <span>{{
-                  scope.row.remark.customize  ||  scope.row.remark.rule
-                }}</span>
-                <div slot="reference" class="name-wrapper"  style="width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
-                  <span>{{
-                  scope.row.remark.customize  ||  scope.row.remark.rule
-                  }}</span>
-                </div>
-              </el-popover>
+                <span class="font-flex-word" style="max-width: 200px;">{{  scope.row.remark.customize  ||  scope.row.remark.rule}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -83,17 +74,11 @@
       </div>
 
       <div v-if="formData.type == 'reviewed'">
-        <el-table
-          :data="list"
-          style="cursor: pointer;"
-          v-loading="loading"
-          class="listTable"
-          @row-click="openDetail"
-        >
+        <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">
 				<div class="flex-box flex-v-ce">
-				  <userImage  class="fl"  width="50px" height="50px" :user_name="scope.row.employee_name"></userImage>
+				  <userImage  width="50px" height="50px" :user_name="scope.row.employee_name"></userImage>
 				  <div style="margin-left: 5px;">
 					  <span class="tableTitle" v-show="scope.row.source_type == 1" >{{ scope.row.employee_name }}的积分任务</span>
 					  <span class="tableTitle" v-show="scope.row.source_type == 2">{{ scope.row.employee_name }}的积分申请</span>
@@ -270,15 +255,9 @@ export default {
       padding-left: 10px;
     }
   }
-  & .color_red {
-    color: #f56c6c;
-  }
-  & .color_green {
-    color: #67c23a;
-  }
 }
 .popperSPBOX{
   max-width: calc(100vh - 400px);
-  background-color: rgb(255, 255, 255);
+  background-color: #fff;
 }
 </style>