From 90fa9e4f85c58f246757cd924d838ab392353600 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 21 Jun 2020 09:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/frame/login/login.js             |  9 ++++--
 .../workflowManage/workflowManage.html        |  5 +++
 .../property/workflowManage/workflowManage.js | 32 +++++++++++++++++--
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/public/pages/frame/login/login.js b/public/pages/frame/login/login.js
index a5b97f6c1..6a729656f 100644
--- a/public/pages/frame/login/login.js
+++ b/public/pages/frame/login/login.js
@@ -12,7 +12,7 @@
         _initMethod: function () {
             vc.component.clearCacheData();
             vc.component._loadSysInfo();
-            
+
         },
         _initEvent: function () {
             vc.component.$on('errorInfoEvent', function (_errorInfo) {
@@ -78,13 +78,18 @@
                 }
                 vc.http.post(
                     'login',
-                    'doLogin',
+                    'doLogin?version=2.0',
                     JSON.stringify(vc.component.loginInfo),
                     {
                         emulateJSON: true
                     },
                     function (json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        let _data = JSON.parse(json);
+                        if (_data.hasOwnProperty('code') && _data.code != '0') {
+                            vc.toast(_data.msg);
+                            return;
+                        }
                         if (res.status == 200) {
                             vc.emit('initData', 'loadCommunityInfo', {
                                 url: '/'
diff --git a/public/pages/property/workflowManage/workflowManage.html b/public/pages/property/workflowManage/workflowManage.html
index e011209f3..7f1201fcf 100644
--- a/public/pages/property/workflowManage/workflowManage.html
+++ b/public/pages/property/workflowManage/workflowManage.html
@@ -83,6 +83,9 @@
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditWorkflowModel(workflow)">设置流程
                                         </button>
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_openWorkflowImage(workflow)">流程图
+                                        </button>
                                     </div>
                                 </td>
                             </tr>
@@ -102,4 +105,6 @@
         </div>
     </div>
 
+    <vc:create path="common/viewImage"></vc:create>
+
 </div>
\ No newline at end of file
diff --git a/public/pages/property/workflowManage/workflowManage.js b/public/pages/property/workflowManage/workflowManage.js
index 79e821850..7b8188743 100644
--- a/public/pages/property/workflowManage/workflowManage.js
+++ b/public/pages/property/workflowManage/workflowManage.js
@@ -65,8 +65,8 @@
             },
             _openEditWorkflowModel: function (_workflow) {
 
-               vc.jumpToPage('/admin.html#/pages/property/workflowSettingManage?'+vc.objToGetParam(_workflow));
-                
+                vc.jumpToPage('/admin.html#/pages/property/workflowSettingManage?' + vc.objToGetParam(_workflow));
+
             },
             _queryWorkflowMethod: function () {
                 vc.component._listWorkflows(DEFAULT_PAGE, DEFAULT_ROWS);
@@ -78,6 +78,34 @@
                 } else {
                     vc.component.workflowManageInfo.moreCondition = true;
                 }
+            },
+            _openWorkflowImage: function (_workflow) {
+
+                var param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        flowId: _workflow.flowId
+                    }
+                };
+
+                //发送get请求
+                vc.http.apiGet('workflow.listWorkflowImage',
+                    param,
+                    function (json, res) {
+                        var _workflowManageInfo = JSON.parse(json);
+                        if(_workflowManageInfo.code != '0'){
+                            vc.toast(_workflowManageInfo.msg);
+
+                            return ;
+                        }
+                        vc.emit('viewImage', 'showImage', {
+                            url: 'data:image/png;base64,'+_workflowManageInfo.data
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+                
             }