Przeglądaj źródła

加入资产导入功能,开发中

wuxw 6 lat temu
rodzic
commit
ec09396730

+ 15 - 0
WebService/pom.xml

@@ -58,6 +58,21 @@
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+        <!-- 处理excel和上面功能是一样的-->
+        <dependency>
+            <groupId>net.sourceforge.jexcelapi</groupId>
+            <artifactId>jxl</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

+ 28 - 20
WebService/src/main/resources/components/communityPackage/add-community/addCommunity.html

@@ -1,4 +1,5 @@
-<div id = "addCommunityModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addCommunityModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -20,27 +21,34 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">小区名称</label>
-         <div class="col-sm-10">
-           <input v-model="addCommunityInfo.name"                   type="text" placeholder="必填,请填写小区名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">小区地址</label>
-         <div class="col-sm-10">
-           <input v-model="addCommunityInfo.address"                   type="text" placeholder="必填,请填写小区地址" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">附近地标</label>
-         <div class="col-sm-10">
-           <input v-model="addCommunityInfo.nearbyLandmarks"                   type="text" placeholder="必填,请填写附近地标" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">小区名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addCommunityInfo.name" type="text" placeholder="必填,请填写小区名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">小区地址</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addCommunityInfo.address" type="text" placeholder="必填,请填写小区地址"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">附近地标</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addCommunityInfo.nearbyLandmarks" type="text"
+                                           placeholder="必填,请填写附近地标" class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveCommunityInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveCommunityInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

+ 37 - 0
WebService/src/main/resources/components/systemPackage/assetImport/assetImport.html

@@ -0,0 +1,37 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>资产导入</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openDownloadHcExcelTemplate()">
+                        <i class="glyphicon glyphicon-download-alt"></i>
+                        模板
+                    </button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div>
+                    <div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">选择文件</label>
+                            <div class="col-sm-10">
+                                <input v-model="assetImportInfo.excelTemplate" type="file" placeholder="必填,请选择数据文件"
+                                       class="form-control"
+                                       accept=".xls,.xlsx"
+                                >
+                            </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">备注</label>
+                            <div class="col-sm-10">
+                                <textarea v-model="assetImportInfo.remark" type="text" placeholder="请填写备注信息" rows="3"
+                                          class="form-control"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+ 48 - 0
WebService/src/main/resources/components/systemPackage/assetImport/assetImport.js

@@ -0,0 +1,48 @@
+/**
+    权限组
+**/
+(function(vc){
+
+    vc.extends({
+        data:{
+            assetImportInfo:{
+                excelTemplate:'',
+                remark:""
+            }
+        },
+
+        _initMethod:function(){
+
+        },
+        _initEvent:function(){
+
+        },
+        methods:{
+            assetImportValidate:function(){
+                    return vc.validate.validate({
+                            assetImportInfo:vc.component.assetImportInfo
+                        },{
+
+                            'assetImportInfo.excelTemplate':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"文件不能为空"
+                                }
+                            ]
+                        });
+            },
+            saveAssetImportInfo:function(){
+                if(!vc.component.assetImportValidate()){
+                    return ;
+                }
+            },
+            _openDownloadHcExcelTemplate:function(){
+                //下载 模板
+                vc.jumpToPage('/import/hc.xlsx')
+            }
+
+        }
+    });
+
+})(window.vc);

BIN
WebService/src/main/resources/static/import/hc.xlsx


+ 37 - 0
WebService/src/main/resources/views/assetImportFlow.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:vc="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <title>资产导入|java110</title>
+    <vc:create name="commonTop"></vc:create>
+</head>
+<body>
+<vc:create name="bodyTop"></vc:create>
+<div id="wrapper">
+    <vc:create name="menu"></vc:create>
+
+
+    <div id="page-wrapper" class="gray-bg dashbard-1">
+        <div class="row border-bottom">
+            <vc:create name="nav"></vc:create>
+        </div>
+
+        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
+            <vc:create name="breadcrumb"></vc:create>
+        </div>
+        <!-- id="component" -->
+        <div class="wrapper wrapper-content animated fadeInRight">
+            <vc:create name="assetImport"></vc:create>
+        </div>
+
+        <vc:create name="copyright"></vc:create>
+
+    </div>
+</div>
+
+<vc:create name="commonBottom"></vc:create>
+</body>
+</html>

+ 18 - 0
pom.xml

@@ -450,6 +450,24 @@
                 <version>1.11.3</version>
             </dependency>
 
+            <!-- 引入poi,解析workbook视图 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>3.16</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>3.14</version>
+            </dependency>
+            <!-- 处理excel和上面功能是一样的-->
+            <dependency>
+                <groupId>net.sourceforge.jexcelapi</groupId>
+                <artifactId>jxl</artifactId>
+                <version>2.6.10</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>