附件列表下载和事件列表样式修改

assets/js/controllers/customform/customformCtrl.js

@@ -18125,16 +18125,18 @@ appFormly.config(function config(formlyConfigProvider) {
           uploader.uploadAll();
         };
         //附件下载
-        $scope.download = function (token, filename) {
-          var downUrl = to.ApiService.downloadAttachment(
-            to.downUrl,
-            token
-          ).getRequestedUrl();
+        $scope.download = function (attachment) {
+        // $scope.download = function (token, filename) {
+          var downUrl = attachment.previewUrl;
+          // var downUrl = to.ApiService.downloadAttachment(
+          //   to.downUrl,
+          //   token
+          // ).getRequestedUrl();
           // window.open(downUrl);
           var a = document.createElement("a");
           a.href = downUrl;
           a.target = "_blank";
-          a.download = filename;
+          a.download = attachment.name;
           document.body.appendChild(a);
           a.click();
         };

assets/views/customform/tpl/ui-upDropFile.html

@@ -74,7 +74,7 @@
                                     <a ng-href="{{attachment.link}}" ng-init="attachment.link=downloadUrl(attachment.id)" class="btn btn-transparent btn-xs" tooltip-placement="top" tooltip="下载"><i class="fa fa-download"></i></a>
                                 </div> -->
                                 <div class="visible-md visible-lg hidden-sm hidden-xs">
-                                    <a ng-click="download(attachment.token,attachment.name)" class="btn btn-transparent btn-xs" tooltip-placement="top" tooltip="下载"><i class="fa fa-download"></i></a>
+                                    <a ng-click="download(attachment)" class="btn btn-transparent btn-xs" tooltip-placement="top" tooltip="下载"><i class="fa fa-download"></i></a>
                                 </div>
                             </td>
                             <!-- <td class="center">

assets/views/incident/list.html

@@ -80,12 +80,12 @@
                                 </ui-select> -->
                             </div>
                         </div>
-                        <div class="form-group incidentsearch  wt_width" ng-if="repairMain.valueconfig == 1">
+                        <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">报修人:</div>
                                 <ui-select class="pull-right selectzise wt_width1 wt_width3"
                                     ng-model="searchkeys.requester" theme="bootstrap">
-                                    <ui-select-match placeholder="请选择报修人">
+                                    <ui-select-match placeholder="请选择">
                                         {{$select.selected.name}}
                                     </ui-select-match>
                                     <ui-select-choices repeat="item in requester"
@@ -104,7 +104,7 @@
                                 </ui-select> -->
                             </div>
                         </div>
-                        <div class="form-group incidentsearch  wt_width" ng-if="repairMain.valueconfig == 1">
+                        <div class="form-group incidentsearch" ng-if="repairMain.valueconfig == 1">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">联系电话:</div>
                                 <input class=" inputcolor wt_width1 wt_width3 pull-right" type="text"
@@ -126,12 +126,12 @@
                                 </div>
                             </div>
                         </div> -->
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <!-- <div class="pull-right"> -->
                             <div class="control-label pull-left margin-top-5 ">区域:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.area" theme="bootstrap"
                                 ng-change="onChangearea(searchkeys)">
-                                <ui-select-match placeholder="请选择区域">
+                                <ui-select-match placeholder="请选择">
                                     {{$select.selected.area}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in outarea | filter: $select.search">
@@ -140,12 +140,12 @@
                             </ui-select>
                             <!-- </div> -->
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <!-- <div class="pull-right"> -->
                             <div class="control-label pull-left margin-top-5">地点:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.place" theme="bootstrap"
                                 ng-change="onChangeplace(key)">
-                                <ui-select-match placeholder="请选择地点拼音检索">
+                                <ui-select-match placeholder="请选择">
                                     {{$select.selected.place}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in outplace | filter: $select.search">
@@ -154,11 +154,11 @@
                             </ui-select>
                             <!-- </div> -->
                         </div>
-                        <div class="form-group incidentsearch  wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">状态:</div>
                             <ui-select ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.state"
                                 theme="bootstrap">
-                                <ui-select-match placeholder="请选择状态">
+                                <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in state | filter: $select.search">
@@ -166,20 +166,20 @@
                                 </ui-select-choices>
                             </ui-select>
                         </div>
-                        <div class="form-group incidentsearch  wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">事件分类:</div>
-                            <multi-select-tree data-default-label="请选择事件分类" class="pull-right selectzise wt_width1 wt_width3"
+                            <multi-select-tree data-default-label="请选择" class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="cifilter_classic" data-input-model="select_treedata"
                                 data-output-model="cifilter_classics" theme="bootstrap" multi-select="false"
                                 data-callback="onFilterCallback(item)" data-select-only-leafs="false"
                                 reset-search-input="false" data-trans-label="category" data-switch-view="false">
                             </multi-select-tree>
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5 ">受理人:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="searchkeys.acceptUser" theme="bootstrap">
-                                <ui-select-match placeholder="请选择受理人拼音检索">
+                                <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in acceptUser | filter: $select.search"
@@ -188,11 +188,11 @@
                                 </ui-select-choices>
                             </ui-select>
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">处理人:</div>
                             <ui-select class="pull-right selectzise wt_width1 wt_width3"
                                 ng-model="searchkeys.handlingPersonnelUser" theme="bootstrap">
-                                <ui-select-match placeholder="请选择处理人拼音检索">
+                                <ui-select-match placeholder="请选择">
                                     {{$select.selected.name}}
                                 </ui-select-match>
                                 <ui-select-choices repeat="item in handlingPersonnelUser"
@@ -201,7 +201,7 @@
                                 </ui-select-choices>
                             </ui-select>
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">登记时间:</div>
                                 <input type="text" class=" incidentsearchsize wt_width5"
@@ -211,7 +211,7 @@
                                     placeholder="" />
                             </div>
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="">
                                 <div class="control-label pull-left margin-top-5">至</div>
                                 <input type="text" class=" selectzise incidentsearchsize wt_width5"
@@ -220,14 +220,14 @@
                                     close-text="关闭" ng-click="endOpen($event)" placeholder="" />
                             </div>
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <div>
                                 <div class="control-label pull-left margin-top-5 margin-right-5">事件单号:</div>
                                 <input class="f inputcolor wt_width1 wt_width3 pull-right" type="text"
                                     ng-model="searchkeys.incidentsign" placeholder="" />
                             </div>
                         </div>
-                        <div class="form-group incidentsearch wt_width">
+                        <div class="form-group incidentsearch">
                             <div class="control-label pull-left margin-top-5">是否逾期:</div>
                             <ui-select ng-change="selectTypeChange()" ng-model="searchkeys.selectType" class="pull-right selectzise wt_width1 wt_width3" theme="bootstrap">
                                 <ui-select-match placeholder="请选择">