347617796@qq.com há 4 anos atrás
pai
commit
340215f7e4
5 ficheiros alterados com 20 adições e 15 exclusões
  1. 1 1
      src/index.vue
  2. 5 5
      src/views/check.vue
  3. 1 1
      src/views/framework.vue
  4. 5 2
      src/views/rule.vue
  5. 8 6
      src/views/voluntarilyPoint.vue

+ 1 - 1
src/index.vue

@@ -157,7 +157,7 @@ export default {
 	overflow: hidden;
 }
 .el-main {
-	background-color: #ccc;
+	background-color: #f4f6f9;
 	height: calc(100vh - 60px);
 	overflow-y: scroll;
 	padding: 10px;

+ 5 - 5
src/views/check.vue

@@ -106,12 +106,12 @@ export default {
       var objs = {};
       objs.month_full_ad =ok[0].sj; //>=0
       objs.normal = ok[1].sj; //>=0
-      objs.no_sign = ok[2].sj; //<=0
-      objs.absent = ok[3].sj; //<=0
-      objs.on_duty_late = ok[4].sj; //<=0
-      objs.off_duty_early = ok[5].sj; //<=0
+      objs.no_sign = ok[2].sj>0? -ok[2].sj:ok[2].sj; //<=0
+      objs.absent = ok[3].sj>0? -ok[3].sj:ok[3].sj; //<=0
+      objs.on_duty_late = ok[4].sj>0? -ok[4].sj:ok[4].sj; //<=0
+      objs.off_duty_early = ok[5].sj>0? -ok[5].sj:ok[5].sj; //<=0
       objs.ot_per_hour = ok[6].sj; //>=0
-      objs.leave_per_hour = ok[7].sj; //<=0
+      objs.leave_per_hour = ok[7].sj>0? -ok[7].sj:ok[7].sj; //<=0
 	  objs.enable = ok[8].sj; 
       this.$axios.post("api/ad/update",objs).then((res) => {
           if (res.data.code == 1) {

+ 1 - 1
src/views/framework.vue

@@ -349,7 +349,7 @@ export default {
 	}
 	::v-deep .el-tree-node__content {
 		padding: 10px 0;
-		border-bottom: 1px #f8f8f8 solid;
+		// border-bottom: 1px #f8f8f8 solid;
 	}
 	::v-deep .el-tree-node__content:hover {
 		background: #ecf5ff;

+ 5 - 2
src/views/rule.vue

@@ -297,7 +297,6 @@ export default {
 	},
 	created() {
 		this.point_types = this.$getTyps();
-		this.getData();
 	},
 	mounted() {
 		this.$nextTick(function() {
@@ -307,6 +306,10 @@ export default {
 				this.tips_show = true;
 			}
 		});
+		var that=this;
+		setTimeout(function(){
+			that.getData();
+		},1000);
 	},
 	methods: {
 		// 导入相关
@@ -831,7 +834,7 @@ export default {
 	}
 	::v-deep .el-tree-node__content {
 		padding: 10px 0;
-		border-bottom: 1px #f8f8f8 solid;
+		// border-bottom: 1px #f8f8f8 solid;
 	}
 	::v-deep .el-tree-node__content:hover {
 		background: #ecf5ff;

+ 8 - 6
src/views/voluntarilyPoint.vue

@@ -14,14 +14,14 @@
 						<el-menu class="rule_name" :unique-opened="true">
 							<el-submenu :index="index.toString()" v-for="(item, index) in rule_list" :key="index">
 								<template slot="title">
-									<div style="width:80%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">
+									<div style="width: 80%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; height: 47px;line-height: 47px;" >
 										<i class="el-icon-edit-outline title_top" @click.stop="edit_grouping(item)"></i>
 										<span class="title_top">{{ item.name }}</span>
 									</div>
 								</template>
 								<span :index="i.toString()" v-for="(d, i) in item_list" :key="i" v-show="d[0].rule_id == item.id">
-									<el-menu-item :index="i1.toString()" v-for="(data, i1) in d" :key="i1" @click="open_right(data)">
-										<div style="width:95%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">
+									<el-menu-item :index="i1.toString()" v-for="(data, i1) in d" :key="i1" @click="open_right(data)" style="height: 47px;line-height: 47px;">
+										<div style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap">
 											<span slot="title">{{ data.remark }}</span>
 										</div>
 									</el-menu-item>
@@ -767,8 +767,7 @@ export default {
 		get_role_lists() {
 			this.table_loading = true;
 			this.rule_trees_load = true;
-			this.$axios
-				.get('/api/integral/rule/trees', {
+			this.$axios.get('/api/integral/rule/trees', {
 					params: {
 						cycle_type: '2'
 					}
@@ -829,7 +828,10 @@ export default {
 		color: #409eff;
 	}
 }
-
+::v-deep .el-submenu__title {
+    height: 47px !important;
+    line-height: 47px !important;
+}
 .rule_list {
 	position: relative;
 	display: table-cell;