调整

apis/hr/my.js

@@ -14,7 +14,7 @@ export function pageListHR(data) {
 	return request({
 		method: 'post',
 		data: Qs.stringify(data),
-		url: '/mobile/userBrowseApi/pageListHR'
+		url: '/mobile/userBrowseHrApi/pageListHR'
 		
 	})
 }

components/job/addResume.js

@@ -64,7 +64,7 @@ export default {
 				"b5e4a52a-9f89-4e3b-976f-79207a40587d",//月薪
 				"7724a25f-a781-46f4-b048-d9812108ff02" , //工作经验
 				"c1887d9d-e945-4875-be3f-905195cd8a8e",//学历
-				"5a684a5d-2b69-4f3f-82bd-c472c6034c43",//工作状态
+				"e03f43d0-46f8-4696-a6f2-331d353dccd8",//工作状态
 			],
 			dataParam:[
 				
@@ -176,7 +176,7 @@ export default {
 			
 			var b=false;
 			this.workExp.find((item)=>{
-				debugger
+				
 				if(!item.timeS||!item.timeE){
 					uni.showToast({
 						title:"请完善工作经历中的工作时间"
@@ -198,7 +198,7 @@ export default {
 							 return false;
 			}
 			this.educationExp.find((item)=>{
-				debugger
+				
 				if(!item.timeS||!item.timeE){
 					uni.showToast({
 						title:"请完善教育经历中的在校时间"
@@ -445,7 +445,7 @@ export default {
 			this.picList.push(data.data)
 		},
 		removeUpload(data, index, lists, name){
-			debugger
+			
 			this.picList.splice(data,1)
 		}
 	},

large/index.html

@@ -352,12 +352,12 @@
 		 						  <td>1.14分</td>
 		 						</tr>
 		 						
-		 						<tr  >
+		 						<!-- <tr  >
 		 						  <td>总分</td>
 		 						  <td> </td>
 		 						  <td>100分</td>
 		 						  <td></td>
-		 						</tr> 
+		 						</tr> -->
 		 					  </tbody>
 		 					</table>
 		 				</div>

large/js/large.js

@@ -21,24 +21,24 @@ $(function() { // 初始化内容
 		"errorList": [{
 				"orgtype": "基层",
 				"level": "warning3",
-				"createTime": "2020-08-06",
+				"createTime": "2021-08-06",
 				"warntype": null,
 				"name": "温州市眼镜有限公司",
-				"closeTime":"2020-08-19",
+				"closeTime":"2021-08-19",
 				"id": "c734573b-2e90-43de-8a1b-2acecdd99f9f",
 				"source": "a",
-				"openTime": "2020-08-06",
+				"openTime": "2021-08-06",
 				"type": 1,
 				"status": 1
 			},
 			{
 				"orgtype": "基层",
 				"level": "warning3",
-				"createTime": "2020-07-08",
-				"openTime": "2020-07-08",
+				"createTime": "2021-07-08",
+				"openTime": "2021-07-08",
 				"warntype": null,
 				"name": "温州市龙丰橡胶工业有限公司",
-				"closeTime": "2020-07-19",
+				"closeTime": "2021-07-19",
 				"id": "26320f33-5fc4-4fdc-8e10-27e2713cb047",
 				"source": "a",
 				
@@ -48,72 +48,88 @@ $(function() { // 初始化内容
 			{
 				"orgtype": "基层",
 				"level": "warning2",
-				"createTime": "2020-07-10",
+				"createTime": "2021-07-10",
 				"warntype": null,
 				"name": "温州市娄桥晓光打火机配件厂",
-				"closeTime": "2020-08-18",
+				"closeTime": "2021-08-18",
 				"id": "01418d5e-5fd1-4d25-a50d-00bf1486cedf",
 				"source": "a",
-				"openTime": "2020-07-11",
+				"openTime": "2021-07-11",
 				"type": 1,
 				"status": 1
 			},
 			{
 				"orgtype": "基层",
 				"level": "warning2",
-				"createTime": "2020-06-13",
+				"createTime": "2021-06-13",
 				"warntype": null,
 				"name": "温州市瓯海娄桥化建有限公司",
-				"closeTime": "2020-06-13",
+				"closeTime": "2021-06-13",
 				"id": "07dbf847-e82e-4e2c-8565-d5667877b80b",
 				"source": "a",
-				"openTime": "2020-06-13",
+				"openTime": "2021-06-13",
 				"type": 1,
 				"status": 1
 			},
 			{
 				"orgtype": "基层",
 				"level": "warning1",
-				"createTime": "2020-06-13",
+				"createTime": "2021-06-13",
 				"warntype": null,
 				"name": "温州联丰皮塑有限公司",
 				"closeTime": null,
 				"id": "1ca5716f-0dfe-4b7b-829c-74765f80cb3a",
 				"source": "a",
-				"openTime": "2020-07-07",
+				"openTime": "2021-07-07",
 				"type": 1,
 				"status": 1
 			},
 			{
 				"orgtype": "基层",
 				"level": "warning1",
-				"createTime":  "2020-05-25",
+				"createTime":  "2021-05-25",
 				"warntype": null,
 				"name": "民政橡胶",
 				"closeTime": null,
 				"id": "52bfbac4-4d2d-4a74-8554-0d637d91e718",
 				"source": "a",
-				"openTime": "2020-07-08",
+				"openTime": "2021-07-08",
 				"type": 1,
 				"status": 1
 			},
 			{
 				"orgtype": "基层",
 				"level": "warning1",
-				"createTime":  "2020-05-21",
+				"createTime":  "2021-05-21",
 				"warntype": null,
 				"name": "娄桥新丰润滑油加工厂",
 				"closeTime": null,
 				"id": "57fa436a-99a5-450b-bfbe-cad6de1ff01c",
 				"source": "a",
-				"openTime": "2020-07-07",
+				"openTime": "2021-07-07",
 				"type": 1,
 				"status": 1
 			},
 			
 		],
 		"topList": [{
-
+
+				h:"森马",	"score": 92,
+				list: [10,
+					10,
+					2,
+					10,
+					10,
+					10,
+					10,
+					5,
+					10,
+					5,
+					10
+				],
+				"orgName": "森马集团有限公司",
+				"top": 1
+			},{
 			h:"钟铮锁业",	"score": 92,
 				list: [10,
 					10,
@@ -129,7 +145,7 @@ $(function() { // 初始化内容
 				],
 				"orgName": "浙江钟铮锁业有限公司工会",
 				"top": 1
-			}, {
+			},  {
 
 			h:"",	"score": 92,
 				list: [10,
@@ -616,61 +632,64 @@ $(function() { // 初始化内容
 		},
 		"obj3": {
 			"rows1": [
+				
 				{
-						"months": "2020-05",
+						"months": "2021-04",
 						"mysum": 0
 					},
 					{
-						"months": "2020-06",
+						"months": "2021-05",
 						"mysum": 1
 					},
 					
 					{
-						"months": "2020-07",
+						"months": "2021-06",
 						"mysum": 2
 					},
 					{
-						"months": "2020-08",
+						"months": "2021-07",
 						"mysum": 1
 					},
 					{
-						"months": "2020-09",
+						"months": "2021-08",
 						"mysum": 1
 					},
 					{
-						"months": "2020-10",
+						"months": "2021-09",
 						"mysum": 1
-					},
+					}
+					
 					
 			],
 			"rows2": [
 				
-				
+			
 				{
-					"months": "2020-05",
+					"months": "2021-04",
 					"mysum": 6
 				},
 				{
-					"months": "2020-06",
+					"months": "2021-05",
 					"mysum": 5
 				},
 				
 				{
-					"months": "2020-07",
+					"months": "2021-06",
 					"mysum": 2
 				},
 				{
-					"months": "2020-08",
+					"months": "2021-07",
 					"mysum": 2
 				},
 				{
-					"months": "2020-09",
+					"months": "2021-08",
 					"mysum": 0
 				},
 				{
-					"months": "2020-10",
+					"months": "2021-09",
 					"mysum": 0
-				},
+				}
+				
 			
 			]
 		}
@@ -700,7 +719,9 @@ $(function() { // 初始化内容
 		if(ptext=="蓝图二期"){
 			ptext="浙江蓝图"
 		}
-		
+		if(ptext.indexOf("森马")>-1){
+			ptext="森马"
+		}
 		var obj = topList.find((item)=>{
 			if(ptext==item.h){
 				return true;
@@ -1123,7 +1144,7 @@ textStyle:{
 		var myChart = echarts.init(dom);
 		var map = new Map();
 		var names = [];
-
+		
 		for (var i in data.rows1) {
 			var item = data.rows1[i]
 			if (map.has(item.months)) {

large/js/large2.js

@@ -5,8 +5,12 @@ $(function() {// 初始化内容
 	createBar11()
   //  $.post(url,function(data,status){
         var data =[
+			{
+					h:"森马",name:"森马集团有限公司",img:true,txt:"森马集团创立于1996年12月18日，是一家以多品牌服装服饰为主导产业、跨产业发展的综合性民营企业。公司旗下的“浙江森马服饰股份有限公司”于2011年3月11日在深交所A股上市，拥有的两大自主品牌森马（semir）和巴拉巴拉（balabala）是国内休闲服和童装领域的领军品牌，其中巴拉巴拉市场占有率长期位于童装领域第一。森马创立并弘扬了“小河有水大河满”的利他共赢文化，坚持追求企业与合作伙伴、与员工、与社会的“和谐共赢”发展。"
+			},
+			
 		{
-				h:"创新新材料",name:"创新新材料",img:true,txt:"温州创新新材料股份有限公司主要经营：水泥制品技术研发；生产、销售商品混凝土、干混砂浆、商砼。等产品。公司尊崇“踏实、拼搏、责任”的企业精神，并以诚信、共赢、开创经营理念，创造良好的企业环境，以全新的管理模式，完善的技术，周到的服务，卓越的品质为生存根本，我们始终坚持用户至上 用心服务于客户，坚持用自己的服务去打动客户。"
+				h:"创新新材料",name:"温州创新新材料股份有限公司",img:true,txt:"温州创新新材料股份有限公司主要经营：水泥制品技术研发；生产、销售商品混凝土、干混砂浆、商砼。等产品。公司尊崇“踏实、拼搏、责任”的企业精神，并以诚信、共赢、开创经营理念，创造良好的企业环境，以全新的管理模式，完善的技术，周到的服务，卓越的品质为生存根本，我们始终坚持用户至上 用心服务于客户，坚持用自己的服务去打动客户。"
 		},{
 			h:"钟铮锁业",name:"浙江钟铮锁业有限公司",img:true,txt:"浙江钟铮锁业有限公司(原温州海坦锁业有限公司、瓯海锦山锁厂)专业生产各种高、低压开关柜的配套部件和MS系列开关柜门锁,隶属于机械部、能源部、电力部、五金电器成员企业之一,有着近二十年的专业生产MS锁具的历史。产品销往美国、韩国、日本、俄罗斯、以及东南亚地区"
 		},{
@@ -112,7 +116,9 @@ $(function() {// 初始化内容
 			 if(ptext=="蓝图二期"){
 			 	ptext="浙江蓝图"
 			 }
-			 
+			 if(ptext.indexOf("森马")>-1){
+			 	ptext="森马"
+			 }
 		 	var obj = data.find((item)=>{
 		 		if(ptext==item.h){
 		 			return true;

pages/hr/my/look/look.vue

@@ -12,8 +12,8 @@
 			</view>
 			<view class="jp-work-list">
 				 <ResumeItem v-for="(item ,index) in list" :key="item.id" :item="item"
-				  obj="eduName=education"
-				  mode="2" @mode2="del"
+				  obj="name=realName,positionName=positionCategoryName"
+				 
 				  ></ResumeItem>
 				  
 				 <u-loadmore @loadmore="myLoadmore" :status="list.length<recordsTotal?'loadmore':'nomore'" ></u-loadmore>

pages/job/personal/install/addResume/index.js

@@ -51,7 +51,7 @@ export default {
 				"b5e4a52a-9f89-4e3b-976f-79207a40587d",//月薪
 				"7724a25f-a781-46f4-b048-d9812108ff02" , //工作经验
 				"c1887d9d-e945-4875-be3f-905195cd8a8e",//学历
-				"5a684a5d-2b69-4f3f-82bd-c472c6034c43",//工作状态
+				"e03f43d0-46f8-4696-a6f2-331d353dccd8",//工作状态
 			],
 			dataParam:[