0.0

src/assets/css/reset.css

@@ -216,7 +216,7 @@ table { border-collapse:collapse; border-spacing:0; }
 	width: 200px;
 	box-sizing: border-box;
 	padding: 20px 10px;
-	max-height: 600px;
+	max-height: 700px;
 	overflow: auto;
 }
 .terr-left::-webkit-scrollbar {

src/index.vue

@@ -33,8 +33,8 @@
 								</template>
 							</el-submenu>
 							<el-menu-item :index="returnIndex(index,index)" :route="item.children[0].path" :ref="item.children[0].path" v-else>
-									<span class="iconfont titleIcon" :class="item.icon" style="font-size: 20px;"></span>
-									<span slot="title" style="margin-left: 5px;">{{ item.children[0].name }}</span>
+								<span class="iconfont titleIcon" :class="item.icon" style="font-size: 20px;"></span>
+								<span slot="title" style="margin-left: 5px;">{{ item.children[0].name }}</span>
 							</el-menu-item>
 						</div>
 					</template>	  
@@ -204,7 +204,7 @@ export default {
 		},
 		routerAstrict(data){//限制路由
 			let obj = []
-			let supAuthority = this.$supremeAuthority()
+			let supAuthority = this.$supremeAuthority() //$supremeAuthority获取当前登录者的最高权限
 			data.forEach(item=>{
 				if(!item.hidden){
 					if(!item.meta.jurisdiction){
@@ -222,7 +222,7 @@ export default {
 			var routers = this.$router.options.routes[0].children;
 			var routersArr=[];
 			routers.forEach(item=>{
-				if(item.meta.groupCode==str){
+				if(item.meta.groupCode==str){//获取对应模块的路由
 					routersArr.push(item);
 				}
 			})

src/init.vue

@@ -86,15 +86,9 @@ export default {
 				corpId: corpId, // 企业id
 				onSuccess: function(info) {
 					that.$axios('post', '/api/ding/login', { authCode: info.code, corpId: corpId }).then(res => {
-					// that.$axios('post', '/api/ding/login', { authCode: 'fd5dc75e50c435b58ce6343bf1cb765b', corpId: 'ding011f57ab048cf202ffe93478753d9884' }).then(res => {
 						var is = false;
 						if (res.data.code == 1) {
 							var { token, user } = res.data.data;
-							// user.employee_detail.role_list.forEach(item => {
-							// 	if (user.is_official == 1) {
-							// 		if (item.name == 'admin' || item.name == 'creator' || item.name == 'point_manager') {is = true;}
-							// 	}
-							// });
 							if (user.is_official==1) {
 								that.$setUserData(user);
 								that.$router.replace({ path: '/index' });

src/router/index.js

@@ -95,8 +95,7 @@ const routes = [{
 			{
 				path: '/attendance_rating',
 				name: '考勤分排名',
-				component: () => import( /* webpackChunkName: "attendance_rating" */
-					'@/views/ranking/attendance_rating.vue'),
+				component: () => import( /* webpackChunkName: "attendance_rating" */ '@/views/ranking/attendance_rating.vue'),
 				meta: {
 					icon: 'icon-shezhi_jiaose',
 					groupCode: 'ranking',

src/views/ranking/custom_rank.vue

@@ -46,10 +46,8 @@
               placeholder="请选择季度"
               value-format="Q"
             ></el-date-picker> -->
-
 							<Season ref="Seasons" :defaultHint="true" :isActive="true" class="date-picker-width" @confirm="export_quarter_confirm"></Season>
 						</el-form-item>
-
 						<!-- <el-form-item label="规则分类" label-width="70px" >
 						<el-cascader
 							class="date-picker-width"
@@ -80,9 +78,6 @@
 					<el-table :data="table_list" style="width: 100%">
 						<el-table-column label="名次" width="80" align="center">
 							<template slot-scope="scope">
-								<!-- <img v-if="scope.row.rank === 1" src="/static/images/statistics_NO1.png" alt="" />
-              <img v-if="scope.row.rank === 2" src="/static/images/statistics_NO2.png" alt="" />
-              <img v-if="scope.row.rank === 3" src="/static/images/statistics_NO3.png" alt="" /> -->
 								<img v-if="scope.row.rank === 1" src="@/assets/image/statistics_NO1.png" alt="" />
 								<img v-if="scope.row.rank === 2" src="@/assets/image/statistics_NO2.png" alt="" />
 								<img v-if="scope.row.rank === 3" src="@/assets/image/statistics_NO3.png" alt="" />
@@ -92,12 +87,7 @@
 						<el-table-column label="姓名" align="left">
 							<template slot-scope="scope">
 								<div class="flex-box">
-									<userImage
-										: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>
@@ -233,7 +223,6 @@
 </template>
 <script>
 import EmployeeSelector from '@/components/EmployeeSelector.vue';
-// import Selectionrules from '@/views/common/selectionrules';
 import moment from 'moment';
 import Season from '@/components/season';
 // let valuesLengths = []
@@ -595,8 +584,7 @@ export default {
 			this.open_right(this.clickItem);
 		},
 		// 树型菜单点击筛选
-		handleCheckChange(check, param) {
-		},
+		handleCheckChange(check, param) {},
 		getRuletableData_rule(data) {
 			let tableData_ruleP = [];
 			for (let i in data) {
@@ -615,8 +603,7 @@ export default {
 			return dates;
 		},
 
-		treeOpen() {
-		},
+		treeOpen() {},
 
 		//点击编辑
 		editGroup() {
@@ -747,6 +734,9 @@ export default {
 			if (!self.popupType) {
 				data.group_id = self.clickItem.id;
 			}
+			if(data.items.length==0){
+				data.items=this.valuesOrLength
+			}
 			self.$axios('POST', this.popupType ? '/api/integral/statistics/groups/create' : '/api/integral/statistics/groups', data)
 				.then(res => {
 					if (res.data.code == 1) {