system-clients 3.2.1-34-1 → 3.2.1-34-2

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Jul 08 18:02:59 GMT+08:00 2022
+gradle.version=7.1

package/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.1-34-1",
+  "version": "3.2.1-34-2",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -22,6 +22,7 @@
     "js-base64": "^2.4.9",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
+    "nyc": "^15.1.0",
     "src": "^1.1.2",
     "vue": "^1.0.17"
   },

package/src/components/server/Login.vue

@@ -116,6 +116,10 @@
               <label class="col-sm-2">预约待办:</label>
               <span style="font-weight:normal">{{OrderDaiBan}}</span>
             </div>
+            <div class="col-sm-12 "  v-for="daibanitem in safecheckDaiBan">
+              <label class="col-sm-2">{{daibanitem.oldData.title}}:</label>
+              <span style="font-weight:normal">{{daibanitem.text}}</span>
+            </div>
           </div>
         </form>
       </article>
@@ -137,6 +141,7 @@ import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 
+let daibanJson = require('../../util/Daiban.json')
 
 
 let saveGen = function *(self) {
@@ -204,6 +209,11 @@ let saveGen = function *(self) {
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
         // 获取待办
         self.getDaiBan()
+
+      }
+      if (self.$login.showDaiBan && self.$login.r.includes('登录预约信息')){
+        // 获取待办
+        self.getDaiBanA()
       }
     } else {
       self.$goto('home-page', {functions: self.$login.f,config: self.config})
@@ -317,6 +327,8 @@ export default {
       loginotherflag :true,
       // 报建待办
       AppDaiBan: '',
+      //安检待办
+      safecheckDaiBan:[],
       // 预约待处理
       OrderDaiBan: ''
     }
@@ -370,6 +382,38 @@ export default {
     })
 
     },
+    async getDaiBanA(){
+      // 是否全局开启待办通知
+      if (daibanJson.enable) {
+        console.log("当前获取到待办配置为" + JSON.stringify(daibanJson))
+        let http = new HttpResetClass()
+        let daibanArray = []
+        for (let daibanItem of daibanJson.daiban) {
+          console.log("开始处理待办任务：" + daibanItem.title + "当前任务状态：" + daibanItem.enable?"开启":"关闭" )
+          if (daibanItem.enable) { // 控制每一项通知是否开启
+          let postResult = ''; //提示信息为
+           await http.load("POST",daibanItem.url,{data:daibanItem.data},{ resolveMsg: null, rejectMsg: null})
+              .then((res)=>{
+                let responseData = res.data
+                for (let item of responseData) {
+                  postResult += eval(daibanItem.text) + "\n"
+                }
+                postResult += '\t'
+                daibanArray.push({text:postResult,oldData:daibanItem})
+              })
+          }
+        }
+        console.log("安检数据为："+JSON.stringify(daibanArray))
+        this.safecheckDaiBan = daibanArray
+      }else {
+        console.log("待办提醒全局关闭。")
+      }
+
+
+
+
+    },
+
     async loginother(){
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {