PC报修和微信报修图片展示问题

wechat/assets/js/controllers/weChat/myIncident/myIncidentDetailCtrl.js

@@ -86,6 +86,7 @@ app.controller('myIncidentDetailCtrl', ["$rootScope", "$scope", "$sce", '$stateP
         });
     };
     $scope.imagelist = [];
+    $scope.serverIp = $rootScope.serverIp;
     if ($scope.item.id) {
         api_wechatfile.listAttachments('wechatRequesterIncident', $scope.item.id).then(function(data) {
             var myData = Restangular.stripRestangular(data);

wechat/assets/js/main.js

@@ -12,7 +12,9 @@ var callIp = "";
 app.config(function($httpProvider) {
     $httpProvider.interceptors.push('sessionInjector');
 });
-
+app.run(['$rootScope', function ($rootScope) {
+    $rootScope.serverIp = serverIp;
+}]);
 //拦截器
 //$httpProvider.interceptors 不能注入$http和引用了$http的服务，否则会报依赖注入错误。
 // app.factory('sessionInjector', ['$rootScope', '$q', ' $injector ', function($rootScope, $q, $injector) {

wechat/assets/views/weChat/myIncident/myIncidentDetail.html

@@ -331,7 +331,7 @@
             <div class="normal-label-wrap">
                 <div class="normal-text  col col-70 col-xs-12">
                     <span class="ng-binding font-color-black pull-left">报修图片：<span class="font-color-gray"></span></span>
-                    <span ng-repeat="it in imagelist"><span><img ng-src='../file/{{it.token}}.{{it.suffix}}' class="pitt"></span></span>
+                    <span ng-repeat="it in imagelist"><span><img ng-src="{{serverIp}}/service/common/common/previewAttachmentImage/{{it.token}}" class="pitt"></span></span>
                     <!-- <span><img src="http://mxd.766.com/db/images/mob/9420543.png" class="pitt"></span> -->
                     <!-- <span> -->
                     <!-- <span class="pitt">

wechat/pcreq/assets/js/controllers.js

@@ -916,7 +916,8 @@ app.controller('requesterDetailCtrl', [
     "api_solution",
     "FileUploader",
     "TipService",
-    function ($scope, $rootScope, $state, $timeout, $interval, $sce, Restangular, UserRestangular, BpmRestangular, api_bpm_domain, api_solution, FileUploader, TipService) {
+    "api_wechatfile",
+    function ($scope, $rootScope, $state, $timeout, $interval, $sce, Restangular, UserRestangular, BpmRestangular, api_bpm_domain, api_solution, FileUploader, TipService,api_wechatfile) {
         console.log('requesterDetailCtrl is load');
 
         // TipService.setMessage('报障提交', '提交成功');
@@ -953,6 +954,17 @@ app.controller('requesterDetailCtrl', [
         $scope.degreeRemark = '';
 
         $scope.requester = JSON.parse($state.params.data);
+        // 附件 start
+        $scope.imagelist = [];
+        $scope.serverIp = $rootScope.serverIp;
+        api_wechatfile.listAttachments('wechatRequesterIncident', $scope.requester.id).then(function (data) {
+            var myData = data;
+            angular.forEach(myData.data, function (item, index) {
+                myData.data[index].token = item.token;
+                $scope.imagelist.push(myData.data[index]);
+            })
+        });
+        // 附件 end
 
         $scope.goBack = function () {
             $state.go('tab.requesterList', {});

wechat/pcreq/assets/js/main.js

@@ -109,6 +109,9 @@ app.config(['$httpProvider', '$stateProvider', '$urlRouterProvider', 'ADDRESS',
 app.config(function ($httpProvider) {
     $httpProvider.interceptors.push('sessionInjector');
 });
+app.run(['$rootScope', function ($rootScope) {
+    $rootScope.serverIp = serverIp;
+}]);
 
 //拦截器
 //$httpProvider.interceptors 不能注入$http和引用了$http的服务，否则会报依赖注入错误。
@@ -444,6 +447,27 @@ app.factory('api_bpm', ['BpmRestangular', function (BpmRestangular) {
 
     };
 }]);
+app.factory('WechatRestangularSeimin', ['Restangular', 'ADDRESS', function(Restangular, address) {
+    return Restangular.withConfig(function(RestangularConfigurer) {
+        // RestangularConfigurer.setBaseUrl(address.serverIp + address.serverIpPort + address.api + '/common/');
+        RestangularConfigurer.setBaseUrl(address.serverIp + address.serverIpPort + '/service' + '/common/');
+    });
+}]);
+app.factory('api_wechatfile', ['WechatRestangularSeimin', function(WechatRestangularSeimin) {
+    var dataService = WechatRestangularSeimin.all("common");
+    return {
+        listAttachments: function(type, model) {
+            return dataService.customGET('listAttachment/' + type + "/" + model, {});
+            // return dataService.one('listAttachment/' + type + "/" + model);
+        },
+        downloadAttachment: function(model) {
+            return dataService.one('downloadAttachment/' + model, {});
+        },
+        getDictionary: function(data) {
+            return dataService.customPOST(data, 'getDictionary', {});
+        }
+    };
+}]);
 
 app.factory('api_bpm_domain', ['BpmRestangular', 'CommonRestangular', 'WeChatRestangular', 'WeChatApply', function (BpmRestangular, CommonRestangular, WeChatRestangular, WeChatApply) {
     var bpmService = BpmRestangular.all("bpm");
@@ -501,7 +525,7 @@ app.factory('api_bpm_domain', ['BpmRestangular', 'CommonRestangular', 'WeChatRes
             return weChatService.one('saveAttachments/' + processId + '/' + taskId + '/' + userId);
         },
         uploadAttachment: function (processId, taskId, userId, data) {
-            return commonService.one('uploadAttachment/' + 'webRequesterIncident/' + processId);
+            return commonService.one('uploadAttachment/' + 'wechatRequesterIncident/' + processId);
         },
         download: function (attachmentId) {
             return bpmService.one('getAttachmentContent/' + attachmentId);

wechat/pcreq/assets/views/requesterDetail.html

@@ -65,10 +65,10 @@
                                     <TD colspan="3" bgcolor="#ffffff">&nbsp;{{requester.description}}</TD>
                                 </TR>
 
-                                <!--<TR>
+                                <TR>
                                     <TD bgcolor="#e9f2f9">附件</TD>
-                                    <TD colspan="3" bgcolor="#ffffff"><img src="images/pic.jpg" width="90" height="90"></TD>
-                                </TR>-->
+                                    <TD colspan="3" bgcolor="#ffffff"><span ng-repeat="it in imagelist"><img ng-src="{{serverIp}}/service/common/common/previewAttachmentImage/{{it.token}}" width="90" height="90"></span></TD>
+                                </TR>
 
                             </TBODY>
                         </TABLE>