选择文件bug和样式问题

atms-orangeheap/src/components/Mine.vue

@@ -9,7 +9,7 @@
                                 class="mx-auto d-block"
                                 size="130"
                         >
-                            <img src="https://demos.creative-tim.com/vue-material-dashboard/img/marc.aba54d65.jpg">
+                            <img src="../assets/dts-mine.png">
                         </v-avatar>
                         <v-card-text class="text-xs-center">
                             <h6 class="category text-gray font-weight-thin mb-9"></h6>

atms-orangeheap/src/components/Panel.vue

@@ -50,6 +50,7 @@
                 clipped-right
                 height="90"
                 color="#ffffff"
+                style="border-bottom: 1px solid #dddddd"
         >
             <!--<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
             <v-toolbar-title></v-toolbar-title>
@@ -60,7 +61,7 @@
             >
                 <svg class="icon" aria-hidden="true" ><use
                         :xlink:href="selectedItem.iconName"></use></svg>
-                <span style="vertical-align: middle; margin-left: 10px; font-size:27px" v-text="selectedItem.title"></span>
+                <span style="vertical-align: middle; margin-left: 10px;font-weight:normal; font-size:26px" v-text="selectedItem.title"></span>
                 <v-icon style="vertical-align: middle;margin-top:5px;float:right;height:28px;width:28px;color:#333333;">menu</v-icon>
             </span>
 

atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js

@@ -239,7 +239,11 @@
                 },
                 __RequestVerificationToken: token,
                 withCredentials: true
-            }).success(function (resp) {
+
+            }).success(function(resp) {
+                var ret = resp.data;
+                $scope.fileName= '';
+                $('#busy-indicator-container').hide();
                 deferred.resolve();
                 uploadAfter();
                 if (resp.data|| resp.result) {
@@ -968,6 +972,7 @@
             $scope.showGMVSubsidyGrid = false;
             $scope.showEmployeeNumGrid = false;
             $scope.showDriverNumGrid = false;
+            $scope.fileName='';
             switch (i.code) {
                 case 0:
                     $scope.showTaxGrid = true;

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js

@@ -206,6 +206,7 @@
                 withCredentials: true
             }).then(function (resp) {
                 var ret = resp.data;
+                $scope.fileName = '';
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {
@@ -640,6 +641,7 @@
             $scope.selectType = i.type;
             $scope.showInternationalBUDataGrid = false;
             $scope.showInternationalTaxDataGrid = false;
+            $scope.fileName='';
             switch (i.code) {
                 case 100:
                     $scope.showInternationalBUDataGrid = true;

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -171,7 +171,7 @@
                 __RequestVerificationToken: token,
                 withCredentials: true
             }).then(function(data) {
-                    $scope.fileName='';
+                    $scope.fileNameShow=false;
                     $('#busy-indicator-container').hide();
                     var resp = data.data;
                     deferred.resolve();

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -42,7 +42,7 @@
                             <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
                         </div>
                     </div>
-                    <div ng-show="fileName" style="display:inline-block">
+                    <div ng-show="fileNameShow" style="display:inline-block">
                         <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
                     </div>
                     <div class="form-group">

atms-web/src/main/webapp/orangeweb/css/app.8f5ac7e7.css

-.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-0817fb63]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}.color_active{color:red!important}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/css/app.e87f05ce.css

+.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-579027fe]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/index.html

@@ -49,4 +49,4 @@
         //send 发送
         xmlhttp.send();
 
-      }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.8f5ac7e7.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.cf3691a6.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.8f5ac7e7.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.cf3691a6.js></script></body></html>
\ No newline at end of file
+      }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.e87f05ce.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.6ae9ce65.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.e87f05ce.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.6ae9ce65.js></script></body></html>
\ No newline at end of file