Quellcode durchsuchen

Merge branch 'dev2.0' of 192.168.3.17:qmx/jy into dev2.0

wangchuanjin vor 8 Jahren
Ursprung
Commit
343b01d252
2 geänderte Dateien mit 32 neuen und 146 gelöschten Zeilen
  1. 17 82
      src/jfw/front/entserach.go
  2. 15 64
      src/web/templates/pc/biddingsearch_enterprise.html

+ 17 - 82
src/jfw/front/entserach.go

@@ -1,13 +1,15 @@
 package front
 
 import (
-	"fmt"
+	//"fmt"
 	"log"
-	"qfw/util"
-	"qfw/util/redis"
-	"github.com/go-xweb/xweb"
-	"time"
-	"math/rand"
+	//"qfw/util"
+	//"qfw/util/redis"
+	//"github.com/go-xweb/xweb"
+	//"time"
+	//"math/rand"
+	"jfw/jylabutil"
+
 	//"regexp"
 	//"strconv"
 	//"strings"
@@ -15,6 +17,7 @@ import (
 
 	//. "github.com/thinxer/go-word2vec"
 	//"gopkg.in/mgo.v2/bson"
+	"github.com/go-xweb/xweb"
 )
 
 type Entsearch struct {
@@ -29,83 +32,15 @@ func init() {
 func (m *Entsearch) Bidsearchforent() error {
 	log.Println("-------中标企业搜索:")
 
-	//keywords := m.GetString("keywords")
-
-	searchvalue := m.GetString("searchvalue")
-	area := m.GetString("area")
-	publishtime := m.GetString("publishtime")
-	industry := m.GetString("industry")
-	//toptype := m.GetString("toptype")
-	subtype := m.GetString("subtype")
-	//selectType := m.GetString("selectType")
-	//selectTypesess := m.GetSession("selectType")
-
-	var list *[]map[string]interface{}
-	pages := make([]interface{}, 0)
-	//var status = 2
-	//var count int64
-	intns := make([]int, 0)
-	for i := 0; i < 10; i++ {
-		if len(intns) == 0 {
-			intns = append(intns, rand.Intn(100))
-		} else {
-			for {
-				v := rand.Intn(intns[(i-1)] + 100)
-				if v-intns[(i-1)] >= 30 {
-					intns = append(intns, v)
-					break
-				}
-			}
-		}
-	}
-	//for i := 0; i < 10; i++ {
-		_, list = getLastNewsData(searchvalue, area, publishtime, subtype, industry, 0, true)
-		fmt.Println(list)
-		for k, v := range *list {
-			//v["k"] = (k + 1) + i*50
-			v["k"] = (k + 1) + 1*50
-			t := time.Unix(util.Int64All(v["publishtime"]), 0)
-			v["timetemp"] = fmt.Sprint(util.Int64All(v["publishtime"]))
-			v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
-			v["time"] = util.TimeDiff(t)
-			var stp = ""
-			if v["subtype"] != nil {
-				stp, _ = v["subtype"].(string)
-			} else {
-				stp = ""
-			}
-			if stp == "" && v["toptype"] != nil {
-				stp, _ = v["toptype"].(string)
-			}
-			area, _ := v["area"].(string)
-			v["stypeadd"], v["areaadd"] = classify(stp, area)
-		}
-		pages = append(pages, list)
-	//}
-	m.DisableHttpCache()
-	redis.Put("other", "index_list", pages, 60*60*2)
-
-	//if status == 2 && m.Method() == "GET" {
-	//	pages := redis.Get("other", "index_list").([]interface{})
-	//	p := util.IntAll(p)
-	//	if p <= 0 || p > 10 {
-	//		p = 1
-	//	}
-	//
-	//	if p-1 <= 0 {
-	//		m.T["prev"] = 1
-	//	} else {
-	//		m.T["prev"] = p - 1
-	//	}
-	//	if p+1 >= 11 {
-	//		m.T["next"] = 10
-	//	} else {
-	//		m.T["next"] = p + 1
+	list := []map[string]interface{}{}
+	list = jylabutil.GetProjectByEntName("","",0,0,1,10)
+	m.T["list"] = list
+	//for k,v := range list{
+	//	fmt.Println(k)
+	//	for i,z := range v{
+	//		fmt.Println(i)
+	//		fmt.Println(z)
 	//	}
-	//	m.T["cur"] = p
-	//	m.T["list"] = pages[p-1]
-	//
-	//	return m.Render("/pc/biddingsearch_enterprise.html", &m.T)
 	//}
 	return m.Render("/pc/biddingsearch_enterprise.html", &m.T)
 }

+ 15 - 64
src/web/templates/pc/biddingsearch_enterprise.html

@@ -154,81 +154,23 @@
 						<!--全文搜索 列表-->
 						<div class="lucene">
 							<ul>
+								{{range $k,$v:= .T.list}}
 								<li>
 									<div class="liLuceneList">
 										<div class="luce-left">
 											<div class="left-title">
-												<a href="#"> <em>1-1.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
+												<a href="#"> <em>{{$k}}</em>{{$v.projectname}}</a>
 											</div>
 										</div>
 										<div class="luce-right">
-											<a href="#">河南</a>
-											<a href="#">中标</a>
+											<a href="#">{{$v.area}}</a>
+											<a href="#">{{$v.bidtype}}</a>
 											<a href="#">建筑工程</a>
-											<span>43分钟前</span>
-										</div>
-									</div>
-								</li>
-								<li>
-									<div class="liLuceneList">
-										<div class="luce-left">
-											<div class="left-title">
-												<a href="#"> <em>2.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-											</div>
-										</div>
-										<div class="luce-right">
-											<a href="#">河南</a>
-											<a href="#">中标</a>
-											<a href="#">建筑工程</a>
-											<span>43分钟前</span>
-										</div>
-									</div>
-								</li>
-								<li>
-									<div class="liLuceneList">
-										<div class="luce-left">
-											<div class="left-title">
-												<a href="#"> <em>3.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-											</div>
-										</div>
-										<div class="luce-right">
-											<a href="#">河南</a>
-											<a href="#">中标</a>
-											<a href="#">建筑工程</a>
-											<span>43分钟前</span>
-										</div>
-									</div>
-								</li>
-								<li>
-									<div class="liLuceneList">
-										<div class="luce-left">
-											<div class="left-title">
-												<a href="#"> <em>4.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-											</div>
-										</div>
-										<div class="luce-right">
-											<a href="#">河南</a>
-											<a href="#">中标</a>
-											<a href="#">建筑工程</a>
-											<span>43分钟前</span>
-										</div>
-									</div>
-								</li>
-								<li>
-									<div class="liLuceneList">
-										<div class="luce-left">
-											<div class="left-title">
-												<a href="#"> <em>5.</em>开封县高速公路建设指挥部高速压坏地方公路建设项目招标公告河南</a>
-											</div>
-										</div>
-										<div class="luce-right">
-											<a href="#">河南</a>
-											<a href="#">中标</a>
-											<a href="#">建筑工程</a>
-											<span>43分钟前</span>
+											<span>{{$v.zbtime}}</span>
 										</div>
 									</div>
 								</li>
+								{{end}}
 							</ul>
 						</div>
 						<!--全文搜索 表格-->
@@ -291,6 +233,15 @@
 		<script type="text/javascript" src="/js/biddingSearch.js"></script>
 	{{include "/common/pcbottom.html"}}
 	{{include "/common/baiducc.html"}}
+	<script>
+		var mainList = {{.T.list}};
+		$(function () {
+//		    for(var i=0;i<mainList.length;i++){
+//		        alert(mainList[i]["projectname"])
+//			}
+
+        });
+	</script>
 	</body>
 
 </html>