调整

components/hr/ResumeItem.vue

@@ -54,8 +54,24 @@
 
 			};
 
+		},
+		watch:{
+			item(newVal,oldVal){
+				this.setItem()
+			}
 		},
-		methods: {
+		methods: {
+			setItem(){
+				if (this.obj) {
+					var sz = this.obj.split(",");
+					for (var i in sz) {
+						var string1 = sz[i].split("=")[0];
+						var string2 = sz[i].split("=")[1];
+						this.item[string2] = this.item[string1];
+					}
+					this.$forceUpdate()
+				}
+			},
 			ckBtn() {
 				if (this.ck) {
 					this.gotoUrl('pages/job/index/recruitInfo/recruitInfo?id=' + this.item.id)
@@ -74,18 +90,10 @@
 
 		},
 		mounted() {
-			if (this.obj) {
-				var sz = this.obj.split(",");
-				for (var i in sz) {
-					var string1 = sz[i].split("=")[0];
-					var string2 = sz[i].split("=")[1];
-					this.item[string2] = this.item[string1];
+			this.setItem()
 
-				}
-				this.$forceUpdate()
-			}
-
-		},
+		},
+		
 		destroyed() {
 
 		}

components/job/RecruitmentItem.vue

@@ -42,7 +42,22 @@
 				 
 			};
 			
+		},watch:{
+			item(newVal,oldVal){
+				this.setItem()
+			}
 		},methods:{
+			setItem(){
+				if (this.obj) {
+					var sz = this.obj.split(",");
+					for (var i in sz) {
+						var string1 = sz[i].split("=")[0];
+						var string2 = sz[i].split("=")[1];
+						this.item[string2] = this.item[string1];
+					}
+					this.$forceUpdate()
+				}
+			},
 			ckBtn(){
 				if(this.ck){
 					this.gotoUrl('pages/job/index/recruitInfo/recruitInfo?id='+this.item.id)
@@ -60,16 +75,7 @@
 			 },
 			  
 		},mounted(){
-			 if(this.obj){
-				 var sz=this.obj.split(",");
-				 for(var i in sz ){
-					 var string1 = sz[i].split("=")[0];
-					 var string2 = sz[i].split("=")[1];
-					 this.item[string2]=this.item[string1];
-					 
-				 }
-				this.$forceUpdate()
-			 }
+			this.setItem()
 				
 		},destroyed(){
 			

large/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->
-    <title>Bootstrap 101 Template</title>
+    <title>温州市总工会健康指数监测点智慧大屏</title>
     <!-- Bootstrap -->
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/app.css">
@@ -44,15 +44,15 @@
       <div class="main-left">
 		<div class="main-left-data">
 			<div class="main-left-data-item">
-				<h4>平均数</h4>
+				<h4>基础型</h4>
 				<h2 id="num1">98.50</h2>
 				<div class="data-item-foot">
 					<p>同比增长</p>
-					<span class="red">0%</span>
+					<span class="red">2%</span>
 					<img src="img/md-trending_up@2x.png" alt="">
 				</div>
 			</div>
-			<div class="main-left-data-item">
+			<div class="main-left-data-item" style="display: none;">
 				<h4>中位数</h4>
 				<h2 id="num2">88.36</h2>
 				<div class="data-item-foot">
@@ -60,6 +60,9 @@
                     <span class="red">0%</span>
                     <img src="img/md-trending_up@2x.png" alt="">
 				</div>
+			</div>
+			<div class="main-left-data-chart">
+			    <div id="container4" style="height: 100%"></div>
 			</div>
 			<div class="main-left-data-chart">
                 <div id="container" style="height: 100%"></div>

large/index2.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- 上述3个meta标签*必须*放在最前面，任何其他内容都*必须*跟随其后！ -->
-    <title>Bootstrap 101 Template</title>
+    <title>温州市总工会健康指数监测点智慧大屏</title>
     <!-- Bootstrap -->
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/app.css">
@@ -263,7 +263,7 @@
     <!-- 加载 Bootstrap 的所有 JavaScript 插件。你也可以根据需要只加载单个插件。 -->
     <script src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
-    <script src="js/large.js"></script>
+   
 
 
   </body>

large/js/large.js

@@ -916,7 +916,9 @@ $(function() {// 初始化内容
                 $("<tr> <td>"+obj.name+" </td> <td>"+map.get(obj.level)+" </td><td>"+map.get(obj.type)+" </td><td>"+(Y+M+D)+" </td></tr>")
             );
         }
-        createBar(data.obj1.rows1.length,103);
+        createBar(data.obj1.rows1.length,202,"已关联工会","container");
+		createBar(8,2,"预警&处置","container4");
+		
     // <tr>
     //     <td>工会名称</td>
     //     <td>黄色预警</td>
@@ -927,15 +929,15 @@ $(function() {// 初始化内容
 
    // });
 
-    function  createBar(a,b){
-        var dom = document.getElementById("container");
+    function  createBar(a,b,title,id){
+        var dom = document.getElementById(id);
         var myChart = echarts.init(dom);
 
         myChart.setOption({
             color:["#00a1fa","#004668"],
             series: [
                 {
-                    name: this.title,
+                   // name: this.title,
                     type: 'pie',
                     selectedMode: 'single',
                     radius: ['80%', '70%'], // 将0改成50%，修改圆的内径
@@ -949,7 +951,7 @@ $(function() {// 初始化内容
 
                     data: [
                         { value: a, name: '使用' },
-                        { value: b-a, name: '未使用' }
+                        { value: b, name: '未使用' }
                     ]
                 }
             ], graphic: { // 添加原生图形元素组件
@@ -958,7 +960,7 @@ $(function() {// 初始化内容
                     left: 'center', //定位
                     top: '43%', // 定位
                     style: { // 样式
-                        text: '已关联工会', //文字
+                        text: title, //文字
                         fontSize: 13, //文字大小
                         textAlign: 'center', //定位
                         width: 30,

pages/hr/index/index.js

@@ -85,8 +85,9 @@ export default {
 				//console.log(current);
 			},
 			loadAllResumes(i){
+				var sz=["new","hot"];
 				API.loadAllResumes({
-					type:parseInt(i)+1,pageSize:5
+					orderType:sz[i],pageSize:5
 				}).then((response) => {
 					
 					var list=response.data.data;

pages/hr/query/index.js

@@ -1,130 +1,353 @@
 //import * as WxJsApi from '@/utils/wxJsApi.js'
-import * as API from '@/apis/index.js'
-
+import * as API from '@/apis/hr/index.js'
+import * as API_common from '@/apis/common.js'
+
+import ResumeItem from '@/components/hr/ResumeItem.vue'
+
 export default {
 		data() {
-			return {
-				nochange:false,
-				ing:false,
-				key:'',
-				record:[],
-				result:[],
-				recordsTotal:0,
-				back:false,
+			return {
+				nochange:false,
+				ing:false,
+				myfocus:true,
+				key:'',
+				record:[],
+				result:[],
+				selectShow:false,
+				selectShowTree:false,
+				
+				selectShowIndex:0,
+				selectIndexList:[[],[],[],[]],
+				pageIndex:1,
+		 
+				recordsTotal:0,
+				popupList:[],
+				back:false,
 				src:"",
 				isReady:false,
+				 whereDataInit:[
+				 	{
+				 		value:"",
+						name:"月薪范围",
+				 		label:"月薪范围"
+				 	},{
+				 		value:"",
+						name:"工作经验",
+				 		label:"工作经验"
+				 	},{
+				 		value:"",
+				 		label:"学历",
+						name:"学历",
+				 	},{
+				 		value:"",
+						name:"招聘岗位",
+				 		label:"招聘岗位"
+				 	}
+				 ],
+				whereData:[
+					
+				],
+				dataList:[
+					"b5e4a52a-9f89-4e3b-976f-79207a40587d",//月薪
+					"7724a25f-a781-46f4-b048-d9812108ff02" , //工作经验
+					"c1887d9d-e945-4875-be3f-905195cd8a8e"//学历
+				],
+				dataMap:{},
 			}
-		},
-		components: {
-		
-		},
-		onLoad(op){
-			//this.id=op.id;
 		},
-		methods: {
-			gotoLine(item){
-				 uni.redirectTo({
-					url:'/pages/route/index?id='+item.id+"&downid="+item.stationId
-				 })
-			 },
-			setHistory(){
-			    //搜索记录保存
-			    var sz=this.carhelp.get("searchHistory");
-			    if(!sz){
-			        sz=[];
-			    }
-			    var temp =[];
-			    //去重 ，后插入的，排队到最前面
-			    if(sz.length){
-			        for(var i in sz){
-			            if(i==0){
-			                temp.push(this.key);
-			            }
-			            if(sz[i]==this.key){
-			                continue;
-			            }
-			            temp.push(sz[i]);
-			
-			            if(temp.length==10){
-			                break
-			            }
-			
-			        }
-			    }else{
-			        temp.push(this.key);
-			    }
-				this.record=temp;
-			    this.carhelp.set("searchHistory",temp);
-			},
-			clearBtn(){
-				this.carhelp.set("searchHistory",[]);
-				this.record=[];
-				this.$refs.common.alert("搜索内容已清空")
-			},
-			change(){
-				if(this.nochange){
-					this.nochange=false;
-					return
-				}
-				this.ing=false;
-				document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #ffffff;"
-				
-				if(this.key==""){
-					this.result=[]
-				}
-				
+		components: {
+			ResumeItem
+		},
+		onLoad(op){
+			this.whereData={
+				...this.whereDataInit
+			}
+			
+			if(op.key){
+				this.key=op.key;
+			}
+			if(op.all){
+				this.myfocus=false;
+			}
+			
+		},
+		methods: {
+			
+			spiltItem(text){
+				if(text){
+					return text.split(",")
+					
+				}else{
+					return []
+				}
+			},
+		 
+			getScreenList(){
+				
+				API_common.getScreenList().then((response) => {
+					
+					var list=response.data;
+					 var tree=[];
+					 var map=new Map();
+					 var max=0;
+					 var all={
+						 extra:0,
+						 name:"全部岗位"
+					 }
+					 tree.push(all);
+					list.forEach((item)=>{
+						if(item.level>max){
+							max=item.level;
+						}
+						if(item.parentId){
+							
+						}else{
+							item.extra=tree.length,
+							tree.push(item);
+						}
+						
+						map.set(item.id,item);
+						this.setChildren(item,max,item);
+					})
+					this.setChildren(all,max,all);
+					
+					 list.forEach((item)=>{		
+					 	if(item.parentId){
+					 		var obj=map.get(item.parentId);
+							item.extra=obj.children.length
+							obj.children.push(item)
+					 	} 	
+					 })
+					
+					this.popupList=tree;
+						uni.hideLoading()
+					// .map((item)=>{
+					// 	return item.name;
+					// })
+				}).catch(error => {
+						uni.showToast({
+							
+							title:error
+						})
+				})
+			},
+			confirmSelect(obj){
+				var index=this.selectShowIndex;
+				var list=[];
+				if(obj[0].extra){
+					list.push(obj[0].extra);
+					
+				}else{
+					list.push(0);
+					
+				}
+				this.selectIndexList[index]=list;
+				
+				this.whereData[index]=obj[0];
+				this.submit()
+				
+			},
+			confirmSelectTree(obj){
+				console.log(obj)
+				var list=[];
+				for(var i in obj){
+					if(i==0){
+						this.whereData[3]=obj[i];
+					}
+					if(obj[i].extra){
+						list.push(obj[i].extra);
+						
+					}else{
+						list.push(0);
+						
+					}
+					if(obj[i].value){
+						this.whereData[3]=obj[i];
+					}
+				}
+				this.selectIndexList[3]=list;
+				this.submit()
+			},
+			setChildren(item,i,it){
+				
+				if(i>1){
+					var i2=i-1;
+					var myit={extra:0}
+					it.children=[myit]
+					return this.setChildren(item,i2,myit);
+				}else{
+					return	item
+				}
+				
 			},
-			 submit( ){
-				 
-				 
-			 	if(!this.key){
-			 		return
-			 	}
-			 	
-			 	this.setHistory();
-			 	 var region= this.carhelp.get("car_region");
-			 	 if(!region){
-			 		  region= this.carhelp.get("car_region_temp");
-			 	 }
-			 	var form={
-			 		name:this.key,
-			 		pageIndex:1,
-			 		pageSize:20,
-			 		regionId:region
-			 	}
-				this.ing=true;
-				this.result=[{}]
-				this.$forceUpdate()
-				return;
-			 	API.routeList(form).then((res) => {
-			 		this.ing=true;
-			 
-			 
-			 		this.result=res.data.data;
-			 		this.recordsTotal=res.data.recordsTotal
-			 		for(var i in this.result){
-			 			var item=this.result[i];
-			 			var len =item.name.indexOf(this.key)
-			 			this.result[i].name1=item.name.substring(0,len);
-			 			this.result[i].name2=item.name.substring(len+this.key.length);
-			 
-			 		}
-			 		document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #f7f7f7;"
-			 		
-			 		
-			 		
-			 	}).catch(error => {
-			 		this.$refs.common.alert( error);
-			 	})
+			getDataMap(){
+				uni.showLoading({
+				    title: '加载中'
+				});
+				API_common.getData(this.dataList.join()).then((res) => {
+					
+					 this.dataMap=res.data;
+					 
+					 for(var key in this.dataMap){
+						this.dataMap[key].forEach((item,index)=>{
+						 	item.extra=(index+1);
+						 })
+ 					 }
+					 
+					 
+					this.getScreenList();
+						
+				}).catch(error => {
+						uni.showToast({
+							
+							title:error
+						})
+				})
+			},
+		 
+			setHistory(){
+				
+				if(!this.key){
+					return
+				}
+			    //搜索记录保存
+			    var sz=this.carhelp.get("searchHistory");
+			    if(!sz){
+			        sz=[];
+			    }
+			    var temp =[];
+			    //去重 ，后插入的，排队到最前面
+			    if(sz.length){
+			        for(var i in sz){
+			            if(i==0){
+			                temp.push(this.key);
+			            }
+			            if(sz[i]==this.key){
+			                continue;
+			            }
+			            temp.push(sz[i]);
+			
+			            if(temp.length==10){
+			                break
+			            }
+			        }
+			    }else{
+			        temp.push(this.key);
+			    }
+				this.record=temp;
+			    this.carhelp.set("searchHistory",temp);
+			},
+			clearBtn(){
+				this.carhelp.set("searchHistory",[]);
+				this.record=[];
+				//this.$refs.common.alert("搜索内容已清空")
+				uni.showToast({
+					icon:'none' ,title:"搜索内容已清空"
+				})
+			},
+			change(){
+				if(this.nochange){
+					this.nochange=false;
+					return
+				}
+				this.ing=false;
+				document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #ffffff;"
+				
+				if(this.key==""){
+					this.result=[]
+				}
+				
+			},
+			noSearch(){
+				this.ing=true;
+				this.whereData={
+					...this.whereDataInit
+				}
+				this.key="";
+				
+				this.submit()
+			},
+			myLoadmore(){
+				this.submit(true);
+			},
+			 submit( bl){
+				 
+			 	this.setHistory();
+				if(bl){
+					this.pageIndex++;				
+				}else{
+					this.pageIndex=1;				 
+									
+				}
+			 	  var form=  {
+						positionName:this.key,
+						pageIndex:this.pageIndex,
+						pageSize:20, 
+						dreamMoney:this.whereData[0].value,
+						workExp:this.whereData[1].value,
+						education:this.whereData[2].value,
+						positionId:this.whereData[3].value,
+					};
+				
+			 	
+				// this.ing=true;
+				// this.result=[{}]
+				// this.$forceUpdate()
+				// return;
+			 	API.loadAllResumes(form).then((res) => {
+			 		this.ing=true;
+					if(bl){
+						this.result=[
+							...this.result,
+							...res.data.data
+						];
+						
+					}else{
+						this.result=res.data.data;
+						
+					}
+			 
+					
+			 		this.recordsTotal=res.data.recordsTotal
+			
+			 		document.getElementsByTagName('uni-page-wrapper')[0].style="background-color: #f7f7f7;"
+			 		
+			 		
+			 		
+			 	}).catch(error => {
+						uni.showToast({
+							
+							title:error
+						})
+				})
 			 }
 			
-		},onReady(){ 
-			this.record=this.carhelp.get("searchHistory");
+		},onReady(){ 
 			
-			this.isReady=true;
+			this.record=this.carhelp.get("searchHistory");
+			this.getDataMap();
+			this.isReady=true;
+			if(this.key||!this.myfocus ){
+				this.submit()
+			}
 		},onShow(){
 			if(this.isReady){
 				
 			}	
-		},
+		},computed:{
+			getShowDataList(){
+				
+				var list=this.dataMap[this.dataList[this.selectShowIndex]];
+				if(list){
+					list.unshift(
+						this.whereDataInit[this.selectShowIndex]
+					)
+					return list;
+				}else{
+					return [];
+				}
+				
+			},
+		}
+		
 	}

pages/hr/query/query.vue

@@ -2,9 +2,9 @@
 	<view :style="ing&&result.length==0?'':'background-color: #ffffff'">
 		<u-navbar>
 			<view class="jp-search">
-				<u-search placeholder="日照香炉生紫烟" :focus="true" v-model="key" @change="change()" @search="submit"  :show-action="false"></u-search>
+				<u-search placeholder="日照香炉生紫烟" :focus="myfocus" @focus="ing=false"  v-model="key" @change="change()"   @search="submit"  :show-action="false"></u-search>
 			</view>
-			<view class="jp-search-btn">
+			<view class="jp-search-btn" @click="noSearch">
 				<span>取消</span>
 			</view>
 		</u-navbar>
@@ -19,68 +19,54 @@
 		</view>
 		
 		<view class="jp-work" v-show="ing&&result.length" >
+			<u-select v-model="selectShow" 
+			  @confirm="confirmSelect" value-name="id"
+			   :default-value="selectIndexList[selectShowIndex]"
+			 label-name="name"	 :list="getShowDataList"></u-select>
+			
+			<u-select v-model="selectShowTree"
+			 mode="mutil-column-auto" value-name="id"	
+			 @confirm="confirmSelectTree"
+			 :default-value="selectIndexList[3]"
+			  label-name="name"	 :list="popupList"></u-select>
+
 			<view class="jp-work-screen">
-				<view class="screen">
-					<span>月薪范围</span>
+				<view class="screen" @click="selectShowIndex=0,selectShow=true">
+					<span v-text="whereData[0].label">月薪范围</span>
 					<u-icon name="arrow-down" color="#999" size="24"></u-icon>
 				</view>
-				<view class="screen">
-					<span>工作经验</span>
+				<view class="screen" @click="selectShowIndex=1,selectShow=true">
+					<span v-text="whereData[1].label">工作经验</span>
 					<u-icon name="arrow-down" color="#999" size="24"></u-icon>
 				</view>
-				<view class="screen">
-					<span>学历</span>
+				<view class="screen" @click="selectShowIndex=2,selectShow=true">
+					<span v-text="whereData[2].label">学历</span>
 					<u-icon name="arrow-down" color="#999" size="24"></u-icon>
 				</view>
-				<view class="screen">
-					<span>招聘岗位</span>
+				<view class="screen" @click="selectShowTree=true" >
+					<span v-text="whereData[3].label">招聘岗位</span>
 					<u-icon name="arrow-down" color="#999" size="24"></u-icon>
 				</view>
 			</view>
 			<view class="jp-work-list">
-				<view class="jp-work-item"  @click="gotoUrl('pages/job/index/recruitInfo/recruitInfo')">
-					<view class="jp-work-name">
-						<h3>JAVA开发工程师</h3>
-						<span>面议</span>
-					</view>
-					<view class="jp-work-tag">
-						<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-						<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-						<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					</view>
-					<view class="jp-work-info">
-						<view class="u-flex">
-							<u-avatar :src="src" size="40"></u-avatar>
-							<p>湖北荆鹏软件集团有限公司 1-50人</p>
-						</view>
-						<p>开发区</p>
-					</view>
-				</view>	
-				<view class="jp-work-item">
-					<view class="jp-work-name">
-						<h3>JAVA开发工程师</h3>
-						<span>面议</span>
-					</view>
-					<view class="jp-work-tag">
-						<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-						<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-						<u-tag text="雪月夜"  mode="dark" bg-color="#f1f1f7" color="#999" size="mini"/>
-					</view>
-					<view class="jp-work-info">
-						<view class="u-flex">
-							<u-avatar :src="src" size="40"></u-avatar>
-							<p>湖北荆鹏软件集团有限公司 1-50人</p>
-						</view>
-						<p>开发区</p>
-					</view>
+				<ResumeItem v-for="(item ,index) in result"
+				 
+				 obj="eduName=education"
+				 :key="item.id" :item="item" ></ResumeItem>
+				
+				<!-- <view v-show="ing&&result.length&&result.length==recordsTotal" style="text-align:center;    padding: 10px;">
+					没有更多记录了
 				</view>
+				<template v-show="ing&&result.length&&result.length<recordsTotal" style="text-align:center;    padding: 10px;">
+				</template> -->
+				<u-loadmore @loadmore="myLoadmore" :status="result.length<recordsTotal?'loadmore':'nomore'" ></u-loadmore>
+				
 			</view>
 		</view>
-		<view v-show="ing&&result.length&&result.length==recordsTotal" style="text-align:center;margin-top: 10px;">没有更多记录了</view>
-		<view v-show="ing&&result.length&&result.length<recordsTotal" style="text-align:center;margin-top: 10px;">只展示20条数据</view>
+		
 		<view  v-show="ing&&result.length==0" style="text-align:center;margin-top: 80px;" >
-			<img src="static/img/blankpage.png" style="width: 50%;" alt="" >
-			<view>附近暂无站点信息</view>
+			<img src="/static/img/blankpage.png" style="width: 50%;" alt="" >
+			<view>暂无数据信息</view>
 		</view>
 		
 	</view>

pages/job/personal/my/my.vue

@@ -2,7 +2,7 @@
 <template>
 	<view>
 		<u-navbar :is-back="false" title="我的" :background="background" title-color="#fff" :border-bottom="false">
-			<view class="slot-wrap">
+			<view class="slot-wrap" v-if="false">
 				<u-icon name="mb-cog" custom-prefix="custom-icon" size="44" color="#fff"></u-icon>
 			</view>
 		</u-navbar>
@@ -47,7 +47,7 @@
 			</view>
 		</view>
 		<u-cell-group>
-			<u-cell-item title="实名制" value="审核中"></u-cell-item>
+			<u-cell-item title="实名制" value="审核中" v-if="false" ></u-cell-item>
 			<u-cell-item title="关于我们" ></u-cell-item>
 			<u-cell-item title="联系客服" value="400-888-8888"></u-cell-item>
 		</u-cell-group>

pages/job/query/query.vue

@@ -20,7 +20,7 @@
 		
 		<view class="jp-work" v-show="ing&&result.length" >
 			<u-select v-model="selectShow" 
-			  @confirm="confirmSelect"
+			  @confirm="confirmSelect" value-name="id"
 			   :default-value="selectIndexList[selectShowIndex]"
 			 label-name="name"	 :list="getShowDataList"></u-select>