maxiaoshan il y a 4 ans
Parent
commit
2fcbab56a2
6 fichiers modifiés avec 83 ajouts et 26 suppressions
  1. 2 2
      src/config.json
  2. 14 0
      src/front/front.go
  3. BIN
      src/src
  4. BIN
      src/src.exe
  5. 32 22
      src/web/templates/detail.html
  6. 35 2
      src/web/templates/list.html

+ 2 - 2
src/config.json

@@ -76,8 +76,8 @@
                 "descript": "中标金额"
             },
             {
-                "key": "",
-                "descript": ""
+                "key": "china_bidding",
+                "descript": "信息分类"
             },
             {
                 "key": "buyer",

+ 14 - 0
src/front/front.go

@@ -38,6 +38,7 @@ type Front struct {
 	finishCheck   xweb.Mapper `xweb:"/center/finishcheck"`
 	errCheck      xweb.Mapper `xweb:"/center/errcheck"`
 	syncMarked    xweb.Mapper `xweb:"/center/syncmarked"`
+	markedInit    xweb.Mapper `xweb:"/center/markedinit"`
 }
 
 var preKey = "ck_"
@@ -687,6 +688,17 @@ func (i *Front) SyncMarked() {
 	i.ServeJson(map[string]interface{}{"msg": msg, "flag": success})
 }
 
+//将marked表中ck_data:2更新为0
+func (i *Front) MarkedInit() {
+	set := map[string]interface{}{
+		"$set": map[string]interface{}{
+			"ck_data": 0,
+		},
+	}
+	b := util.MgoM.Update(util.Config.Fromtable, `{"ck_data":2}`, set, false, true)
+	i.ServeJson(map[string]interface{}{"success": b})
+}
+
 //标注完成
 func (i *Front) FinishCheck() {
 	i.Render("finish.html")
@@ -1032,6 +1044,8 @@ func BzSJDD(content []interface{}, set, unset, errset map[string]interface{}) {
 						if key == "bidopentime" || key == "publishtime" || key == "bidendtime" || key == "project_startdate" || key == "project_completedate" {
 							inputTmp, _ := time.ParseInLocation(qu.Date_Full_Layout, input.(string), time.Local)
 							input = inputTmp.Unix()
+						} else if key == "project_duration" {
+							input = qu.IntAll(input)
 						}
 						set[key] = input
 						errset[key] = status

BIN
src/src


BIN
src/src.exe


+ 32 - 22
src/web/templates/detail.html

@@ -203,7 +203,7 @@
                                                 <div v-for="uin of two.uInput" class="input-box" :key="uin.title">
                                                     <div class="label" v-if="uin.selectArr">
                                                         <span>[[uin.title]]&nbsp;:&nbsp;</span>
-                                                        <select v-model="uin.select">
+                                                        <select v-model="uin.select" @change="selectchange(uin,'3', two, one)">
                                                             <option disabled value="">请选择</option>
                                                             <option v-for="o in uin.selectArr">[[o]]</option>
                                                         </select>
@@ -614,6 +614,9 @@
             ]
         },
         methods: {
+            selectchange(uni,status,two,one){
+              this.setStatus(uni,status,two,one);
+            },
             openHref () {
               if(!issave){
                  alert("请先保存数据!")
@@ -768,21 +771,21 @@
                 var temp = document.querySelectorAll('mark')[0]
                 document.querySelector('.article').scrollTop = offset(temp).top - window.screen.height / 2
             },
-            markTag:function(n){
-                $.ajax({
-                    url:"/markTag",
-                    method:"post",
-                    data: {tag:n,_id:_id},
-                    success:function(res){
-                        if(res){
-                            document.getElementById("com-alert-val").innerHtml="标记成功";
-                            var label1 = document.getElementById("com-alert");
-                            label1.style.display="block";
-                            setTimeout(function(){label1.style.display="none";},1000)
-                        }
-                    }
-                });
-            },
+            //markTag:function(n){
+            //    $.ajax({
+            //        url:"/markTag",
+            //        method:"post",
+            //        data: {tag:n,_id:_id},
+            //        success:function(res){
+            //            if(res){
+            //                document.getElementById("com-alert-val").innerHtml="标记成功";
+            //                var label1 = document.getElementById("com-alert");
+            //                label1.style.display="block";
+            //                setTimeout(function(){label1.style.display="none";},1000)
+            //            }
+            //        }
+            //    });
+            //},
             addChild: function (one) {
                 var tempNode = {}
                 switch (one.title) {
@@ -977,18 +980,25 @@
                 }
                 var d= JSON.stringify(this.editData);
                 console.log(d)
+                var _this = this
                 $.ajax({
                     url:"/center/biaozhu",
                     method:"post",
                     data: {key:d,_id:_id,stype:stype},
                     success:function(res){
                         if(res){
-                            document.getElementById("com-alert-val").innerHtml="保存成功";
-                            var label1 = document.getElementById("com-alert");
-                            label1.style.display="block";
-                            setTimeout(function(){
-                                label1.style.display="none";
-                            },1000)
+                          _this.$message({
+                            message: '保存成功',
+                            type: 'success',
+                            duration: 1000,
+                            offset: 300
+                          });
+                          //  document.getElementById("com-alert-val").innerHtml="保存成功";
+                          //  var label1 = document.getElementById("com-alert");
+                          //  label1.style.display="block";
+                          //  setTimeout(function(){
+                          //      label1.style.display="none";
+                          //  },1000)
                             issave = true//保存成功
                         }
                     },

+ 35 - 2
src/web/templates/list.html

@@ -158,6 +158,7 @@
                      </div>-->
                      <button type="submit" style="display: none" class="btn btn-primary" id="submitForm"></button>
                      <div  class="btn btn-primary" style="margin-left: 15px" onclick="alertsync()">查看</div>
+                    <div id="markedinit"  class="btn btn-primary" style="margin-left: 15px;display:none;" onclick="markedinit()">初始化marked</div>
 <!--                     <div  class="btn btn-primary" style="margin-left: 15px" onclick="syncmarked()">同步</div>-->
                  </div>
              </form>
@@ -213,6 +214,9 @@
 <script>
 var vueApp = new Vue()
 $(function(){
+  if({{.T.coll}} == "marked"){
+    $("#markedinit").css("display","");
+  }
   //是否不存在标记
   if( {{.T.hasno}} ){
     $("#hasno").attr("checked",true);
@@ -241,9 +245,18 @@ $(function(){
     $("#minval").css("display","");
     $("#boexists").css("display","");
   }
-
+  
+  $("#fromtable").on('input propertychange', function(){
+    var tmpcoll = $("#fromtable").val();
+    if(tmpcoll == "marked"){
+      $("#markedinit").css("display","");
+    }else{
+      $("#markedinit").css("display","none");
+    }
+  });
 })
 
+
 function getdetail(id) {
     $.ajax({
         url: "/center/checkid",
@@ -318,7 +331,7 @@ function importbyes(count,msg,text,coll){
 }
 
 function importes(estext,coll){
-  //showLoading()
+    showLoading()
     $.ajax({
         url: "/center/importbyes",
         method: "post",
@@ -483,7 +496,27 @@ function syncmarked() {
             }
         })
     }
+}
 
+function markedinit(){
+  vueApp.$confirm('确定初始化marked表中ck_data标记?', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning'
+  }).then(() => {
+      $.ajax({
+            url: "/center/markedinit",
+            type: "post",
+            success: function (r) {
+                if(r&&r.success){
+                    alert("初始化成功");
+                }else{
+                    alert("初始化失败");
+                }
+            }
+        })
+  }).catch(() => {
+  });
 }
 
 function saveuser() {