no message

cool-admin-midway-master/src/app/modules/shuyou/controller/admin/data_active.ts

@@ -1,9 +1,9 @@
 /*
  * @Author: YKH
  * @Date: 2021-12-10 09:04:02
- * @LastEditTime: 2022-06-07 11:02:09
+ * @LastEditTime: 2022-09-20 21:18:16
  * @Description: 
- * @FilePath: \cool-admin\cool-admin-midway-master\src\app\modules\shuyou\controller\admin\data_active.ts
+ * @FilePath: \cool-admin-3.x\cool-admin-midway-master\src\app\modules\shuyou\controller\admin\data_active.ts
  */
 import { Provide, Inject, Post, Body, ALL } from '@midwayjs/decorator';
 import { CoolController, BaseController } from 'midwayjs-cool-core';
@@ -75,6 +75,9 @@ export class ShuyouDataActiveController extends BaseController {
     let growth_new = '0%'
     let growth_pay = '0%'
     let growth_active = '0%'
+    if(today.length == 0){
+      return { code: -1, message: '未查询到今日数据' };
+    }
     if (today[0].new_date) {
       today_sum_new = today[0].sum_new
       today_sum_pay = today[0].sum_pay

cool-admin-midway-master/src/app/modules/shuyou/service/rent_computer.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: YKH
  * @Date: 2021-12-08 10:26:27
- * @LastEditTime: 2022-09-20 18:06:03
+ * @LastEditTime: 2022-09-20 21:31:41
  * @Description:
  * @FilePath: \cool-admin-3.x\cool-admin-midway-master\src\app\modules\shuyou\service\rent_computer.ts
  */
@@ -167,12 +167,6 @@ export class ShuyouRentComputerService extends BaseService {
       queryObject.pc_num_old +
       '更换为租机编号' +
       queryObject.pc_num_new;
-    let object_old = {
-      updateTime: new Date(),
-      pc_num: queryObject.pc_num_old,
-      rent_end: this.utils.formatDate(new Date()) + ' 23:59:59',
-      remark: info.remark + ';' + remark,
-    };
     let object_new = {
       pc_num: queryObject.pc_num_new,
       pc_name: queryObject.pc_num_new,
@@ -189,6 +183,18 @@ export class ShuyouRentComputerService extends BaseService {
       rent_price_used: 0,
       remark: remark,
     };
+    // console.log(info.remark);
+    if (info.remark == '' || info.remark == null) {
+      remark = remark;
+    } else {
+      remark = info.remark + ';' + remark;
+    }
+    let object_old = {
+      updateTime: new Date(),
+      pc_num: queryObject.pc_num_old,
+      rent_end: this.utils.formatDate(new Date()) + ' 23:59:59',
+      remark: remark,
+    };
 
     let updateResult = await this.ShuyouRentComputerEntity.createQueryBuilder()
       .update()

cool-admin-midway-master/src/app/modules/task/service/demo.ts

@@ -1,9 +1,9 @@
 /*
  * @Author: YKH
  * @Date: 2021-12-08 10:26:27
- * @LastEditTime: 2021-12-16 15:07:16
- * @Description: 
- * @FilePath: \cool-admin\cool-admin-midway-master\src\app\modules\task\service\demo.ts
+ * @LastEditTime: 2022-09-20 22:21:35
+ * @Description:
+ * @FilePath: \cool-admin-3.x\cool-admin-midway-master\src\app\modules\task\service\demo.ts
  */
 import { Inject, Logger, Provide } from '@midwayjs/decorator';
 import { BaseService } from 'midwayjs-cool-core';
@@ -29,35 +29,34 @@ export class TaskDemoService extends BaseService {
   /**
    *
    * 测试访问小绵羊接口
-   * @return {*} 
+   * @return {*}
    * @memberof TaskDemoService
    */
-  async testXMY() {
-    let new_date = this.utils.formatDate(new Date())
-    this.logger.info('testXMY>>>' + new_date);
-    let xmyData = await queryXMY(new_date, new_date)
-    console.log(xmyData)
-    return '任务执行成功>>>testXMY>>>' + new_date;
-  }
-
+  // async testXMY() {
+  //   let new_date = this.utils.formatDate(new Date())
+  //   this.logger.info('testXMY>>>' + new_date);
+  //   let xmyData = await queryXMY(new_date, new_date)
+  //   console.log(xmyData)
+  //   return '任务执行成功>>>testXMY>>>' + new_date;
+  // }
 }
 
 // 获取小绵羊后台数据
-let queryXMY = function (new_date1, new_date2) {
-  var url = 'http://api.sheepsdk.17xmy.com/foreign/api/get_youhua_data.php?start_day=' + new_date1 + '&end_day=' + new_date2
-  var http = require('http');
-  var pm = new Promise(function (resolve, reject) {
-    http.get(url, function (res) {
-      var html = '';
-      res.on('data', function (d) {
-        html += d.toString()
-      });
-      res.on('end', function () {
-        resolve(html);
-      });
-    }).on('error', function (e) {
-      reject(e)
-    });
-  });
-  return pm;
-}
+// let queryXMY = function (new_date1, new_date2) {
+//   var url = 'http://api.sheepsdk.17xmy.com/foreign/api/get_youhua_data.php?start_day=' + new_date1 + '&end_day=' + new_date2
+//   var http = require('http');
+//   var pm = new Promise(function (resolve, reject) {
+//     http.get(url, function (res) {
+//       var html = '';
+//       res.on('data', function (d) {
+//         html += d.toString()
+//       });
+//       res.on('end', function () {
+//         resolve(html);
+//       });
+//     }).on('error', function (e) {
+//       reject(e)
+//     });
+//   });
+//   return pm;
+// }

cool-admin-vue-vue3-ts-vite/src/cool/modules/shuyou/views/rent_computer.vue

@@ -230,10 +230,6 @@ export default defineComponent({
 								// "multiple-limit": 3
 							}
 						}
-					},
-					rules: {
-						required: true,
-						message: "游戏任务不能为空"
 					}
 				},
 				{