字体图标

core/src/qfw/manage/auditing.go

@@ -522,12 +522,6 @@ func (s *SystemManage) Updateaudit() error {
 			title = s_result
 			content = s_remark
 		} else {
-			//获取用户头像作为企业logo
-			user := FindById("user", s_submitid, "{'s_avatar':1}")
-			var s_avatar string
-			if (*user)["s_avatar"] != nil {
-				s_avatar = (*user)["s_avatar"].(string)
-			}
 			data4 := make(map[string]interface{})
 			var query = ""
 			if s_id != "" {
@@ -568,7 +562,7 @@ func (s *SystemManage) Updateaudit() error {
 				tm := fmt.Sprintf("%d", time.Now().Unix())
 				Update("enterprise", &map[string]interface{}{
 					"_id": ObjectIdHex(s_enterpriseid),
-				}, `{'$set':{'s_action':'`+s_action+`','s_avatar':'`+s_avatar+`','EntName':'`+s_enterprisename+`','RegNo':'`+s_id+`','s_submitid':'`+s_submitid+`','s_submitname':'`+s_submitname+`','l_submittime':`+tm+`}}`, false, false)
+				}, `{'$set':{'s_action':'`+s_action+`','EntName':'`+s_enterprisename+`','RegNo':'`+s_id+`','s_submitid':'`+s_submitid+`','s_submitname':'`+s_submitname+`','l_submittime':`+tm+`}}`, false, false)
 				elastic.UpdateEntDoc(s_enterpriseid)
 				if i_identificationtype == "5" {
 					per := FindOne("enterprise", M{"RegNo": s_id_new})
@@ -591,7 +585,7 @@ func (s *SystemManage) Updateaudit() error {
 						//当审核通过的时候，根据企业名称查看企业表是否有数据
 						querynew = `{"EntName":"` + s_enterprisename_new + `"}`
 					}
-					Update("enterprise", querynew, `{'$set':{'s_action':'`+s_action+`','s_avatar':'`+s_avatar+`','s_submitid':'`+s_submitid+`','EntName':'`+s_enterprisename+`','RegNo':'`+s_id+`'}}`, false, false)
+					Update("enterprise", querynew, `{'$set':{'s_action':'`+s_action+`','s_submitid':'`+s_submitid+`','EntName':'`+s_enterprisename+`','RegNo':'`+s_id+`'}}`, false, false)
 					s_enterpriseid = s.GetString("s_enterpriseid")
 					elastic.UpdateEntDoc(s_enterpriseid)
 
@@ -610,7 +604,6 @@ func (s *SystemManage) Updateaudit() error {
 					data4["s_submitname"] = s.GetString("s_submitname")
 					data4["s_submitid"] = s_submitid
 					data4["l_submittime"] = time.Now().Unix() //审核时间
-					data4["s_avatar"] = s_avatar
 					if i_identificationtype == "1" {
 						data4["SourceType"] = "02" //网站录入企业认证信息
 						data4["s_action"] = "01"   //是否已认证并判断认证类型-企业认证

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -288,6 +288,28 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 					}
 				}
 			}
+			//相关新闻
+			var ids []ObjectId
+			newsIds := Find("rel_news", `{"s_entid":"`+id+`"}`, nil, `{"s_newsid":1}`, false, -1, -1)
+			if newsIds != nil && len(*newsIds) > 0 {
+				for _, v := range *newsIds {
+					if v["s_newsid"] != nil {
+						newsid, _ := v["s_newsid"].(string)
+						if newsid == "" {
+							continue
+						}
+						ids = append(ids, ObjectIdHex(newsid))
+					}
+				}
+				if len(ids) > 0 {
+					log.Println(ids)
+					news := Find("trs_news", M{"_id": M{"$in": ids}}, `{"l_comeintime":-1}`, `{"s_link":1,"s_title":1,"l_comeintime":1}`, false, 0, 8)
+					log.Println(news)
+					if news != nil && len(*news) > 0 {
+						yp.T["relevantNews"] = news
+					}
+				}
+			}
 			//失信信息第一页数据
 			yp.T["dishonesty"] = getDishonesty(util.If(info["LegCerNO"] != nil, info["LegCerNO"], "").(string), 1)
 			//服务列表第一页数据
@@ -356,7 +378,7 @@ func findRelation(certype, cerno, name, rtype string, level int, ls *list.List,
 			storeNode(data, ls, false, level)
 			var entname string
 			if (*data)["entname"] != nil {
-				entname = (*data)["entname"].(string)
+				entname, _ = (*data)["entname"].(string)
 			}
 			findRelation("", entregno, entname, "e", level+1, ls, sess, querycache)
 		}

core/src/web/staticres/css/dev-qfw.css

@@ -295,6 +295,9 @@ a{
 	margin-right: 30px !important;
 }
 /*padding*/
+.padding-0{
+	padding: 0px !important;
+}
 .padding-b-0{
 	padding-bottom: 0px !important;
 }
@@ -2497,6 +2500,10 @@ style="color:#D03102;margin-right:5px;"
 	display: inline-block;
 	vertical-align: top;
 }
