system-clients 3.2.0 → 3.2.1-12

package/SystemClient.iml

@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.6.18" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "system-clients",
-  "version": "3.2.0",
+  "version": "3.2.1-12",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
+    "doc": "doc",
     "example": "examples",
     "test": "test"
   },
@@ -19,7 +20,6 @@
   "dependencies": {
     "base64-js": "^1.3.0",
     "js-base64": "^2.4.9",
-    "jsencrypt": "^3.0.0-rc.1",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "src": "^1.1.2",
@@ -55,6 +55,7 @@
     "isparta-loader": "^2.0.0",
     "jasmine-core": "^2.4.1",
     "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
     "json-loader": "^0.5.4",
     "karma": "^1.4.1",
     "karma-chrome-launcher": "^2.2.0",

package/src/components/Main.vue

@@ -122,6 +122,7 @@
 <script>
 import vue from 'vue'
 import co from 'co'
+import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
   let param = {
@@ -246,10 +247,36 @@ export default {
     // 				return false
     // 			}
     this.changeShow()
+    this.gotoWorkOrderSite()
   },
   methods: {
+    gotoWorkOrderSite(){
+      const isRemind =this.$appdata.getSingleValue("站点工单提醒")
+      console.log('站点工单是否提醒',isRemind)
+      if(isRemind && isRemind !== '是'){
+        return
+      }
+      if(this.functions.f_role_name.indexOf('派单员') !== -1){
+        const data = {
+          "condition":
+            {
+              "condition":" 1=1 ",
+              "sign":"1=1"
+            },
+          "userid":this.functions.name
+        }
+        new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          if(res.data && res.data.n !== 0){
+             this.$showMessage('你有'+res.data.n+'个工单待处理，是否跳转到站点工单页面',['confirm','cancel']).then((res) => {
+               if(res === 'confirm'){
+                 this.$goto('stand-work', {})
+               }
+             })
+          }
+        })
+      }
+    },
     hindsetting() {
-
       this.setting = !this.setting
       if (this.setting) {
         this.srcsetting = '../../static/newStyle/setting.png'

package/src/components/server/LoadData.vue

@@ -1,55 +1,55 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    props: {
-      componentName: {}
-    },
-    async ready () {
-      this.$nextTick(() => {
-        window.addEventListener('message', messageEvent => {
-          try {
-            const data = messageEvent.data
-            console.log('接收到数据', data)
-            this.$login = Object.assign(this.$login, data.login)
-            this.$appdata = Object.assign(this.$appdata, data.appdata)
-            if (!data.page) {
-              this.$showMessage('没有功能连接, 请配置!')
-              return
-            }
-            this.$goto(data.page)
-          } catch (e) {
-            console.log('登陆异常', e)
-          }
-        })
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    props: {
+      componentName: {}
+    },
+    async ready () {
+      this.$nextTick(() => {
+        window.addEventListener('message', messageEvent => {
+          try {
+            const data = messageEvent.data
+            console.log('接收到数据', data)
+            this.$login = Object.assign(this.$login, data.login)
+            this.$appdata = Object.assign(this.$appdata, data.appdata)
+            if (!data.page) {
+              this.$showMessage('没有功能连接, 请配置!')
+              return
+            }
+            this.$goto(data.page)
+          } catch (e) {
+            console.log('登陆异常', e)
+          }
+        })
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>