Merge branch 'igirl-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-web

igirl-web/app/base/db/task/TmDynamicsAllotTask.js

+const TaskBase = require("../task.base");
+var system = require("../../system")
+const logCtl = system.getObject("web.oplogCtl");
+class TmDynamicsAllotTask extends TaskBase {
+  constructor() {
+    super(TaskBase.getServiceName(TmDynamicsAllotTask));
+    this.bytmdynamicsSve = system.getObject("service.bytmdynamicsSve");
+  }
+  async subDoTask() {
+    await this.execSend();
+  }
+  async execSend() {
+    var tmp = await this.bytmdynamicsSve.notifyWxTmDynamics();
+    //日志记录
+    logCtl.info({
+      optitle: "商标监控动态数量增加微信通知执行结果",
+      op: "base/db/task/TmDynamicsAllotTask.js",
+      content: "执行结果：" + tmp,
+      clientIp: ""
+    });
+  }
+}
+module.exports = TmDynamicsAllotTask;

igirl-web/app/base/db/task/TmMonitAllotTask.js

+const TaskBase = require("../task.base");
+var system = require("../../system")
+const logCtl = system.getObject("web.oplogCtl");
+class TmMonitAllotTask extends TaskBase {
+  constructor() {
+    super(TaskBase.getServiceName(TmMonitAllotTask));
+    this.bytmmonitSve = system.getObject("service.bytmmonitSve");
+  }
+  async subDoTask() {
+    await this.execSend();
+  }
+  async execSend() {
+    console.log("cehishi ewhcihhscxheikjhc");
+    // var tmp = await this.bytmmonitSve.getMonitAll();
+    //日志记录
+    logCtl.info({
+      optitle: "商标监控动态执行结果",
+      op: "base/db/task/TmMonitAllotTask.js",
+      content: "执行结果：" + tmp,
+      clientIp: ""
+    });
+  }
+}
+module.exports = TmMonitAllotTask;

igirl-web/app/front/entry/public/js/wts.js

@@ -7,6 +7,7 @@ var app = new Vue({
         mobile:"",
         zipCode:"",
         agentCompanyname:"",
+        deledate:"2019年11月26号"
       }
   
     },
@@ -37,8 +38,17 @@ var app = new Vue({
           console.log(this.agentCompanyname);
         }
       }
+      this.deledate = this.getDate();
     },
     methods:{
+      getDate(){
+        var d = new Date();
+        var year = d.getFullYear();
+        var month = (d.getMonth() + 1) >=10? (d.getMonth() + 1) : "0" + (d.getMonth() + 1);
+        var date = d.getDate() >=10 ? d.getDate() : "0" + d.getDate();
+        var tempDate = year + "年" + month + "月" + date+"日";
+        return tempDate;
+      },
       postReq(path,data){
         return axios.post(path,data).then(function(r){
           return r.data?r.data:null;

igirl-web/app/front/entry/wts.ejs

@@ -188,7 +188,7 @@ li.el-carousel__indicators{
 													 <span id="mailCode">{{zipCode}}</span>
 												 </span>
 												 </td>
-												 <td align="right" style="font-size:0.8rem;padding-right:30px"><span id="deledate"></span></td>
+												 <td align="right" style="font-size:0.8rem;padding-right:30px"><span id="deledate">{{deledate}}</span></td>
 											</tr>
 										 </tbody>
 								</table>