Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java

@@ -157,14 +157,14 @@ public class DateUtils {
      * @return
      */
     public static Integer strToPeriodYM(String dateStr) {
-        dateStr = dateStr.replace("-","");
+        dateStr = dateStr.replace("-","").replace(" ","").replace("年","").replace("月","");
         Integer period = Integer.valueOf(dateStr);
         return period;
     }
 
 
     /**
-     * 将yyyymm 字符串转换为区间格式 yyyyMM
+     * 将yyyymm 字\转换为区间格式 yyyyMM
      *
      * @param dateStr
      * @return

atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java

@@ -335,7 +335,17 @@ public class AssetListServiceImpl extends BaseService {
         citAsset.setResidualRate(residualRate);
 
         //获取本年折旧额
-        citAsset.setYearDepreciationAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(24)).toString()));
+        value = CitCommonUtil.getValue(rowData.getCell(24));
+        if("".equals(value)){
+            citAsset.setYearDepreciationAmount(new BigDecimal("0"));
+            //获取财务本年折旧额
+            citAsset.setAccountYearDepreciationAmount(new BigDecimal("0"));
+        }else{
+            citAsset.setYearDepreciationAmount(new BigDecimal(value.toString()));
+            //获取财务本年折旧额
+            citAsset.setAccountYearDepreciationAmount(new BigDecimal(value.toString()));
+        }
+
         // 获取本年调整额----列数待定 滴滴无本年调整额
 //        citAsset.setYearAdjustmentAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString()));
 
@@ -343,10 +353,13 @@ public class AssetListServiceImpl extends BaseService {
         citAsset.setAccountAcquisitionValue(acquisitionValue);
         //获取财务每月折旧额----（原值-残值额）/折旧期限
         citAsset.setAccountMonthDepreciationAmount(acquisitionValue.subtract(residualRate).divide(new BigDecimal(depreciationPeriod), 2));
-        //获取财务本年折旧额
-        citAsset.setAccountYearDepreciationAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(24)).toString()));
+
         //获取财务累计折旧额,接下来计算需要用到，所以赋给一个对象
-        BigDecimal accountTotalDepreciationAmount = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString());
+        value = CitCommonUtil.getValue(rowData.getCell(25));
+        if("".equals(value)){
+            value = "0";
+        }
+        BigDecimal accountTotalDepreciationAmount = new BigDecimal(value.toString());
         citAsset.setAccountTotalDepreciationAmount(accountTotalDepreciationAmount);
         //年终剩余价值,原值-累计折旧
         citAsset.setYearEndValue(acquisitionValue.subtract(accountTotalDepreciationAmount));

atms-api/src/main/resources/conf/conf_profile_staging.properties

@@ -10,7 +10,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
 mail_jdbc_user=sa
 mail_jdbc_password=atmsunittestSQL
 
-web.url=http://dts.erp.didichuxing.com:10000
+web.url=http://dts.erp.didichuxing.com
 #web.url=*
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
@@ -28,7 +28,7 @@ max_file_length=104857600
 distributed_id_datacenter=10
 distributed_id_machine=10
 
-api.url=http://dts.erp.didichuxing.com:20000
+api.url=http://dts.erp.didichuxing.com
 
 # Longi config
 longi_api_basic_user=

atms-orangeheap/.env.development

+VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com:10000/OrangeHeap/
\ No newline at end of file

atms-orangeheap/.env.production

+VUE_APP_TABLEAU_API=http://dts.erp.didichuxing.com:10000/OrangeHeap/
\ No newline at end of file

atms-orangeheap/.eslintrc.js

+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  'extends': [
+    'plugin:vue/essential',
+    'eslint:recommended'
+  ],
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  }
+}

atms-orangeheap/.gitignore

@@ -19,3 +19,7 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+!/.gitignore
+!/.env.development
+!/.env.production
+!/.eslintrc.js

atms-orangeheap/orangeheap/css/app.cf16809e.css

-.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file

atms-orangeheap/orangeheap/index.html

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.173a42f4.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.e06965e0.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.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.cc3f6466.js></script><script src=js/app.e06965e0.js></script></body></html>
\ No newline at end of file

atms-orangeheap/orangeweb/css/app.cf16809e.css

-.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file

atms-orangeheap/orangeweb/index.html

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.173a42f4.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.007ff91c.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.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.cc3f6466.js></script><script src=js/app.007ff91c.js></script></body></html>
\ No newline at end of file

atms-orangeheap/orangeweb/js/about.173a42f4.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
-//# sourceMappingURL=about.173a42f4.js.map
\ No newline at end of file

atms-orangeheap/orangeweb/js/about.173a42f4.js.map

-{"version":3,"sources":["webpack:///./src/views/About.vue?cd20","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.173a42f4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file

atms-orangeheap/src/components/Panel.vue

@@ -86,9 +86,7 @@
 
     export default {
         data: () => ({
-
             chartUrl: process.env.VUE_APP_TABLEAU_API + 'unreturnedTax',
-
             tableauApiUrl: require('../assets/tableaujs.js'),
             // tableauApiUrl: 'https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js',
             drawer: null,
@@ -188,20 +186,21 @@
         created() {
             this.selectTable(this.items[0])
 
-            this.$axios({
-                method: 'get',
-                url: 'https://api.coindesk.com/v1/bpi/currentprice.json',
-            }).then((response) => {          //这里使用了ES6的语法
-                console.log(response)       //请求成功返回的数据
-            }).catch((error) => {
-                console.log(error)       //请求失败返回的数据
-            })
+            // Axios使用示例
+            // this.$axios({
+            //     method: 'get',
+            //     url: 'https://api.coindesk.com/v1/bpi/currentprice.json',
+            // }).then((response) => {          //这里使用了ES6的语法
+            //     console.log(response)       //请求成功返回的数据
+            // }).catch((error) => {
+            //     console.log(error)       //请求失败返回的数据
+            // })
 
         },
 
         mounted() {
 
-            console.log(process.env.VUE_APP_TABLEAU_API)
+            // console.log(process.env.VUE_APP_TABLEAU_API)
 
         },
 

atms-web/src/main/resources/conf_profile_staging.properties

-api.url=http://dts.erp.didichuxing.com:20000/
+api.url=http://dts.erp.didichuxing.com
 
 cookie.maxAgeSeconds=86400
 

atms-web/src/main/webapp/app/cit/cit-layout/cit-layout.ctrl.js

@@ -271,18 +271,18 @@ citModule.controller('citLayoutController', ['$scope', '$rootScope', '$location'
                             permission: constant.citPermission.dataPreview.bsMappingVer.queryCode,
                             url: '#/cit/previewData/bsMappingVer'
                         });
-                    } else if (data[constant.citPermission.dataPreview.assetsList.queryCode]) {
-                        $scope.menus.push({
-                            name: 'previewData', state: 'previewData', num: 2,
-                            permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
-                        });
-                        subMenus.push({
-                            name: 'previewData.assetsList',
-                            state: 'previewData.assetsList',
-                            num: 2,
-                            permission: constant.citPermission.dataPreview.assetsList.queryCode,
-                            url: '#/cit/previewData/assetsList'
-                        });
+                    // } else if (data[constant.citPermission.dataPreview.assetsList.queryCode]) {
+                    //     $scope.menus.push({
+                    //         name: 'previewData', state: 'previewData', num: 2,
+                    //         permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
+                    //     });
+                    //     subMenus.push({
+                    //         name: 'previewData.assetsList',
+                    //         state: 'previewData.assetsList',
+                    //         num: 2,
+                    //         permission: constant.citPermission.dataPreview.assetsList.queryCode,
+                    //         url: '#/cit/previewData/assetsList'
+                    //     });
                     } else if (data[constant.citPermission.dataPreview.salaryAdvance.queryCode]) {
                         $scope.menus.push({
                             name: 'previewData', state: 'previewData', num: 2,

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -305,6 +305,7 @@
                     }
                     $scope.TotalCount = assetListData.data.total;
                     $scope.pagingOptions.totalItems = assetListData.data.total;
+                    $scope.pageOptions.totalItems = assetListData.data.total;
                 });
             }
 

atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js

@@ -35,10 +35,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
                     name: 'bsMappingVer', permission: constant.citPermission.dataPreview.bsMappingVer.queryCode,
                     text: $translate.instant('bsMappingVer'), icon: 'fa fa-bank'
                 },
-                {
-                    name: 'assetsList', permission: constant.citPermission.dataPreview.assetsList.queryCode,
-                    text: $translate.instant('AssetList'), icon: 'fa fa-bank'
-                },
+                // {
+                //     name: 'assetsList', permission: constant.citPermission.dataPreview.assetsList.queryCode,
+                //     text: $translate.instant('AssetList'), icon: 'fa fa-bank'
+                // },
                 {
                     name: 'salaryAdvance', permission: constant.citPermission.dataPreview.salaryAdvance.queryCode,
                     text: $translate.instant('salaryAdvance'), icon: 'fa fa-bank'

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html

 <div class="cit-import-asset-list">
     <div class="top-area-wrapper" style="margin-top: 10px">
-        <button class="filter-button"
-                atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
-                popover-container="body" popover-auto-hide="true" data-overwrite="true"
-                use-optimized-placement-algorithm="true"
-                data-placement="bottom"
-                data-templateurl="app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html">
-            <i class="fa fa-filter" aria-hidden="true"></i>
-        </button>
-        <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;    width: 200px;" id="input-invoice-period-picker" />
+        <div style="height: 58px">
+            <button class="filter-button"
+                    atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
+                    popover-container="body" popover-auto-hide="true" data-overwrite="true"
+                    use-optimized-placement-algorithm="true"
+                    data-placement="bottom"
+                    data-templateurl="app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html">
+                <i class="fa fa-filter" aria-hidden="true"></i>
+            </button>
+            <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
+            <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
+        </div>
+
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;width: 200px;display: none" id="input-invoice-period-picker" />
         <span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
 
         <div class="dt-init-wrapper" style="    position: relative; top: -41px;">

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js

@@ -281,7 +281,7 @@
             $('#input-invoice-period-picker').focus(function () {
                 $('.filter-button').popover("hide");
             });
-            //初始化month-picker
+                //初始化month-picker
             $('#input-invoice-period-picker').rangePicker({
                 minDate: minDate,
                 maxDate: maxDate,
@@ -372,7 +372,7 @@
             initPeriods();
             initJournalEntryPagination();
             //初始化查询条件-期间范围
-            $scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
+            $scope.queryParams.periodStart = vatSessionService.year * 100 + 1;
             $scope.queryParams.periodEnd = vatSessionService.year * 100 + 12;
             $scope.queryParams.organizationId = vatSessionService.project.organizationID;
             // if($rootScope.currentLanguage === 'en-us'){

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html

 <div class="cit-import-asset-list">
     <div class="top-area-wrapper" style="margin-top: 10px">
-    <button class="filter-button"
-            atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
-            popover-container="body" popover-auto-hide="true" data-overwrite="true"
-            use-optimized-placement-algorithm="true"
-            data-placement="bottom"
-            data-templateurl="app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html">
-        <i class="fa fa-filter" aria-hidden="true"></i>
-    </button>
-    <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：-->
-    <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;    width: 200px;" id="input-invoice-period-picker" />
+   <div style="height: 58px">
+       <button class="filter-button"
+               atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
+               popover-container="body" popover-auto-hide="true" data-overwrite="true"
+               use-optimized-placement-algorithm="true"
+               data-placement="bottom"
+               data-templateurl="app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html">
+           <i class="fa fa-filter" aria-hidden="true"></i>
+       </button>
+       <span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
+       <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
+   </div>
+    <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;width: 200px;display: none" id="input-invoice-period-picker" />
     <span ng-click="downloadTB()" style="    position: absolute;    z-index: 99999999;    top: 14px;    right: 2%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
         <div class="dt-init-wrapper" style="    position: relative; top: -20px;">
     <div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -939,7 +939,7 @@ constant.citMenuList = [
     constant.citPermission.dataPreview.journalMerge.queryCode,
     constant.citPermission.dataPreview.bsGenerateVer.queryCode,
     constant.citPermission.dataPreview.bsMappingVer.queryCode,
-    constant.citPermission.dataPreview.assetsList.queryCode,
+    // constant.citPermission.dataPreview.assetsList.queryCode,
     constant.citPermission.dataPreview.salaryAdvance.queryCode,
     constant.citPermission.dataPreview.eamDisposal.queryCode,
 

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

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.173a42f4.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.1d7fe95e.css rel=preload as=style><link href=js/app.007ff91c.js rel=preload as=script><link href=js/chunk-vendors.cc3f6466.js rel=preload as=script><link href=css/chunk-vendors.1d7fe95e.css rel=stylesheet><link href=css/app.cf16809e.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.cc3f6466.js></script><script src=js/app.007ff91c.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Material+Icons"><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.2f35f377.css rel=preload as=style><link href=js/app.b7d8d35c.js rel=preload as=script><link href=js/chunk-vendors.39b13767.js rel=preload as=script><link href=css/chunk-vendors.2f35f377.css rel=stylesheet><link href=css/app.cf16809e.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.39b13767.js></script><script src=js/app.b7d8d35c.js></script></body></html>
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/js/about.173a42f4.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
-//# sourceMappingURL=about.173a42f4.js.map
\ No newline at end of file

atms-web/src/main/webapp/orangeweb/js/about.173a42f4.js.map

-{"version":3,"sources":["webpack:///./src/views/About.vue?cd20","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.173a42f4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file

atms-orangeheap/orangeheap/js/about.173a42f4.js → atms-web/src/main/webapp/orangeweb/js/about.17654e8a.js

 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("2877"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
-//# sourceMappingURL=about.173a42f4.js.map
+//# sourceMappingURL=about.17654e8a.js.map
\ No newline at end of file

atms-orangeheap/orangeheap/js/about.173a42f4.js.map → atms-web/src/main/webapp/orangeweb/js/about.17654e8a.js.map

-{"version":3,"sources":["webpack:///./src/views/About.vue?cd20","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.173a42f4.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=1ae8a7be&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///./src/views/About.vue?12dc","webpack:///./src/views/About.vue"],"names":["render","_vm","this","_h","$createElement","_self","_c","_m","staticRenderFns","staticClass","_v","script","component","Object","componentNormalizer","__webpack_exports__"],"mappings":"8GAAA,IAAAA,EAAA,WAA0B,IAAAC,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BH,EAAAI,MAAAC,GAAwB,OAAAL,EAAAM,GAAA,IACzFC,EAAA,YAAoC,IAAAP,EAAAC,KAAaC,EAAAF,EAAAG,eAA0BE,EAAAL,EAAAI,MAAAC,IAAAH,EAAwB,OAAAG,EAAA,OAAiBG,YAAA,SAAoB,CAAAH,EAAA,MAAAL,EAAAS,GAAA,2CCAxIC,EAAA,GAKAC,EAAgBC,OAAAC,EAAA,KAAAD,CAChBF,EACEX,EACAQ,GACF,EACA,KACA,KACA,MAIeO,EAAA,WAAAH","file":"js/about.17654e8a.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _vm._m(0)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"about\"},[_c('h1',[_vm._v(\"This is an about page\")])])}]\n\nexport { render, staticRenderFns }","import { render, staticRenderFns } from \"./About.vue?vue&type=template&id=0391505c&\"\nvar script = {}\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  null,\n  null\n  \n)\n\nexport default component.exports"],"sourceRoot":""}
\ No newline at end of file