+.b-right-none{
+	width: auto;
+	display: block;
+}
 .b-right{
 	background-color: #FFFFFF;
 	width: 250px;

core/src/web/staticres/css/entcommunity.css

@@ -458,9 +458,12 @@ a:focus, a:hover{
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 240px;
+	width: 235px;
 	display: inline-block;
 }
+.b-right-none .entinfo-basicinfo .entinfo-round>div>div>span:nth-child(2){
+	width: 360px;
+}
 .entinfo-basicinfo .entinfo-round>a{
 	width: 8px;
 	height: 8px;
@@ -627,7 +630,7 @@ a:focus, a:hover{
 .legend-text-bg>div{
     position: absolute;
     display: inline-block;
-    border-radius: 5px;
+    border-radius: 4px;
     width: 80px;
 	height: 25px;
     line-height: 25px;
@@ -938,4 +941,8 @@ a:focus, a:hover{
 	opacity: 0;
 	visibility: hidden;
 	white-space: normal;
+}
+.dashed{
+	height: 1px;
+	background: url("/images/entcommunity/dashed.png");
 }

core/src/web/staticres/css/qfw.css

@@ -972,6 +972,42 @@ span.highlight {
 	content: "\2E";
 }
 
+.zhuyaorenyuan:before{
+	content: "\2F";
+}
+
+.weiguanwang2:before{
+	content: "\3A";
+}
+
+.shixinxinxi:before{
+	content: "\3B";
+}
+
+.qiyexinwen:before{
+	content: "\3C";
+}
+
+.qiyemingpian:before{
+	content: "\3D";
+}
+
+.qiyehuangye:before{
+	content: "\3E";
+}
+
+.qiyegaikuang:before{
+	content: "\3F";
+}
+
+.guanxiwang1:before{
+	content: "\31";
+}
+
+.biangengxinxi:before{
+	content: "\A9";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/js/entportrait.js

@@ -7,6 +7,7 @@ var relationFlag = false;
 var identWayFlag = false;
 //解析服务列表
 $(function(){
+	$(".ent-tab-content.b-left").css("min-height",$(".b-right").height());
 	//失信信息如果没有数据，选项卡不可点
 	if(dishonesty.count > 0){
 		DishonestyPaging();
@@ -15,17 +16,6 @@ $(function(){
 	if(service.count > 0){
 		ServicePaging();
 	}
-	//右侧最新消息
-	$.post("/front/webcontent/getLatestNews",null,function(r){
-		var html = '<ul>';
-		for(var i=0;i<r.length;i++){
-			html += '<li><span><img src="/images/swordfish/circle.png">'
-					+new Date(Number(r[i].releasetime+"000")).Format("yyyy-MM-dd hh:mm:ss")
-					+'</span><br><a href="/front/webcontent/'+r[i]._id+'.html">'+r[i].s_title+'</a></li>';
-		}
-		$(".newsInfo").html(html+'</ul><div class="clearfix"></div>');
-		$(".ent-tab-content.b-left").css("min-height",$(".b-right").height());
-	});
 	//主要人员
 	if(typeof(staffinfo) != "undefined" && staffinfo != null && staffinfo.length > 0){
 		var staffinfos1 = [],staffinfos2 = [],staffinfos3 = [],staffinfos4 = [];
@@ -216,9 +206,11 @@ function initRelation(){
 				$(".entrelation").height($(".ent-tab-content").height());
 				loadJS("/js/d3.v3.min.js",function(){
 					loadJS("/js/geometry.js",function(){
-						loadJS("/js/relation.js",function(){
-							relationEntity = new Relation(legcerNo,regNo,regCapCurName,relation);
-							relationEntity.init();
+						loadJS("/js/provinceData.min.js",function(){
+							loadJS("/js/relation.js",function(){
+								relationEntity = new Relation(legcerNo,regNo,regCapCurName,relation);
+								relationEntity.init();
+							});
 						});
 					});
 				});

core/src/web/staticres/js/relation.js

@@ -76,7 +76,6 @@ Relation.prototype.init = function(){
 			thisClass.redrawflag=true;
 			setTimeout(thisClass.redraw,1000);
 		}
-		firstresize=false;
 	});
 	if(document.getElementById("entrelation-infovis")){
 		document.getElementById("entrelation-infovis").oncontextmenu=function(){return false;};
@@ -84,24 +83,25 @@ Relation.prototype.init = function(){
 	$("#entrelation-fullscreen").attr("title","进入全屏视图"+((!!window.ActiveXObject || "ActiveXObject" in window)?"":" (F11)"));
 	///////////////////////关系网实例////////////////////////////
 	var htmls="<div style='position:absolute;top:0px;' class='legend'>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ff9800;'></div><span style='margin-left: 20px;'>本企业</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #cddc39;opacity:0.5;'></div><span style='margin-left: 12px;'>其他企业</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #2196f3;'></div><span style='margin-left: 25px;'>个人</span></div>";
-	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;margin-bottom: 10px;'><div style='background-color: #cecece;'></div><span style='margin-left: 5px;'>注吊销企业</span></div>";
-	htmls= htmls+ "<div><span style='font-size: 20px;font-weight: bold;color: #cecece;'>→</span><span style=''>投资关系（股东→企业）</span></div>";
-	htmls= htmls+ "<div><span style='font-size: 20px;font-weight: bold;color: #cd93d7;'>→</span><span style=''>法定代表人</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ff9800;opacity: 0.8;'></div><span style='margin-left: 20px;color: #ffffff;'>本企业</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #ABE6DB;'></div><span style='margin-left: 12px;'>其他企业</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;'><div style='background-color: #2196f3;'></div><span style='margin-left: 25px;color: #ffffff;'>个人</span></div>";
+	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;margin-bottom: 10px;'><div style='background-color: #afafaf;'></div><span style='margin-left: 5px;color: #ffffff;'>注吊销企业</span></div>";
+	htmls= htmls+ "<div style='position: relative;'><span style='position: absolute;top: 7.5px;width: 25px;height: 5px;background-color: #e2e2e2;'></span><span style='position: absolute;left: 25px;top: 4px;border-top: 6px solid transparent;border-bottom: 6px solid transparent;border-left: 12px solid #e2e2e2;'></span><span style='margin-left: 45px;'>投资关系（股东→企业）</span></div>";
+	htmls= htmls+ "<div style='position: relative;'><span style='position: absolute;top: 7.5px;width: 25px;height: 5px;background-color: #cd93d7;'></span><span style='position: absolute;left: 25px;top: 4px;border-top: 6px solid transparent;border-bottom: 6px solid transparent;border-left: 12px solid #cd93d7;'></span><span style='margin-left: 45px;'>法定代表人</span></div>";
 	//htmls= htmls+ "<div style='margin:10px 0px;' class='hidden-sm hidden-xs'><span class='text-muted'>提示：点击鼠标右键可以删除不想看的节点。</span></div>";
 	htmls= htmls+"</div>"
 	$("#entrelation").append(htmls);
 	try{	
 		this.dataProcess();
-		this.makeRelation();	
+		this.makeRelation();
 	}catch(e){}
 }
 Relation.prototype.pattern = function(){
 	if(this.modleFlag){
 		return;
 	}
+	var thisClass = this;
 	d3.selectAll("text").each(function (p){
 		if(p.type == "ce" || p.type == "e"){
 			$(this).text(p.shortText);
@@ -110,11 +110,14 @@ Relation.prototype.pattern = function(){
 	this.modleFlag = true;
 	this.makeTextBg();
 	this.makeTitle();
+	this.tick();
+	this.force.tick();
 }
 Relation.prototype.verbosemode = function(){
 	if(!this.modleFlag){
 		return;
 	}
+	var thisClass = this;
 	d3.selectAll("text").each(function (p){
 		if(p.type == "ce" || p.type == "e"){
 			$(this).text(p.text);
@@ -123,6 +126,8 @@ Relation.prototype.verbosemode = function(){
 	this.modleFlag = false;
 	this.makeTextBg();
 	this.makeTitle();
+	this.tick();
+	this.force.tick();
 }
 Relation.prototype.dataProcess = function(){
 	var reg = new RegExp(/(有限公司|有限责任公司|股份有限公司|总公司|分公司|公司|事务所|合伙企业)$|\(.*\)|\（.*\）/g);
@@ -146,7 +151,7 @@ Relation.prototype.dataProcess = function(){
 				text = text.replace(reg,"");
 			}
 			if(text.length > 2){//再替换开头
-				//text = this.filterEntName(text);
+				text = this.filterEntName(text);
 			}
 			if(text.length > 2){//小于两个字符不生效
 				nodeObj.shortText = text;
@@ -293,11 +298,11 @@ Relation.prototype.filterEntName = function(text){
 			for(var c in citys){//市
 				var c_name = citys[c].n;
 				if(this.replaceStart(c_name)){
-					this.replaceAreas(citys[c].s);
+					//this.replaceAreas(citys[c].s);
 					return true;
-				}else if(this.replaceAreas(citys[c].s)){
+				}/*else if(this.replaceAreas(citys[c].s)){
 					return true;
-				}
+				}*/
 			}
 		}
 	};
@@ -313,9 +318,9 @@ Relation.prototype.filterEntName = function(text){
 	};
 	for(var p in provinces){//省
 		var p_name = provinces[p].n;
-		if(this.allProvinces.indexOf(p_name) == -1){
+		/*if(this.allProvinces.indexOf(p_name) == -1){
 			continue;
-		}
+		}*/
 		if(this.replaceStart(p_name)){
 			this.replaceCity(provinces[p].s);
 			break;
@@ -650,10 +655,10 @@ Relation.prototype.makeRelation = function(){
 	    .enter();
 	this.lines = gs.append("path")
 		.style("fill", function(p){
-	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#cecece";
+	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#e2e2e2";
 	    })
 		.style("stroke", function(p){
-	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#cecece";
+	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#e2e2e2";
 	    })
 		.attr("stroke-width",function (e,i){
 			return e.linkVal;
@@ -699,8 +704,8 @@ Relation.prototype.makeRelation = function(){
 			thisClass.removeNode(this);
 		});
 	this.nodes.append("rect")
-		.attr("rx", 5)
-	    .attr("ry", 5)
+		.attr("rx", 2)
+	    .attr("ry", 2)
 		.attr('height', function(p){
 			if(p.type == "ce"){
 				return 25;
@@ -710,25 +715,20 @@ Relation.prototype.makeRelation = function(){
 		})
 		.attr("fill", function(p){
 			if(p.type == "e" && (p.opstate == "11" || p.opstate == "07")){
-				return "#cecece";
+				return "#afafaf";
 			}
-	    	return p.type=="p"?"#2196f3":p.type=="ce"?"#ff9800":"#cddc39";
+	    	return p.type=="p"?"#2196f3":p.type=="ce"?"#ff9800":"#ABE6DB";
 	    })
 		.attr("stroke", function(p){
 			if(p.type == "e" && (p.opstate == "11" || p.opstate == "07")){
-				return "#cecece";
-			}
-	    	return p.type=="p"?"#2196f3":p.type=="ce"?"#ff9800":"#cddc39";
-	    }).style("opacity",function(p){
-			if(p.type=="e" && (p.opstate != "11" || p.opstate != "07")){
-				return "0.5";
+				return "#afafaf";
 			}
-			return "1";
-		});
+	    	return p.type=="p"?"#2196f3":p.type=="ce"?"#ff9800":"#ABE6DB";
+	    });
 	this.makeTitle();
 	this.nodes.append('text')
     .text(function(d){
-		if(this.modleFlag){
+		if(thisClass.modleFlag){
 			return d.shortText;
 		}else{
 			return d.text;
@@ -748,6 +748,12 @@ Relation.prototype.makeRelation = function(){
 			return "14px";
 		}
 	})
+	.style("fill",function(p){
+		if(p.type == "e" && (p.opstate == "11" || p.opstate == "07")){
+			return "#ffffff";
+		}
+    	return p.type=="p"?"#ffffff":p.type=="ce"?"#ffffff":"auto";
+	})
 	.on("click",function (d,i){
 		if(!dragstatus && d.type == "e"){
 			window.open("/enterpriseInfoByRegNO/"+d.name+".html");
@@ -766,9 +772,6 @@ Relation.prototype.makeTitle = function(){
 				title = d.text;
 			}
 			var regcap = d.regcap;
-			if(d.type == "ce"){
-				console.info(d);
-			}
 			if(regcap > 0){
 				var lenRegcap = (regcap + "").length;
 				if(lenRegcap > 4 && (regcap + "").indexOf(".") > -1 && (lenRegcap - (regcap + "").indexOf(".")) > 4){