apply-clients 3.5.5-54 → 3.5.5-56

package/build/dev-server.js

@@ -5,13 +5,17 @@ var proxyMiddleware = require('http-proxy-middleware')
 // var httpProxy = require('http-proxy')
 var app = express()
 var compiler = webpack(config)
-var ldap = 'http://125.71.238.50:30789'
-var applyinstall = 'http://125.71.238.50:30789'
-//测试地址
-// var ldap = 'http://192.168.50.93:31986'
-// var applyinstall = 'http://192.168.50.93:31986'
+// var proxy = httpProxy.createProxyServer()
+// var ldap = 'http://121.36.79.201:8400'
+// var applyinstall = 'http://121.36.79.201:8400'
+var ldap = 'http://192.168.50.93:31986/'
+var applyinstall = 'http://192.168.50.93:31986/'
 
 var proxyTable = {
+  '/api': {
+    target: ldap,
+    changeOrigin: true
+  },
   '/rs/logic/getSaleInitData': {
     target: ldap,
     changeOrigin: true
@@ -124,10 +128,10 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(30789, function (err) {
+module.exports = app.listen(8300, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:30789')
+  console.log('Listening at http://localhost:8300')
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.5-54",
+  "version": "3.5.5-56",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Supervisory/SupervisoryControl.vue

@@ -1,141 +1,141 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <div class="col-sm-2" style="margin-top: 20px">
-          <supervisory-chart :selectdata="selectdata"></supervisory-chart>
-        </div>
-        <div class="col-sm-10" style="margin-top: 20px">
-          <tabset v-ref:tabs :close="false">
-            <tab :header='selectdata.defname'>
-              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
-            </tab>
-            <tab header='附件'>
-              <apply-upload :blodid="selectdata.f_process_id"
-                            :pblobid="selectdata.f_parent_process_id"
-                            :isupload = "false"
-                            :isdelete="false"
-                            :isusetype="true"
-                            :isremark = "true"
-                            :takeimg="false"
-                            :issearch="true"
-                            :defname="selectdata.defname">
-              </apply-upload>
-            </tab>
-          </tabset>
-        </div>
-        <div style="height: 1%">
-
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '流程监控',
-    data () {
-      return {
-        showtotal: false, // 控制详细信息显示
-        showData: true,
-        selectdata: {},
-        xmlname: '' // 配置文件名称
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let data = {
-          workname: this.selectdata.processname
-        }
-
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetConfigs',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-
-        Vue.prototype.$workflow_vue = res.data
-      }
-    },
-    events: {
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-
-        if (servicedata.id) {
-          let data = {
-            condition: `u.id = ${servicedata.id}`,
-            data: {
-              orgid: this.$login.f.orgid
-            }
-          }
-          let res = await this.$resetpost(
-            'rs/sql/supervisory',
-            {data: data},
-            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
-          )
-          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
-        } else {
-          this.selectdata = servicedata
-        }
-
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-
-      },
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.queryuser.$refs.cp.$refs.cri.search()
-        }
-      },
-      async 'apply' (val) {
-        this.selectdata = null
-        this.selectdata = val
-        this.showtotal = false
-
-        // 获取配置文件
-        await this.loadName()
-
-        this.$refs.query.$refs.cp.pager = false
-        this.showData = false
-
-        this.showtotal = true
-      },
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      'loadPage' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-      }
-    },
-
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <div class="col-sm-2" style="margin-top: 20px">
+          <supervisory-chart :selectdata="selectdata"></supervisory-chart>
+        </div>
+        <div class="col-sm-10" style="margin-top: 20px">
+          <tabset v-ref:tabs :close="false">
+            <tab :header='selectdata.defname'>
+              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
+            </tab>
+            <tab header='附件'>
+              <apply-upload :blodid="selectdata.f_process_id"
+                            :pblobid="selectdata.f_parent_process_id"
+                            :isupload = "false"
+                            :isdelete="false"
+                            :isusetype="true"
+                            :isremark = "true"
+                            :takeimg="false"
+                            :issearch="true"
+                            :defname="selectdata.defname">
+              </apply-upload>
+            </tab>
+          </tabset>
+        </div>
+        <div style="height: 1%">
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '流程监控',
+    data () {
+      return {
+        showtotal: false, // 控制详细信息显示
+        showData: true,
+        selectdata: {},
+        xmlname: '' // 配置文件名称
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let data = {
+          workname: this.selectdata.processname
+        }
+
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      }
+    },
+    events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/supervisory',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        }
+      },
+      async 'apply' (val) {
+        this.selectdata = null
+        this.selectdata = val
+        this.showtotal = false
+
+        // 获取配置文件
+        await this.loadName()
+
+        this.$refs.query.$refs.cp.pager = false
+        this.showData = false
+
+        this.showtotal = true
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      }
+    },
+
+    watch: {
+    }
+  }
+</script>