123123

src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.java

@@ -24,7 +24,7 @@ public interface BannerInfoMapper{
 
     List<BannerInfo> queryBannerInfoByPage(Map<String, Object> parameter);
 
-    int delete(String id);
+    int delete(BannerInfo record);
 
     BannerInfo queryBannerInfo(BannerInfo record);
 

src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.xml

@@ -8,12 +8,9 @@
                                 <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
                                 <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
                                 <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="location" property="location" jdbcType="VARCHAR" />
-                                <result column="title" property="title" jdbcType="VARCHAR" />
-                                <result column="subtitle" property="subtitle" jdbcType="VARCHAR" />
                                 <result column="url" property="url" jdbcType="VARCHAR" />
-                                <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
-                                <result column="rank" property="rank" jdbcType="INTEGER" />
+                                <result column="upload_time" property="uploadTime" jdbcType="TIMESTAMP" />
+                                <result column="station_id" property="stationId" jdbcType="INTEGER" />
             </resultMap>
     <sql id="Base_Column_List" >
         <trim  suffixOverrides="," >
@@ -29,17 +26,11 @@
 
             create_user,
 
-            location,
-
-            title,
-
-            subtitle,
-
             url,
 
-            image_url,
+            upload_time,
 
-            rank,
+            station_id,
 
             </trim>
     </sql>
@@ -73,24 +64,15 @@
             </if>
                 <if test="createUser!= null" >
                 create_user,
-            </if>
-                <if test="location!= null" >
-                location,
-            </if>
-                <if test="title!= null" >
-                title,
-            </if>
-                <if test="subtitle!= null" >
-                subtitle,
             </if>
                 <if test="url!= null" >
                 url,
             </if>
-                <if test="imageUrl!= null" >
-                image_url,
+                <if test="uploadTime!= null" >
+                upload_time,
             </if>
-                <if test="rank!= null" >
-                rank,
+                <if test="stationId!= null" >
+                station_id,
             </if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -111,24 +93,15 @@
             </if>
                     <if test="createUser != null" >
                 #{createUser,jdbcType=VARCHAR},
-            </if>
-                    <if test="location != null" >
-                #{location,jdbcType=VARCHAR},
-            </if>
-                    <if test="title != null" >
-                #{title,jdbcType=VARCHAR},
-            </if>
-                    <if test="subtitle != null" >
-                #{subtitle,jdbcType=VARCHAR},
             </if>
                     <if test="url != null" >
                 #{url,jdbcType=VARCHAR},
             </if>
-                    <if test="imageUrl != null" >
-                #{imageUrl,jdbcType=VARCHAR},
+                    <if test="uploadTime != null" >
+                #{uploadTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="rank != null" >
-                #{rank,jdbcType=INTEGER},
+                    <if test="stationId != null" >
+                #{stationId,jdbcType=INTEGER},
             </if>
                 </trim>
     </insert>
@@ -152,32 +125,34 @@
             </if>
                      <if test="createUser != null" >
                create_user= #{createUser,jdbcType=VARCHAR},
-            </if>
-                     <if test="location != null" >
-               location= #{location,jdbcType=VARCHAR},
-            </if>
-                     <if test="title != null" >
-               title= #{title,jdbcType=VARCHAR},
-            </if>
-                     <if test="subtitle != null" >
-               subtitle= #{subtitle,jdbcType=VARCHAR},
             </if>
                      <if test="url != null" >
                url= #{url,jdbcType=VARCHAR},
             </if>
-                     <if test="imageUrl != null" >
-               image_url= #{imageUrl,jdbcType=VARCHAR},
+                     <if test="uploadTime != null" >
+               upload_time= #{uploadTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="rank != null" >
-               rank= #{rank,jdbcType=INTEGER},
+                     <if test="stationId != null" >
+               station_id= #{stationId,jdbcType=INTEGER},
             </if>
                  </set>
-        where id = #{id,jdbcType=INTEGER}
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
     </update>
     <select id="queryBannerInfoByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info
         <where>
             and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
                     <if test="record.id != null and !&quot;&quot;.equals(record.id)">
                 and  id = #{record.id}
             </if>
@@ -195,33 +170,21 @@
             </if>
                      <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
                 and  create_user = #{record.createUser}
-            </if>
-                     <if test="record.location != null and !&quot;&quot;.equals(record.location)">
-                and  location = #{record.location}
-            </if>
-                     <if test="record.title != null and !&quot;&quot;.equals(record.title)">
-                and  title = #{record.title}
-            </if>
-                     <if test="record.subtitle != null and !&quot;&quot;.equals(record.subtitle)">
-                and  subtitle = #{record.subtitle}
             </if>
                      <if test="record.url != null and !&quot;&quot;.equals(record.url)">
                 and  url = #{record.url}
             </if>
-                     <if test="record.imageUrl != null and !&quot;&quot;.equals(record.imageUrl)">
-                and  image_url = #{record.imageUrl}
+                     <if test="record.uploadTime != null and !&quot;&quot;.equals(record.uploadTime)">
+                and  upload_time = #{record.uploadTime}
             </if>
-                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
-                and  rank = #{record.rank}
+                     <if test="record.stationId != null and !&quot;&quot;.equals(record.stationId)">
+                and  station_id = #{record.stationId}
             </if>
                   <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
              <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  location LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  title LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  subtitle LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image_url LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  rank LIKE concat('%',#{record.searchKey},'%')
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  url LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  upload_time LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  station_id LIKE concat('%',#{record.searchKey},'%')
                                                              </trim>
          </if>
 
@@ -275,12 +238,15 @@
             </trim>
             ,
         </if>
-        location , rank desc, id desc
+        id desc
     </select>
     <select id="queryAllBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info
         <where>
             and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
                     <if test="id != null and !&quot;&quot;.equals(id)">
                 and  id = #{id}
             </if>
@@ -298,33 +264,21 @@
             </if>
                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and  create_user = #{createUser}
-            </if>
-                    <if test="location != null and !&quot;&quot;.equals(location)">
-                and  location = #{location}
-            </if>
-                    <if test="title != null and !&quot;&quot;.equals(title)">
-                and  title = #{title}
-            </if>
-                    <if test="subtitle != null and !&quot;&quot;.equals(subtitle)">
-                and  subtitle = #{subtitle}
             </if>
                     <if test="url != null and !&quot;&quot;.equals(url)">
                 and  url = #{url}
             </if>
-                    <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and  image_url = #{imageUrl}
+                    <if test="uploadTime != null and !&quot;&quot;.equals(uploadTime)">
+                and  upload_time = #{uploadTime}
             </if>
-                    <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and  rank = #{rank}
+                    <if test="stationId != null and !&quot;&quot;.equals(stationId)">
+                and  station_id = #{stationId}
             </if>
                     <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  location LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  title LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  subtitle LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image_url LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  url LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  upload_time LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  station_id LIKE concat('%',#{searchKey},'%')
                                                                                         </trim>
             </if>
 <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -377,7 +331,7 @@
             ,
         </if>
 
-        location , rank desc, id desc
+        id desc
     </select>
     <select id="queryBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info
@@ -400,24 +354,15 @@
             </if>
                      <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
-            </if>
-                     <if test="location != null and !&quot;&quot;.equals(location)">
-                and location = #{location}
-            </if>
-                     <if test="title != null and !&quot;&quot;.equals(title)">
-                and title = #{title}
-            </if>
-                     <if test="subtitle != null and !&quot;&quot;.equals(subtitle)">
-                and subtitle = #{subtitle}
             </if>
                      <if test="url != null and !&quot;&quot;.equals(url)">
                 and url = #{url}
             </if>
-                     <if test="imageUrl != null and !&quot;&quot;.equals(imageUrl)">
-                and image_url = #{imageUrl}
+                     <if test="uploadTime != null and !&quot;&quot;.equals(uploadTime)">
+                and upload_time = #{uploadTime}
             </if>
-                     <if test="rank != null and !&quot;&quot;.equals(rank)">
-                and rank = #{rank}
+                     <if test="stationId != null and !&quot;&quot;.equals(stationId)">
+                and station_id = #{stationId}
             </if>
          
         </where>
@@ -425,15 +370,20 @@
     </select>
     <update id="delete">
         UPDATE banner_info SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -4,45 +4,18 @@
     <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.UserInfo">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="username" property="username" jdbcType="VARCHAR"/>
-        <result column="nickname" property="nickname" jdbcType="VARCHAR"/>
         <result column="password" property="password" jdbcType="VARCHAR"/>
-        <result column="icon" property="icon" jdbcType="VARCHAR"/>
-        <result column="birthday" property="birthday" jdbcType="TIMESTAMP"/>
-        <result column="sex" property="sex" jdbcType="CHAR"/>
-        <result column="open_id" property="openId" jdbcType="VARCHAR"/>
-        <result column="union_id" property="unionId" jdbcType="VARCHAR"/>
-        <result column="phone" property="phone" jdbcType="VARCHAR"/>
-        <result column="mail" property="mail" jdbcType="VARCHAR"/>
-        <result column="country" property="country" jdbcType="VARCHAR"/>
-        <result column="province" property="province" jdbcType="VARCHAR"/>
-        <result column="city" property="city" jdbcType="VARCHAR"/>
-        <result column="district" property="district" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
-        <result column="money_coin" property="moneyCoin" jdbcType="DECIMAL"/>
-        <result column="money_point" property="moneyPoint" jdbcType="DECIMAL"/>
-        <result column="contacter" property="contacter" jdbcType="VARCHAR"/>
-        <result column="contact_phone" property="contactPhone" jdbcType="VARCHAR"/>
-        <result column="company_name" property="companyName" jdbcType="VARCHAR"/>
-        <result column="company_type" property="companyType" jdbcType="VARCHAR"/>
-        <result column="admin_flag" property="adminFlag" jdbcType="CHAR"/>
-        <result column="cash_pledge" property="cashPledge" jdbcType="INTEGER"/>
-        <result column="approve_flag" property="approveFlag" jdbcType="CHAR"/>
-        <result column="store_flag" property="storeFlag" jdbcType="CHAR"/>
-        <result column="company_flag" property="companyFlag" jdbcType="CHAR"/>
-        <result column="approve_step" property="approveStep" jdbcType="INTEGER"/>
+        <result column="depart_id" property="departId" jdbcType="VARCHAR"/>
+        <result column="phone" property="phone" jdbcType="VARCHAR"/>
         <association property="departId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
         <association property="roleId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.SysRoleMapper.getUserRoleId"/>
-        <association property="storeInfo" javaType="com.izouma.awesomeadmin.model.StoreInfo" column="{userId=id}"
-                     select="com.izouma.awesomeadmin.dao.StoreInfoMapper.queryStoreInfo"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,
-        country, province, city, district, create_time, del_flag, money_coin, money_point,
-        contacter, contact_phone, company_name, company_type, admin_flag, cash_pledge,
-        approve_flag, store_flag, company_flag, approve_step
+        id, username,  create_time, del_flag,depart_id ,role_id,phone
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -149,6 +122,9 @@
             <if test="approveStep != null">
                 approve_step,
             </if>
+            <if test="departId != null">
+                depart_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -157,6 +133,7 @@
             <if test="username != null">
                 #{username,jdbcType=VARCHAR},
             </if>
+
             <if test="nickname != null">
                 #{nickname,jdbcType=VARCHAR},
             </if>
@@ -241,6 +218,9 @@
             <if test="approveStep != null">
                 #{approveStep},
             </if>
+            <if test="departId != null">
+                #{departId,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserInfo">
@@ -270,6 +250,9 @@
             <if test="unionId != null">
                 union_id = #{unionId,jdbcType=VARCHAR},
             </if>
+            <if test="departId != null">
+                depart_id = #{departId,jdbcType=VARCHAR},
+            </if>
             <if test="phone != null">
                 phone = #{phone,jdbcType=VARCHAR},
             </if>
@@ -427,6 +410,9 @@
             <if test="record.approveStep != null and !&quot;&quot;.equals(record.approveStep)">
                 and approve_step = #{record.approveStep}
             </if>
+            <if test="record.departId != null and !&quot;&quot;.equals(record.departId)">
+                and depart_id = #{record.departId}
+            </if>
 
         </where>
         order by id desc
@@ -523,6 +509,10 @@
                 and approve_step = #{approveStep}
             </if>
 
+            <if test="record.departId != null and !&quot;&quot;.equals(record.departId)">
+                and depart_id = #{record.departId}
+            </if>
+
         </where>
         order by id desc
     </select>
@@ -586,6 +576,9 @@
             <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
+            <if test="departId != null and !&quot;&quot;.equals(departId)">
+                and depart_id = #{record.departId}
+            </if>
         </where>
         LIMIT 1
     </select>
@@ -649,6 +642,9 @@
             <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
+            <if test="departId != null and !&quot;&quot;.equals(departId)">
+                and depart_id = #{departId}
+            </if>
         </where>
         LIMIT 1
     </select>

src/main/java/com/izouma/awesomeadmin/model/BannerInfo.java

@@ -14,12 +14,11 @@ public class BannerInfo{
     private String updateUser;
     private Date createTime;
     private String createUser;
-    private String location;
-    private String title;
-    private String subtitle;
     private String url;
-    private String imageUrl;
-    private Integer rank;
+    private Date uploadTime;
+    private Integer stationId;
+
+private String idStr;
 
 private String searchKey;
 
@@ -75,27 +74,6 @@ private String orderByStr;
     public void setCreateUser(String createUser){
         this.createUser = createUser;
     }
-    public String getLocation(){
-        return this.location;
-    }
-
-    public void setLocation(String location){
-        this.location = location;
-    }
-    public String getTitle(){
-        return this.title;
-    }
-
-    public void setTitle(String title){
-        this.title = title;
-    }
-    public String getSubtitle(){
-        return this.subtitle;
-    }
-
-    public void setSubtitle(String subtitle){
-        this.subtitle = subtitle;
-    }
     public String getUrl(){
         return this.url;
     }
@@ -103,19 +81,19 @@ private String orderByStr;
     public void setUrl(String url){
         this.url = url;
     }
-    public String getImageUrl(){
-        return this.imageUrl;
+    public Date getUploadTime(){
+        return this.uploadTime;
     }
 
-    public void setImageUrl(String imageUrl){
-        this.imageUrl = imageUrl;
+    public void setUploadTime(Date uploadTime){
+        this.uploadTime = uploadTime;
     }
-    public Integer getRank(){
-        return this.rank;
+    public Integer getStationId(){
+        return this.stationId;
     }
 
-    public void setRank(Integer rank){
-        this.rank = rank;
+    public void setStationId(Integer stationId){
+        this.stationId = stationId;
     }
 
 public String getSearchKey() {
@@ -142,5 +120,13 @@ public void setOrderByStr(String orderByStr) {
     this.orderByStr = orderByStr;
 }
 
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
 }
 

src/main/java/com/izouma/awesomeadmin/model/FindPara.java

@@ -0,0 +1,30 @@
+package com.izouma.awesomeadmin.model;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class FindPara {
+
+    private Integer stationId;
+    private Integer exhibitionId;
+
+    public Integer getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
+
+    public Integer getExhibitionId() {
+        return exhibitionId;
+    }
+
+    public void setExhibitionId(Integer exhibitionId) {
+        this.exhibitionId = exhibitionId;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/model/GongShiTouJiao.java

@@ -0,0 +1,42 @@
+package com.izouma.awesomeadmin.model;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Date;
+import java.util.List;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GongShiTouJiao {
+
+    private Integer version;
+    private List<BannerInfo> banner;
+    private List<MenuInfo> mainMenu;
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public List<BannerInfo> getBanner() {
+        return banner;
+    }
+
+    public void setBanner(List<BannerInfo> banner) {
+        this.banner = banner;
+    }
+
+    public List<MenuInfo> getMainMenu() {
+        return mainMenu;
+    }
+
+    public void setMainMenu(List<MenuInfo> mainMenu) {
+        this.mainMenu = mainMenu;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/model/JinRongShuJu.java

@@ -0,0 +1,42 @@
+package com.izouma.awesomeadmin.model;
+
+import com.alipay.api.domain.Video;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JinRongShuJu {
+
+    private Integer version;
+    private List<FileInfo> video;
+    private FileInfo app;
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public List<FileInfo> getVideo() {
+        return video;
+    }
+
+    public void setVideo(List<FileInfo> video) {
+        this.video = video;
+    }
+
+    public FileInfo getApp() {
+        return app;
+    }
+
+    public void setApp(FileInfo app) {
+        this.app = app;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/service/BannerInfoService.java

@@ -20,7 +20,7 @@ public interface BannerInfoService{
 
     boolean createBannerInfo(BannerInfo record);
 
-    boolean deleteBannerInfo(String id);
+    boolean deleteBannerInfo(BannerInfo record);
 
     boolean updateBannerInfo(BannerInfo record);
 }

src/main/java/com/izouma/awesomeadmin/service/impl/BannerInfoServiceImpl.java

@@ -99,12 +99,12 @@ public class BannerInfoServiceImpl implements BannerInfoService{
     }
 
     @Override
-    public boolean deleteBannerInfo(String id) {
+    public boolean deleteBannerInfo(BannerInfo record) {
 
         logger.info("deleteBannerInfo");
         try {
 
-             int updates = bannerInfoMapper.delete(id);
+             int updates = bannerInfoMapper.delete(record);
 
             if (updates > 0) {
                  return true;

src/main/java/com/izouma/awesomeadmin/service/impl/UserInfoServiceImpl.java

@@ -149,10 +149,6 @@ public class UserInfoServiceImpl implements UserInfoService {
 
     private boolean updateUserRolesAndDeparts(UserInfo record, int updates) {
         if (updates > 0) {
-            if (record.getDepartId() != null) {
-                departInfoMapper.clearUserDeparts(record.getId());
-                departInfoMapper.setUserDeparts(record.getId(), Arrays.asList(record.getDepartId().split(",")));
-            }
             if (record.getRoleId() != null) {
                 sysRoleMapper.clearUserRoles(record.getId());
                 sysRoleMapper.setUserRoles(record.getId(), Arrays.asList(record.getRoleId().split(",")));
@@ -188,6 +184,10 @@ public class UserInfoServiceImpl implements UserInfoService {
         logger.info("updateUserInfo");
         try {
 
+            if (StringUtils.isNotEmpty(record.getPassword())) {
+                record.setPassword(MD5Util.getMD5(record.getPassword()));
+            }
+
             int updates = userInfoMapper.updateByPrimaryKeySelective(record);
 
             if (updateUserRolesAndDeparts(record, updates)) return true;

src/main/java/com/izouma/awesomeadmin/web/BannerInfoController.java

@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/bannerInfo")
-@RequiresAuthentication
 public class BannerInfoController {
 
     @Autowired
@@ -31,7 +30,7 @@ public class BannerInfoController {
     /**
     * <p>获取全部记录。</p>
     */
-//    @RequiresAuthentication
+    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(BannerInfo record) {
@@ -107,9 +106,9 @@ public class BannerInfoController {
     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
-    public Result deleteBannerInfo(@RequestParam(required = true, value = "id") String id) {
+    public Result deleteBannerInfo(BannerInfo record) {
 
-        boolean num = bannerInfoService.deleteBannerInfo(id);
+        boolean num = bannerInfoService.deleteBannerInfo(record);
         if (num) {
         return new Result(true, "删除成功");
         }
@@ -131,12 +130,12 @@ public class BannerInfoController {
 
 
         String sheetName = "banner_info";
-        String titleName = "banner信息数据表";
-        String fileName = "banner信息表";
-        int columnNumber = 12;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "位置" ,   "标题" ,   "副标题" ,   "跳转链接" ,   "图片" ,   "排序"  };
-        String[][] dataList = new String[bannerInfos.size()][12];
+        String titleName = "banner条列表数据表";
+        String fileName = "banner条列表表";
+        int columnNumber = 9;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "图片链接" ,   "更新时间" ,   "营业点id"  };
+        String[][] dataList = new String[bannerInfos.size()][9];
 
         for (int i = 0; i < bannerInfos.size(); i++) {
 
@@ -146,12 +145,9 @@ public class BannerInfoController {
                         dataList[i][3] = String.valueOf(bannerInfos.get(i).getUpdateUser());
                         dataList[i][4] = String.valueOf(bannerInfos.get(i).getCreateTime());
                         dataList[i][5] = String.valueOf(bannerInfos.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(bannerInfos.get(i).getLocation());
-                        dataList[i][7] = String.valueOf(bannerInfos.get(i).getTitle());
-                        dataList[i][8] = String.valueOf(bannerInfos.get(i).getSubtitle());
-                        dataList[i][9] = String.valueOf(bannerInfos.get(i).getUrl());
-                        dataList[i][10] = String.valueOf(bannerInfos.get(i).getImageUrl());
-                        dataList[i][11] = String.valueOf(bannerInfos.get(i).getRank());
+                        dataList[i][6] = String.valueOf(bannerInfos.get(i).getUrl());
+                        dataList[i][7] = String.valueOf(bannerInfos.get(i).getUploadTime());
+                        dataList[i][8] = String.valueOf(bannerInfos.get(i).getStationId());
                     }
 
 

src/main/java/com/izouma/awesomeadmin/web/DataController.java

@@ -0,0 +1,372 @@
+package com.izouma.awesomeadmin.web;
+
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.*;
+import com.izouma.awesomeadmin.service.*;
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/data")
+public class DataController {
+
+
+    @Autowired
+    private ExhibitionContentService exhibitionContentService;
+
+    @Autowired
+    private BannerInfoService bannerInfoService;
+
+    @Autowired
+    private MenuInfoService menuInfoService;
+
+    @Autowired
+    private SubItemService subItemService;
+
+    @Autowired
+    private ImgInfoService imgInfoService;
+
+    @Autowired
+    private MemberInfoService memberInfoService;
+
+    @Autowired
+    private FileInfoService fileInfoService;
+
+    @Autowired
+    private FinancialDataService financialDataService;
+
+    @Autowired
+    private PinpaijuzhenService pinpaijuzhenService;
+
+
+    @Autowired
+    private PinpaimenmianService pinpaimenmianService;
+
+    @Autowired
+    private PlayInfoService playInfoService;
+
+    @Autowired
+    private EquipmentInfoService equipmentInfoService;
+
+    @Autowired
+    private ClickHistoryService clickHistoryService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(MenuInfo record) {
+        List<MenuInfo> pp = menuInfoService.getMenuInfoList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+     * <p>获取公示投教数据</p>
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/gongshitoujiao", method = RequestMethod.GET)
+    @ResponseBody
+    public GongShiTouJiao getGongShiTouJiao(FindPara findPara) {
+        GongShiTouJiao gs = new GongShiTouJiao();
+        ExhibitionContent ec = new ExhibitionContent();
+        ec.setStationId(findPara.getStationId());
+        ec.setId(findPara.getExhibitionId());
+        ec = exhibitionContentService.getExhibitionContent(ec);
+
+        gs.setVersion(ec.getVersion());
+
+        BannerInfo banner = new BannerInfo();
+        banner.setStationId(findPara.getStationId());
+        List<BannerInfo> banners = bannerInfoService.getBannerInfoList(banner);
+
+        gs.setBanner(banners);
+
+        MenuInfo menuinfo = new MenuInfo();
+        menuinfo.setStationInfo(findPara.getStationId());
+        List<MenuInfo> menus =menuInfoService.getMenuInfoList(menuinfo);
+        for(MenuInfo m:menus)
+        {
+
+            if("1".equals(m.getType()))
+            {
+                SubItem s = new SubItem();
+                s.setMenuInfoId(m.getId());
+                List<SubItem> items = subItemService.getSubItemList(s);
+                m.setSubItem(items);
+            } else if ("2".equals(m.getType())) {
+                ImgInfo img = new ImgInfo();
+                img.setFatherId(m.getId());
+                img.setType(2);
+                m.setImages(imgInfoService.getImgInfoList(img));
+            } else if ("3".equals(m.getType())) {
+                MemberInfo member = new MemberInfo();
+                member.setStationId(findPara.getStationId());
+                m.setMembers(memberInfoService.getMemberInfoList(member));
+            }
+        }
+        gs.setMainMenu(menus);
+        return gs;
+    }
+
+    /**
+     * <p>金融大数据</p>
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/financialData", method = RequestMethod.GET)
+    @ResponseBody
+    public FinancialData getFinancialData(FindPara findPara) {
+        ExhibitionContent ec = new ExhibitionContent();
+        ec.setStationId(findPara.getStationId());
+        ec.setId(findPara.getExhibitionId());
+        ec = exhibitionContentService.getExhibitionContent(ec);
+
+        FinancialData f = new FinancialData();
+        f.setStationId(findPara.getStationId());
+        FinancialData fd = financialDataService.getFinancialData(f);
+        fd.setVersion(ec.getVersion());
+
+        return fd;
+    }
+
+    /**
+     * <p>品牌矩阵</p>
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/pinpaijuzhen", method = RequestMethod.GET)
+    @ResponseBody
+    public Pinpaijuzhen getPinpaijuzhen(FindPara findPara) {
+        ExhibitionContent ec = new ExhibitionContent();
+        ec.setStationId(findPara.getStationId());
+        ec.setId(findPara.getExhibitionId());
+        ec = exhibitionContentService.getExhibitionContent(ec);
+
+        Pinpaijuzhen out = new Pinpaijuzhen();
+        out.setStationId(findPara.getStationId());
+        out = pinpaijuzhenService.getPinpaijuzhen(out);
+        out.setVersion(ec.getVersion());
+
+        PlayInfo pi = new PlayInfo();
+        pi.setFatherId(out.getId()+"");
+        pi.setType(0);
+        List<PlayInfo> pis = playInfoService.getPlayInfoList(pi);
+        out.setPlaylist(pis);
+
+        return out;
+    }
+
+    /**
+     * <p>品牌门面</p>
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/pinpaimenmian", method = RequestMethod.GET)
+    @ResponseBody
+    public Pinpaimenmian getPinpaimenmian(FindPara findPara) {
+        ExhibitionContent ec = new ExhibitionContent();
+        ec.setStationId(findPara.getStationId());
+        ec.setId(findPara.getExhibitionId());
+        ec = exhibitionContentService.getExhibitionContent(ec);
+
+        Pinpaimenmian out = new Pinpaimenmian();
+        out.setStationId(findPara.getStationId());
+        out = pinpaimenmianService.getPinpaimenmian(out);
+        out.setVersion(ec.getVersion());
+
+        PlayInfo pi = new PlayInfo();
+        pi.setFatherId(out.getId()+"");
+        pi.setType(1);
+        List<PlayInfo> pis = playInfoService.getPlayInfoList(pi);
+        out.setPlaylist_tm(pis);
+
+        pi.setType(2);
+        out.setPlaylist_b(playInfoService.getPlayInfoList(pi));
+        return out;
+    }
+
+    /**
+     * <p>修改设备状态</p>
+     */
+    @RequestMapping(value = "/editStatus", method = RequestMethod.POST)
+    @ResponseBody
+    public Result editStatus(EquipmentInfo equipmentInfo) {
+        EquipmentInfo ei = new EquipmentInfo();
+        ei.setStationId(equipmentInfo.getStationId());
+        ei.setExhibitionId(equipmentInfo.getExhibitionId());
+        ei = equipmentInfoService.getEquipmentInfo(ei);
+        ei.setStatus(equipmentInfo.getStatus());
+        if(equipmentInfoService.updateEquipmentInfo(ei))
+        {
+            return new Result(true, ei);
+        }
+        else {
+            return new Result(false, ei);
+        }
+    }
+
+    /**
+     * <p>记录点击历史</p>
+     */
+    @RequestMapping(value = "/addClickHistory", method = RequestMethod.POST)
+    @ResponseBody
+    public Result addClickHistory(ClickHistory clickHistory) {
+        if(clickHistoryService.createClickHistory(clickHistory))
+        {
+            return new Result(true, clickHistory);
+        }
+        else {
+            return new Result(false, "添加错误");
+        }
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getMenuInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getMenuInfo(@RequestParam(required = false, value = "id") String id) {
+        MenuInfo data = menuInfoService.getMenuInfoById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(MenuInfo record) {
+        MenuInfo data = menuInfoService.getMenuInfo(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, MenuInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<MenuInfo> pp =menuInfoService.getMenuInfoByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(MenuInfo record) {
+        boolean num = menuInfoService.createMenuInfo(record);
+        if (num) {
+
+            ImgInfo img = new ImgInfo();
+            img.setFatherId(record.getId());
+            img.setType(0);
+            img.setUrl(record.getImgUrl());
+            imgInfoService.createImgInfo(img);
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateMenuInfo(MenuInfo record) {
+        boolean num = menuInfoService.updateMenuInfo(record);
+        if (num) {
+
+            ImgInfo img = new ImgInfo();
+            img.setFatherId(record.getId());
+            img.setType(0);
+            img.setUrl(record.getImgUrl());
+            imgInfoService.createImgInfo(img);
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteMenuInfo(MenuInfo record) {
+
+        boolean num = menuInfoService.deleteMenuInfo(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, MenuInfo record) throws Exception {
+
+    List<MenuInfo> menuInfos = menuInfoService.getMenuInfoList(record);
+
+
+        String sheetName = "menu_info";
+        String titleName = "栏目管理数据表";
+        String fileName = "栏目管理表";
+        int columnNumber = 10;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "栏目名称" ,   "公司介绍" ,   "栏目类型" ,   "营业厅ID"  };
+        String[][] dataList = new String[menuInfos.size()][10];
+
+        for (int i = 0; i < menuInfos.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(menuInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(menuInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(menuInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(menuInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(menuInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(menuInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(menuInfos.get(i).getMenuName());
+                        dataList[i][7] = String.valueOf(menuInfos.get(i).getAbstractInfo());
+                        dataList[i][8] = String.valueOf(menuInfos.get(i).getType());
+                        dataList[i][9] = String.valueOf(menuInfos.get(i).getStationInfo());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/java/com/izouma/awesomeadmin/web/UserInfoController.java

@@ -227,7 +227,5 @@ public class UserInfoController {
             return new Result(false, "注册失败");
         }
     }
-
-
 }
 

src/main/resources/properties/jdbc.properties

@@ -1,9 +1,9 @@
 jdbc.driverClassName=org.gjt.mm.mysql.Driver
 
 
-jdbc.url=jdbc:mysql://120.55.131.232:3306/tutuxiang
+jdbc.url=jdbc:mysql://120.55.131.232:3306/huatai
 jdbc.username=microball
 jdbc.password=2wsx@WSX#EDC
-jdbc.databaseName=tutuxiang
+jdbc.databaseName=huatai
 
 

src/main/vue/src/pages/BannerInfo.vue

@@ -1,30 +1,17 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
-            <el-form-item prop="location" label="位置">
-                <template>
-                    <el-select v-model="formData.location" clearable placeholder="请选择" :disabled="'location'==subColumn">
-                        <el-option v-for="item in locationOptions" :key="item.value" :label="item.label" :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-            <el-form-item prop="title" label="标题">
-                <el-input v-model="formData.title" :disabled="'title'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="subtitle" label="副标题">
-                <el-input v-model="formData.subtitle" :disabled="'subtitle'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="url" label="跳转链接">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="url" label="图片链接">
                 <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
             </el-form-item>
-            <el-form-item prop="imageUrl" label="图片">
-                <single-upload v-model="formData.imageUrl" :disabled="'imageUrl'==subColumn"></single-upload>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="uploadTime" label="更新时间">
+                <el-input v-model="formData.uploadTime" :disabled="'uploadTime'==subColumn"></el-input>
             </el-form-item>
-            <el-form-item prop="rank" label="排序">
-                <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="stationId" label="营业点id">
+                <el-input v-model="formData.stationId" :disabled="'stationId'==subColumn"></el-input>
             </el-form-item>
-            <el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -33,115 +20,92 @@
     </div>
 </template>
 <script>
-import formValidator from '../formValidator'
-
-export default {
-    created() {
-        if (this.$route.query.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
-        }
+    import formValidator from '../formValidator'
 
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/bannerInfo/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
 
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/bannerInfo/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
 
-                    this.formData = res.data;
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                        this.formData = res.data;
 
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
                 }
-            })
-        } else {
-            if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
             }
-        }
-
-    },
-    data() {
-        return {
-            saving: false,
-            formData: {},
-            rules: {
-                location:
-                    [
-                        { required: true, message: '请输入 位置', trigger: 'blur' },
-                    ],
-            },
-            locationOptions: [
-                { label: '首页banner', value: '1' },
-                { label: '首页影楼修图消息', value: '2' },
-                { label: '首页商业修图消息', value: '4' },
-                { label: '首页摄影消息', value: '5' },
-                { label: '首页样片消息', value: '6' },
-                { label: '首页营销消息', value: '7' },
-                { label: '首页周边消息', value: '17' },
-                { label: '影楼修图banner', value: '8' },
-                { label: '商业修图banner', value: '9' },
-                { label: '摄影banner', value: '10' },
-                { label: '样片banner', value: '11' },
-                { label: '营销banner', value: '12' },
-                { label: '周边banner', value: '13' },
-                { label: '加入我们banner', value: '14' },
-                { label: '联系我们banner', value: '15' },
-                { label: '关于我们banner', value: '16' },
 
-            ],
-            subColumn: '',
+                                                                                                                                                                                                                                                                                },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                },
+                                                                                    subColumn: '',
             subValue: '',
         }
-    },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-            this.$http.post({
-                url: this.formData.id ? '/bannerInfo/update' : '/bannerInfo/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
         },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/bannerInfo/update' : '/bannerInfo/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
                     url: '/bannerInfo/del',
                     data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
                 })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
+            },
+        }
     }
-}
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/BannerInfos.vue

@@ -2,25 +2,24 @@
     <div>
         <div class="filters-container">
 
-            <el-select v-model="slectLocation" clearable filterable placeholder="位置" @change="locationChange">
-                <el-option v-for="item in locationOptions" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-            </el-select>
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/bannerInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            <el-button @click="$router.push({path:'/bannerInfo',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                    筛选数据
-                    <i class="el-icon-arrow-down el-icon--right"></i>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -28,34 +27,49 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+        <el-table
+            :data="tableData"
+            :height="tableHeight"
+            row-key="id"
+            ref="table">
+            <el-table-column
+                v-if="multipleMode"
+                align="center"
+                type="selection"
+                width="50">
             </el-table-column>
-            <el-table-column type="index" min-width="50" align="center">
+            <el-table-column
+                type="index"
+                min-width="50"
+                align="center">
             </el-table-column>
-
-            <el-table-column v-if="isColumnShow('location')" prop="location" :formatter="locationFormatter" label="位置" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('title')" prop="title" label="标题" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('subtitle')" prop="subtitle" label="副标题" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('url')" prop="url" label="跳转链接" min-width="100">
-            </el-table-column>
-
-            <el-table-column v-if="isColumnShow('imageUrl')" prop="imageUrl" label="图片" min-width="100">
+            <el-table-column v-if="isColumnShow('url')" prop="url" label="图片" min-width="100">
                 <template slot-scope="{row}">
-                    <img :src="row.imageUrl" @click="showImg(row.imageUrl)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                    <img :src="row.url" @click="showImg(row.url)"
+                         style="width: 100px;height: 100px;vertical-align: middle;"/>
                 </template>
 
             </el-table-column>
+            <el-table-column
+                v-if="isColumnShow('uploadTime')"
+                prop="uploadTime"
+                label="更新时间"
+                :formatter="DateTimeFormatter"
+                min-width="100">
+            </el-table-column>
 
-            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            <el-table-column
+                v-if="isColumnShow('stationId')"
+                prop="stationId"
+                label="营业点id"
+                min-width="100">
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+            <el-table-column
+                label="操作"
+                align="center"
+                fixed="right"
+                min-width="150"
+            >
                 <template slot-scope="scope">
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
@@ -71,7 +85,15 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            <el-pagination
+                background
+                @size-change="pageSizeChange"
+                @current-change="currentPageChange"
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -92,14 +114,16 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -129,7 +153,8 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -163,317 +188,258 @@
     </div>
 </template>
 <script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
-
-export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 20,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '位置',
-                    value: 'location',
-                    show: true
-                },
-                {
-                    label: '标题',
-                    value: 'title',
-                    show: true
-                },
-                {
-                    label: '副标题',
-                    value: 'subtitle',
-                    show: true
-                },
-                {
-                    label: '跳转链接',
-                    value: 'url',
-                    show: true
-                },
-                {
-                    label: '图片',
-                    value: 'imageUrl',
-                    show: true
-                },
-                {
-                    label: '排序',
-                    value: 'rank',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '位置',
-                    value: 'location'
-                },
-                {
-                    label: '标题',
-                    value: 'title'
-                },
-                {
-                    label: '副标题',
-                    value: 'subtitle'
-                },
-                {
-                    label: '跳转链接',
-                    value: 'url'
-                },
-                {
-                    label: '图片',
-                    value: 'image_url'
-                },
-                {
-                    label: '排序',
-                    value: 'rank'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-            locationOptions: [
-                { label: '首页banner', value: '1' },
-                { label: '首页影楼修图消息', value: '2' },
-                { label: '首页商业修图消息', value: '4' },
-                { label: '首页摄影消息', value: '5' },
-                { label: '首页样片消息', value: '6' },
-                { label: '首页营销消息', value: '7' },
-                { label: '首页周边消息', value: '17' },
-                { label: '影楼修图banner', value: '8' },
-                { label: '商业修图banner', value: '9' },
-                { label: '摄影banner', value: '10' },
-                { label: '样片banner', value: '11' },
-                { label: '营销banner', value: '12' },
-                { label: '周边banner', value: '13' },
-                { label: '加入我们banner', value: '14' },
-                { label: '联系我们banner', value: '15' },
-                { label: '关于我们banner', value: '16' },
-
-            ],
-            slectLocation: '',
-        }
-    },
-    computed: {
-        ...mapState(['tableHeight']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
             this.getData();
         },
-        getData() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                searchKey: this.filter1,
-                advancedQuery: this.advancedQuerySearchKey,
-                orderByStr: this.orderByStr,
-                location: this.slectLocation,
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                    {
+                        label: '图片链接',
+                        value: 'url',
+                        show: true
+                    },
+                    {
+                        label: '更新时间',
+                        value: 'uploadTime',
+                        show: true
+                    },
+                    {
+                        label: '营业点id',
+                        value: 'stationId',
+                        show: true
+                    },
+                ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                    {
+                        label: '图片链接',
+                        value: 'url'
+                    },
+                    {
+                        label: '更新时间',
+                        value: 'upload_time'
+                    },
+                    {
+                        label: '营业点id',
+                        value: 'station_id'
+                    },
+                ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
             }
-
-            if (this.$route.query.column) {
-                var tempColumn = this.$route.query.column;
-                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-            }
-
-            this.$http.get({
-                url: '/bannerInfo/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
         },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
             }
         },
-        editRow(row) {
-            this.$router.push({
-                path: '/bannerInfo',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
                 }
-            })
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
-        },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
-        },
-        advancedQuery() {
 
-            this.advancedQuerySearchKey = '';
+            },
+            getData() {
 
-            if (this.advancedQueryFields.length > 0) {
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
 
-                var templist = [];
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
 
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
+                this.$http.get({
+                    url: '/bannerInfo/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
                     }
                 })
-
-                if (templist.length > 0) {
-
-                    this.advancedQuerySearchKey = templist.join('_;');
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
                 }
-            }
-
-            this.getData();
-            this.showAdvancedQueryDialog = false;
-        },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
-        },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
-        },
-        tableSortQuery() {
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/bannerInfo',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
 
-            this.orderByStr = '';
+                this.advancedQuerySearchKey = '';
 
-            if (this.tableSortFields.length > 0) {
+                if (this.advancedQueryFields.length > 0) {
 
-                var templist = [];
+                    var templist = [];
 
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
 
-                if (templist.length > 0) {
+                    if (templist.length > 0) {
 
-                    this.orderByStr = templist.join('_;');
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
                 }
-            }
 
-            this.getData();
-            this.showTableSortDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/bannerInfo/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/bannerInfo/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
                 this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
                 }
-            })
-        },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
+            },
+            tableSortQuery() {
 
-        },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
+                this.orderByStr = '';
 
-        },
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
-        },
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
 
-        locationFormatter(row, column, cellValue) {
-            if (cellValue) {
-                var location = '';
-                this.locationOptions.forEach(item => {
-                    if (item.value == Number(cellValue)) {
-                        location = item.label;
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/bannerInfo/exportExcel?searchKey="
+                    + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/bannerInfo/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
                     }
                 })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
 
-                return location;
-            }
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
 
-        },
-        locationChange() {
-            this.currentPage = 1;
-            this.getData();
-        },
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
 
+        }
     }
-}
 </script>
 <style lang="less" scoped>
+
 </style>

src/main/vue/src/pages/CommonIframe.vue

@@ -2,39 +2,36 @@
     <iframe :src="iframeSrc" :height="height" width="100%" class="iframe"> </iframe>
 </template>
 <script>
-import { mapState } from 'vuex'
+import { mapState } from "vuex";
 
 export default {
-    created() {
-        this.getIframeSrc();
-    },
-    data() {
-        return {
-            iframeSrc: '/404',
-        }
-    },
-    computed: {
-        height() {
-            return window.innerHeight - 104 + 'px'
-        }
-    },
-    methods: {
-        getIframeSrc() {
-
-            this.iframeSrc = this.$route.query.code;
-
-        },
-    },
-    watch: {
-        $route() {
-            this.getIframeSrc()
-        }
-    },
-
-}
+  created() {
+    this.getIframeSrc();
+  },
+  data() {
+    return {
+      iframeSrc: "/404"
+    };
+  },
+  computed: {
+    height() {
+      return window.innerHeight - 104 + "px";
+    }
+  },
+  methods: {
+    getIframeSrc() {
+      this.iframeSrc = this.$route.query.code;
+    }
+  },
+  watch: {
+    $route() {
+      this.getIframeSrc();
+    }
+  }
+};
 </script>
 <style lang="less" scoped>
 .iframe {
-    border: none;
+  border: none;
 }
 </style>

src/main/vue/src/pages/CompanyAuthentication.vue

@@ -50,92 +50,97 @@
     </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from "../formValidator";
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
-
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/companyAuthentication/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
+export default {
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                        this.formData = res.data;
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/companyAuthentication/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
+            if (this.$route.query.column) {
+              this.formData[this.subColumn] = this.subValue;
             }
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-                                                                                                                                                                    subColumn: '',
-            subValue: '',
-        }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/companyAuthentication/update' : '/companyAuthentication/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                    url: '/companyAuthentication/del',
-                    data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
+          }
+        });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+    }
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {},
+      subColumn: "",
+      subValue: ""
+    };
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
         }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id
+            ? "/companyAuthentication/update"
+            : "/companyAuthentication/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
+    },
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/companyAuthentication/del",
+            data: { id: this.formData.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
     }
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/CompanyAuthentications.vue

@@ -194,432 +194,436 @@
     </div>
 </template>
 <script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
+import { mapState } from "vuex";
+import { format } from "date-fns";
+import zh from "date-fns/locale/zh_cn";
 
 export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 20,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '创建时间',
-                    value: 'createTime',
-                    show: true
-                },
-                {
-                    label: '用户ID',
-                    value: 'userId',
-                    show: true
-                },
-                {
-                    label: '用户名',
-                    value: 'userName',
-                    show: true
-                },
-                {
-                    label: '公司名',
-                    value: 'company',
-                    show: true
-                },
-                {
-                    label: '注册时间',
-                    value: 'companyTime',
-                    show: true
-                },
-                {
-                    label: '工商注册号',
-                    value: 'businessNo',
-                    show: true
-                },
-                {
-                    label: '证件',
-                    value: 'certificate',
-                    show: true
-                },
-                {
-                    label: '省',
-                    value: 'province',
-                    show: true
-                },
-                {
-                    label: '城市',
-                    value: 'city',
-                    show: true
-                },
-                {
-                    label: '国家',
-                    value: 'country',
-                    show: true
-                },
-                {
-                    label: '状态',
-                    value: 'statusFlag',
-                    show: true
-                },
-                {
-                    label: '电话',
-                    value: 'telephone',
-                    show: true
-                },
-                {
-                    label: '姓名',
-                    value: 'realName',
-                    show: true
-                },
-                {
-                    label: '备注',
-                    value: 'remark',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '创建时间',
-                    value: 'create_time'
-                },
-                {
-                    label: '用户ID',
-                    value: 'user_id'
-                },
-                {
-                    label: '用户名',
-                    value: 'user_name'
-                },
-                {
-                    label: '公司名',
-                    value: 'company'
-                },
-                {
-                    label: '注册时间',
-                    value: 'company_time'
-                },
-                {
-                    label: '工商注册号',
-                    value: 'business_no'
-                },
-                {
-                    label: '证件',
-                    value: 'certificate'
-                },
-                {
-                    label: '省',
-                    value: 'province'
-                },
-                {
-                    label: '城市',
-                    value: 'city'
-                },
-                {
-                    label: '国家',
-                    value: 'country'
-                },
-                {
-                    label: '状态',
-                    value: 'status_flag'
-                },
-                {
-                    label: '电话',
-                    value: 'telephone'
-                },
-                {
-                    label: '姓名',
-                    value: 'real_name'
-                },
-                {
-                    label: '备注',
-                    value: 'remark'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-            showDialog: false,
-            testimonials: {
-                content: ''
-
-            },
-            auditorId: '',
-        }
-    },
-    computed: {
-        ...mapState(['tableHeight']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
+  created() {
+    this.getData();
+  },
+  data() {
+    return {
+      totalNumber: 0,
+      totalPage: 10,
+      currentPage: 1,
+      pageSize: 20,
+      tableData: [],
+      filter1: "",
+      filter2: "",
+      tableColumns: [
+        {
+          label: "创建时间",
+          value: "createTime",
+          show: true
         },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getData();
+        {
+          label: "用户ID",
+          value: "userId",
+          show: true
         },
-        getData() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                searchKey: this.filter1,
-                advancedQuery: this.advancedQuerySearchKey,
-                orderByStr: this.orderByStr,
-            }
-
-            if (this.$route.query.column) {
-                var tempColumn = this.$route.query.column;
-                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-            }
-
-            this.$http.get({
-                url: '/companyAuthentication/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
+        {
+          label: "用户名",
+          value: "userName",
+          show: true
         },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
+        {
+          label: "公司名",
+          value: "company",
+          show: true
         },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
+        {
+          label: "注册时间",
+          value: "companyTime",
+          show: true
         },
-        editRow(row) {
-            this.$router.push({
-                path: '/companyAuthentication',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
-                }
-            })
+        {
+          label: "工商注册号",
+          value: "businessNo",
+          show: true
         },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
+        {
+          label: "证件",
+          value: "certificate",
+          show: true
         },
-        operation2() {
-            this.$message('操作2');
+        {
+          label: "省",
+          value: "province",
+          show: true
         },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
+        {
+          label: "城市",
+          value: "city",
+          show: true
         },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
+        {
+          label: "国家",
+          value: "country",
+          show: true
         },
-        advancedQuery() {
-
-            this.advancedQuerySearchKey = '';
-
-            if (this.advancedQueryFields.length > 0) {
-
-                var templist = [];
-
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.advancedQuerySearchKey = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showAdvancedQueryDialog = false;
+        {
+          label: "状态",
+          value: "statusFlag",
+          show: true
         },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
+        {
+          label: "电话",
+          value: "telephone",
+          show: true
         },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
+        {
+          label: "姓名",
+          value: "realName",
+          show: true
         },
-        tableSortQuery() {
-
-            this.orderByStr = '';
-
-            if (this.tableSortFields.length > 0) {
-
-                var templist = [];
-
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.orderByStr = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showTableSortDialog = false;
+        {
+          label: "备注",
+          value: "remark",
+          show: true
+        }
+      ],
+      multipleMode: false,
+      showAdvancedQueryDialog: false,
+      advancedQueryFields: [],
+      showTableSortDialog: false,
+      tableSortFields: [],
+      searchMethods: ["=", "!=", ">", ">=", "<", "<=", "like"],
+      advancedQueryColumns: [
+        {
+          label: "创建时间",
+          value: "create_time"
         },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/companyAuthentication/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        {
+          label: "用户ID",
+          value: "user_id"
         },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
+        {
+          label: "用户名",
+          value: "user_name"
         },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/companyAuthentication/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
+        {
+          label: "公司名",
+          value: "company"
         },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
-
+        {
+          label: "注册时间",
+          value: "company_time"
         },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
-
+        {
+          label: "工商注册号",
+          value: "business_no"
         },
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
+        {
+          label: "证件",
+          value: "certificate"
         },
-
-        passTestimonials() {
-            var data = {
-                id: this.auditorId,
-                remark: this.testimonials.content,
-            };
-
-
-            this.$http.post({
-                url: '../companyAuthentication/pass',
-                data: data,
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('保存成功');
-                    this.getData();
-                    this.showDialog = false
-                } else {
-                    this.$message.error('保存失败');
-                }
-                this.testimonials = {
-                    content: ''
-                }
-                this.auditorId = ''
-            })
-
+        {
+          label: "省",
+          value: "province"
         },
-        failTestimonials() {
-            var data = {
-                id: this.auditorId,
-                remark: this.testimonials.content,
-            };
-
-            this.$http.post({
-                url: '../companyAuthentication/fail',
-                data: data,
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('保存成功');
-                    this.getData();
-                    this.showDialog = false
-                } else {
-                    this.$message.error('保存失败');
-                }
-                this.testimonials = {
-                    content: ''
-                }
-                this.auditorId = ''
-            })
-
+        {
+          label: "城市",
+          value: "city"
+        },
+        {
+          label: "国家",
+          value: "country"
+        },
+        {
+          label: "状态",
+          value: "status_flag"
+        },
+        {
+          label: "电话",
+          value: "telephone"
         },
+        {
+          label: "姓名",
+          value: "real_name"
+        },
+        {
+          label: "备注",
+          value: "remark"
+        }
+      ],
+      advancedQuerySearchKey: "",
+      orderByStr: "",
+      imgSrc: "",
+      imageDialogVisible: false,
+      showDialog: false,
+      testimonials: {
+        content: ""
+      },
+      auditorId: ""
+    };
+  },
+  computed: {
+    ...mapState(["tableHeight"]),
+    selection() {
+      return this.$refs.table.selection.map(i => i.id);
+    }
+  },
+  methods: {
+    pageSizeChange(size) {
+      this.currentPage = 1;
+      this.pageSize = size;
+      this.getData();
+    },
+    currentPageChange(page) {
+      this.currentPage = page;
+      this.getData();
+    },
+    getData() {
+      var data = {
+        currentPage: this.currentPage,
+        pageNumber: this.pageSize,
+        searchKey: this.filter1,
+        advancedQuery: this.advancedQuerySearchKey,
+        orderByStr: this.orderByStr
+      };
+
+      if (this.$route.query.column) {
+        var tempColumn = this.$route.query.column;
+        data[tempColumn.split(",")[1]] = tempColumn.split(",")[0];
+      }
+
+      this.$http
+        .get({
+          url: "/companyAuthentication/page",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.totalNumber = res.data.page.totalNumber;
+            this.tableData = res.data.pp;
+          }
+        });
+    },
+    isColumnShow(column) {
+      var row = this.tableColumns.find(i => i.value === column);
+      return row ? row.show : false;
+    },
+    toggleMultipleMode(multipleMode) {
+      this.multipleMode = multipleMode;
+      if (!multipleMode) {
+        this.$refs.table.clearSelection();
+      }
+    },
+    editRow(row) {
+      this.$router.push({
+        path: "/companyAuthentication",
+        query: {
+          id: row.id,
+          column: this.$route.query.column
+        }
+      });
+    },
+    operation1() {
+      this.$notify({
+        title: "提示",
+        message: this.selection
+      });
+    },
+    operation2() {
+      this.$message("操作2");
+    },
+    addField() {
+      this.advancedQueryFields.push({
+        link: "AND",
+        name: "",
+        searchMethod: "=",
+        value: ""
+      });
+    },
+    removeField(i) {
+      if (this.advancedQueryFields.length > 0) {
+        this.advancedQueryFields.splice(i, 1);
+      }
+    },
+    advancedQuery() {
+      this.advancedQuerySearchKey = "";
+
+      if (this.advancedQueryFields.length > 0) {
+        var templist = [];
+
+        this.advancedQueryFields.forEach(item => {
+          if (item.link && item.name && item.searchMethod && item.value) {
+            var tempItem =
+              item.link +
+              "_," +
+              item.name +
+              "_," +
+              item.searchMethod +
+              "_," +
+              item.value;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.advancedQuerySearchKey = templist.join("_;");
+        }
+      }
 
-        approverRow(row) {
+      this.getData();
+      this.showAdvancedQueryDialog = false;
+    },
+    addSortField() {
+      this.tableSortFields.push({
+        name: "",
+        order: "asc"
+      });
+    },
+    removeSortField(i) {
+      if (this.tableSortFields.length > 0) {
+        this.tableSortFields.splice(i, 1);
+      }
+    },
+    tableSortQuery() {
+      this.orderByStr = "";
 
-            this.auditorId = row.id;
-            this.showDialog = true;
+      if (this.tableSortFields.length > 0) {
+        var templist = [];
 
-        },
+        this.tableSortFields.forEach(item => {
+          if (item.name && item.order) {
+            var tempItem = item.name + "_," + item.order;
+            templist.push(tempItem);
+          }
+        });
 
-        StatusFlagFormatter(row, column, cellValue) {
+        if (templist.length > 0) {
+          this.orderByStr = templist.join("_;");
+        }
+      }
 
-            var valueStr = '';
-            switch (cellValue) {
-                case 0:
-                    valueStr = '审核中';
-                    break;
-                case 1:
-                    valueStr = '通过';
-                    break
-                case 2:
-                    valueStr = '失败';
-                    break
-            }
+      this.getData();
+      this.showTableSortDialog = false;
+    },
+    exportExcel() {
+      window.location.href =
+        this.$baseUrl +
+        "/companyAuthentication/exportExcel?searchKey=" +
+        this.filter1 +
+        "&advancedQuery=" +
+        this.advancedQuerySearchKey +
+        "&orderByStr=" +
+        this.orderByStr;
+    },
+    searchData() {
+      this.currentPage = 1;
+      this.getData();
+    },
+    deleteRow(row) {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/companyAuthentication/del",
+            data: { id: row.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.getData();
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    },
+    DateTimeFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD HH:mm", { locale: zh });
+      }
+    },
+    DateFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD", { locale: zh });
+      }
+    },
+    showImg(img) {
+      this.imgSrc = img;
+      this.imageDialogVisible = true;
+    },
 
-            return valueStr;
+    passTestimonials() {
+      var data = {
+        id: this.auditorId,
+        remark: this.testimonials.content
+      };
+
+      this.$http
+        .post({
+          url: "../companyAuthentication/pass",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("保存成功");
+            this.getData();
+            this.showDialog = false;
+          } else {
+            this.$message.error("保存失败");
+          }
+          this.testimonials = {
+            content: ""
+          };
+          this.auditorId = "";
+        });
+    },
+    failTestimonials() {
+      var data = {
+        id: this.auditorId,
+        remark: this.testimonials.content
+      };
+
+      this.$http
+        .post({
+          url: "../companyAuthentication/fail",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("保存成功");
+            this.getData();
+            this.showDialog = false;
+          } else {
+            this.$message.error("保存失败");
+          }
+          this.testimonials = {
+            content: ""
+          };
+          this.auditorId = "";
+        });
+    },
 
-        },
+    approverRow(row) {
+      this.auditorId = row.id;
+      this.showDialog = true;
+    },
 
+    StatusFlagFormatter(row, column, cellValue) {
+      var valueStr = "";
+      switch (cellValue) {
+        case 0:
+          valueStr = "审核中";
+          break;
+        case 1:
+          valueStr = "通过";
+          break;
+        case 2:
+          valueStr = "失败";
+          break;
+      }
+
+      return valueStr;
     }
-}
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/CompanyInfoDetail.vue

@@ -36,125 +36,128 @@
     </div>
 </template>
 <script>
-import formValidator from '../formValidator'
+import formValidator from "../formValidator";
 
 export default {
-    created() {
-        if (this.$route.query.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
-        }
-
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/companyInfoDetail/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
-
+  created() {
+    if (this.$route.query.column) {
+      this.subColumn = this.$route.query.column.split(",")[1];
+      this.subValue = this.$route.query.column.split(",")[0];
+    }
 
-                    this.formData = res.data;
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/companyInfoDetail/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.formData = res.data;
 
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
-                    var nameList = res.data.voice.split('/')
-                    var jsonp = {
-                        name: nameList[nameList.length - 1],
-                        url: res.data.voice
-                    }
-                    this.fileList.push(jsonp)
-                }
-            })
-        } else {
             if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
+              this.formData[this.subColumn] = this.subValue;
             }
+            var nameList = res.data.voice.split("/");
+            var jsonp = {
+              name: nameList[nameList.length - 1],
+              url: res.data.voice
+            };
+            this.fileList.push(jsonp);
+          }
+        });
+    } else {
+      if (this.$route.query.column) {
+        this.formData[this.subColumn] = this.subValue;
+      }
+    }
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {},
+      rules: {
+        companyName: [
+          { required: true, message: "请输入 企业名称", trigger: "blur" }
+        ],
+        hall: [{ required: true, message: "请输入 展馆", trigger: "blur" }],
+        boothNo: [{ required: true, message: "请输入 展位号", trigger: "blur" }]
+      },
+      hallOptions: [
+        { label: "4号馆", value: "4号馆" },
+        { label: "5号馆", value: "5号馆" },
+        { label: "6号馆", value: "6号馆" },
+        { label: "5A馆", value: "5A馆" }
+      ],
+      subColumn: "",
+      subValue: "",
+      fileList: []
+    };
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
         }
-
+      });
     },
-    data() {
-        return {
-            saving: false,
-            formData: {},
-            rules: {
-                companyName:
-                    [
-                        { required: true, message: '请输入 企业名称', trigger: 'blur' },
-                    ],
-                hall:
-                    [
-                        { required: true, message: '请输入 展馆', trigger: 'blur' },
-                    ],
-                boothNo:
-                    [
-                        { required: true, message: '请输入 展位号', trigger: 'blur' },
-                    ],
-            },
-            hallOptions: [{ label: '4号馆', value: '4号馆' }, { label: '5号馆', value: '5号馆' }, { label: '6号馆', value: '6号馆' }, { label: '5A馆', value: '5A馆' }],
-            subColumn: '',
-            subValue: '',
-            fileList: []
-
-        }
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id
+            ? "/companyInfoDetail/update"
+            : "/companyInfoDetail/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
     },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-            this.$http.post({
-                url: this.formData.id ? '/companyInfoDetail/update' : '/companyInfoDetail/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/companyInfoDetail/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        haleSuccess(file) {
-            // console.log(file)
-            file.data.forEach(item => {
-                var nameList = item.split('/')
-                var jsonp = {
-                    name: nameList[nameList.length - 1],
-                    url: item
-                }
-                this.fileList.splice(0, 1, jsonp)
-                this.formData.voice = item
-            })
-        }
+    onDelete() {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/companyInfoDetail/del",
+            data: { id: this.formData.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.$router.go(-1);
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    },
+    haleSuccess(file) {
+      // console.log(file)
+      file.data.forEach(item => {
+        var nameList = item.split("/");
+        var jsonp = {
+          name: nameList[nameList.length - 1],
+          url: item
+        };
+        this.fileList.splice(0, 1, jsonp);
+        this.formData.voice = item;
+      });
     }
-}
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/ContactUss.vue

@@ -202,270 +202,277 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
-            this.getData();
+import { mapState } from "vuex";
+import { format } from "date-fns";
+import zh from "date-fns/locale/zh_cn";
+
+export default {
+  created() {
+    this.getData();
+  },
+  data() {
+    return {
+      totalNumber: 0,
+      totalPage: 10,
+      currentPage: 1,
+      pageSize: 20,
+      tableData: [],
+      filter1: "",
+      filter2: "",
+      tableColumns: [
+        {
+          label: "公司名称",
+          value: "companyName",
+          show: true
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '公司名称',
-                                value: 'companyName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '电话',
-                                value: 'telephone',
-                                show: true
-                            },
-                                                                                                {
-                                label: '传真',
-                                value: 'faxes',
-                                show: true
-                            },
-                                                                                                {
-                                label: '邮编',
-                                value: 'postcode',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地址',
-                                value: 'address',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '公司名称',
-                                value: 'company_name'
-                            },
-                                                                                                {
-                                label: '电话',
-                                value: 'telephone'
-                            },
-                                                                                                {
-                                label: '传真',
-                                value: 'faxes'
-                            },
-                                                                                                {
-                                label: '邮编',
-                                value: 'postcode'
-                            },
-                                                                                                {
-                                label: '地址',
-                                value: 'address'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        {
+          label: "电话",
+          value: "telephone",
+          show: true
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
-            }
+        {
+          label: "传真",
+          value: "faxes",
+          show: true
         },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
-
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
-
-                this.$http.get({
-                    url: '/contactUs/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
-                }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/contactUs',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
-                }
-            },
-            advancedQuery() {
-
-                this.advancedQuerySearchKey = '';
-
-                if (this.advancedQueryFields.length > 0) {
-
-                    var templist = [];
-
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
-
-                this.orderByStr = '';
-
-                if (this.tableSortFields.length > 0) {
-
-                    var templist = [];
-
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
-
-                    if (templist.length > 0) {
-
-                        this.orderByStr = templist.join('_;');
-                    }
-                }
-
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/contactUs/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/contactUs/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
-                }
-
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
-
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
-
+        {
+          label: "邮编",
+          value: "postcode",
+          show: true
+        },
+        {
+          label: "地址",
+          value: "address",
+          show: true
+        }
+      ],
+      multipleMode: false,
+      showAdvancedQueryDialog: false,
+      advancedQueryFields: [],
+      showTableSortDialog: false,
+      tableSortFields: [],
+      searchMethods: ["=", "!=", ">", ">=", "<", "<=", "like"],
+      advancedQueryColumns: [
+        {
+          label: "公司名称",
+          value: "company_name"
+        },
+        {
+          label: "电话",
+          value: "telephone"
+        },
+        {
+          label: "传真",
+          value: "faxes"
+        },
+        {
+          label: "邮编",
+          value: "postcode"
+        },
+        {
+          label: "地址",
+          value: "address"
+        }
+      ],
+      advancedQuerySearchKey: "",
+      orderByStr: "",
+      imgSrc: "",
+      imageDialogVisible: false
+    };
+  },
+  computed: {
+    ...mapState(["tableHeight"]),
+    selection() {
+      return this.$refs.table.selection.map(i => i.id);
+    }
+  },
+  methods: {
+    pageSizeChange(size) {
+      this.currentPage = 1;
+      this.pageSize = size;
+      this.getData();
+    },
+    currentPageChange(page) {
+      this.currentPage = page;
+      this.getData();
+    },
+    getData() {
+      var data = {
+        currentPage: this.currentPage,
+        pageNumber: this.pageSize,
+        searchKey: this.filter1,
+        advancedQuery: this.advancedQuerySearchKey,
+        orderByStr: this.orderByStr
+      };
+
+      if (this.$route.query.column) {
+        var tempColumn = this.$route.query.column;
+        data[tempColumn.split(",")[1]] = tempColumn.split(",")[0];
+      }
+
+      this.$http
+        .get({
+          url: "/contactUs/page",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.totalNumber = res.data.page.totalNumber;
+            this.tableData = res.data.pp;
+          }
+        });
+    },
+    isColumnShow(column) {
+      var row = this.tableColumns.find(i => i.value === column);
+      return row ? row.show : false;
+    },
+    toggleMultipleMode(multipleMode) {
+      this.multipleMode = multipleMode;
+      if (!multipleMode) {
+        this.$refs.table.clearSelection();
+      }
+    },
+    editRow(row) {
+      this.$router.push({
+        path: "/contactUs",
+        query: {
+          id: row.id,
+          column: this.$route.query.column
+        }
+      });
+    },
+    operation1() {
+      this.$notify({
+        title: "提示",
+        message: this.selection
+      });
+    },
+    operation2() {
+      this.$message("操作2");
+    },
+    addField() {
+      this.advancedQueryFields.push({
+        link: "AND",
+        name: "",
+        searchMethod: "=",
+        value: ""
+      });
+    },
+    removeField(i) {
+      if (this.advancedQueryFields.length > 0) {
+        this.advancedQueryFields.splice(i, 1);
+      }
+    },
+    advancedQuery() {
+      this.advancedQuerySearchKey = "";
+
+      if (this.advancedQueryFields.length > 0) {
+        var templist = [];
+
+        this.advancedQueryFields.forEach(item => {
+          if (item.link && item.name && item.searchMethod && item.value) {
+            var tempItem =
+              item.link +
+              "_," +
+              item.name +
+              "_," +
+              item.searchMethod +
+              "_," +
+              item.value;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.advancedQuerySearchKey = templist.join("_;");
         }
+      }
+
+      this.getData();
+      this.showAdvancedQueryDialog = false;
+    },
+    addSortField() {
+      this.tableSortFields.push({
+        name: "",
+        order: "asc"
+      });
+    },
+    removeSortField(i) {
+      if (this.tableSortFields.length > 0) {
+        this.tableSortFields.splice(i, 1);
+      }
+    },
+    tableSortQuery() {
+      this.orderByStr = "";
+
+      if (this.tableSortFields.length > 0) {
+        var templist = [];
+
+        this.tableSortFields.forEach(item => {
+          if (item.name && item.order) {
+            var tempItem = item.name + "_," + item.order;
+            templist.push(tempItem);
+          }
+        });
+
+        if (templist.length > 0) {
+          this.orderByStr = templist.join("_;");
+        }
+      }
+
+      this.getData();
+      this.showTableSortDialog = false;
+    },
+    exportExcel() {
+      window.location.href =
+        this.$baseUrl +
+        "/contactUs/exportExcel?searchKey=" +
+        this.filter1 +
+        "&advancedQuery=" +
+        this.advancedQuerySearchKey +
+        "&orderByStr=" +
+        this.orderByStr;
+    },
+    searchData() {
+      this.currentPage = 1;
+      this.getData();
+    },
+    deleteRow(row) {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/contactUs/del",
+            data: { id: row.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.getData();
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
+    },
+    DateTimeFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD HH:mm", { locale: zh });
+      }
+    },
+    DateFormatter(row, column, cellValue) {
+      if (cellValue) {
+        return format(cellValue, "YYYY/MM/DD", { locale: zh });
+      }
+    },
+    showImg(img) {
+      this.imgSrc = img;
+      this.imageDialogVisible = true;
     }
+  }
+};
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/DataSourceInfos.vue

@@ -119,209 +119,222 @@
     </div>
 </template>
 <script>
-import { mapState } from 'vuex'
+import { mapState } from "vuex";
 
 export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 20,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: 'code',
-                    value: 'code',
-                    show: true
-                },
-                {
-                    label: '数据库类型',
-                    value: 'databaseType',
-                    show: true
-                },
-                {
-                    label: '链接',
-                    value: 'url',
-                    show: true
-                },
-                {
-                    label: '用户名',
-                    value: 'username',
-                    show: true
-                },
-                {
-                    label: '密码',
-                    value: 'password',
-                    show: true
-                },
-                {
-                    label: '名称',
-                    value: 'databaseName',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: 'code',
-                    value: 'code'
-                },
-                {
-                    label: '数据库类型',
-                    value: 'database_type'
-                },
-                {
-                    label: '链接',
-                    value: 'url'
-                },
-                {
-                    label: '用户名',
-                    value: 'username'
-                },
-                {
-                    label: '密码',
-                    value: 'password'
-                },
-                {
-                    label: '名称',
-                    value: 'database_name'
-                },
-            ],
-            advancedQuerySearchKey: '',
-        }
-    },
-    computed: {
-        ...mapState(['tableHeight']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
+  created() {
+    this.getData();
+  },
+  data() {
+    return {
+      totalNumber: 0,
+      totalPage: 10,
+      currentPage: 1,
+      pageSize: 20,
+      tableData: [],
+      filter1: "",
+      filter2: "",
+      tableColumns: [
+        {
+          label: "code",
+          value: "code",
+          show: true
         },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getData();
+        {
+          label: "数据库类型",
+          value: "databaseType",
+          show: true
         },
-        getData() {
-            this.$http.get({
-                url: '/dataSourceInfo/page',
-                data: {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
+        {
+          label: "链接",
+          value: "url",
+          show: true
         },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
+        {
+          label: "用户名",
+          value: "username",
+          show: true
         },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
+        {
+          label: "密码",
+          value: "password",
+          show: true
         },
-        editRow(row) {
-            this.$router.push({
-                path: '/dataSourceInfo',
-                query: {
-                    id: row.id
-                }
-            })
+        {
+          label: "名称",
+          value: "databaseName",
+          show: true
+        }
+      ],
+      multipleMode: false,
+      showAdvancedQueryDialog: false,
+      advancedQueryFields: [],
+      searchMethods: ["=", "!=", ">", ">=", "<", "<=", "like"],
+      advancedQueryColumns: [
+        {
+          label: "code",
+          value: "code"
         },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
+        {
+          label: "数据库类型",
+          value: "database_type"
         },
-        operation2() {
-            this.$message('操作2');
+        {
+          label: "链接",
+          value: "url"
         },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
+        {
+          label: "用户名",
+          value: "username"
         },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
+        {
+          label: "密码",
+          value: "password"
         },
-        advancedQuery() {
-
-            this.advancedQuerySearchKey = '';
-
-            if (this.advancedQueryFields.length > 0) {
-
-                var templist = [];
-
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
-                    }
-                })
+        {
+          label: "名称",
+          value: "database_name"
+        }
+      ],
+      advancedQuerySearchKey: ""
+    };
+  },
+  computed: {
+    ...mapState(["tableHeight"]),
+    selection() {
+      return this.$refs.table.selection.map(i => i.id);
+    }
+  },
+  methods: {
+    pageSizeChange(size) {
+      this.currentPage = 1;
+      this.pageSize = size;
+      this.getData();
+    },
+    currentPageChange(page) {
+      this.currentPage = page;
+      this.getData();
+    },
+    getData() {
+      this.$http
+        .get({
+          url: "/dataSourceInfo/page",
+          data: {
+            currentPage: this.currentPage,
+            pageNumber: this.pageSize,
+            searchKey: this.filter1,
+            advancedQuery: this.advancedQuerySearchKey
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            this.totalNumber = res.data.page.totalNumber;
+            this.tableData = res.data.pp;
+          }
+        });
+    },
+    isColumnShow(column) {
+      var row = this.tableColumns.find(i => i.value === column);
+      return row ? row.show : false;
+    },
+    toggleMultipleMode(multipleMode) {
+      this.multipleMode = multipleMode;
+      if (!multipleMode) {
+        this.$refs.table.clearSelection();
+      }
+    },
+    editRow(row) {
+      this.$router.push({
+        path: "/dataSourceInfo",
+        query: {
+          id: row.id
+        }
+      });
+    },
+    operation1() {
+      this.$notify({
+        title: "提示",
+        message: this.selection
+      });
+    },
+    operation2() {
+      this.$message("操作2");
+    },
+    addField() {
+      this.advancedQueryFields.push({
+        link: "AND",
+        name: "",
+        searchMethod: "=",
+        value: ""
+      });
+    },
+    removeField(i) {
+      if (this.advancedQueryFields.length > 0) {
+        this.advancedQueryFields.splice(i, 1);
+      }
+    },
+    advancedQuery() {
+      this.advancedQuerySearchKey = "";
 
-                if (templist.length > 0) {
+      if (this.advancedQueryFields.length > 0) {
+        var templist = [];
 
-                    this.advancedQuerySearchKey = templist.join('_;');
-                }
-            }
+        this.advancedQueryFields.forEach(item => {
+          if (item.link && item.name && item.searchMethod && item.value) {
+            var tempItem =
+              item.link +
+              "_," +
+              item.name +
+              "_," +
+              item.searchMethod +
+              "_," +
+              item.value;
+            templist.push(tempItem);
+          }
+        });
 
-            this.getData();
-            this.showAdvancedQueryDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/dataSourceInfo/exportExcel?searchKey=" + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/dataSourceInfo/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
+        if (templist.length > 0) {
+          this.advancedQuerySearchKey = templist.join("_;");
+        }
+      }
 
+      this.getData();
+      this.showAdvancedQueryDialog = false;
+    },
+    exportExcel() {
+      window.location.href =
+        this.$baseUrl +
+        "/dataSourceInfo/exportExcel?searchKey=" +
+        this.filter1 +
+        "&advancedQuery=" +
+        this.advancedQuerySearchKey;
+    },
+    searchData() {
+      this.currentPage = 1;
+      this.getData();
+    },
+    deleteRow(row) {
+      this.$alert("删除将无法恢复，确认要删除么？", "警告", { type: "error" })
+        .then(() => {
+          return this.$http.post({
+            url: "/dataSourceInfo/del",
+            data: { id: row.id }
+          });
+        })
+        .then(() => {
+          this.$message.success("删除成功");
+          this.getData();
+        })
+        .catch(action => {
+          if (action === "cancel") {
+            this.$message.info("删除取消");
+          } else {
+            this.$message.error("删除失败");
+          }
+        });
     }
-}
+  }
+};
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/GenCode.vue

@@ -400,7 +400,7 @@ export default {
                 dataSourceCode: 'dataSource',
                 className: '',
                 subtables: [],
-                typeFlag:'图途象',
+                typeFlag:'华泰证券',
 
             },
             fields: [

src/main/vue/src/pages/PersonalAuthentication.vue

@@ -2,43 +2,44 @@
     <div>
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
-                                                                                                                                                                                                                                    <el-form-item prop="userId" label="用户id">
+            <el-form-item prop="userId" label="用户id">
                 <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="userName" label="用户名">
+            <el-form-item prop="userName" label="用户名">
                 <el-input v-model="formData.userName" :disabled="'userName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="realName" label="真实姓名">
+            <el-form-item prop="realName" label="真实姓名">
                 <el-input v-model="formData.realName" :disabled="'realName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="idcard" label="身份证号">
+            <el-form-item prop="idcard" label="身份证号">
                 <el-input v-model="formData.idcard" :disabled="'idcard'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="faceImage" label="正面">
-                 <single-upload v-model="formData.faceImage" :disabled="'faceImage'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                                                                                                                                                             <el-form-item prop="backImage" label="背面">
-                 <single-upload v-model="formData.backImage" :disabled="'backImage'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                                                                                                                    <el-form-item prop="statusFlag" label="状态">
+            <el-form-item prop="faceImage" label="正面">
+                <single-upload v-model="formData.faceImage" :disabled="'faceImage'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="backImage" label="背面">
+                <single-upload v-model="formData.backImage" :disabled="'backImage'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="statusFlag" label="状态">
                 <template>
-                    <el-select v-model="formData.statusFlag" clearable  placeholder="请选择" :disabled="'statusFlag'==subColumn">
+                    <el-select v-model="formData.statusFlag" clearable placeholder="请选择"
+                               :disabled="'statusFlag'==subColumn">
                         <el-option
-                                v-for="item in statusFlagOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                            v-for="item in statusFlagOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="telephone" label="电话">
+            <el-form-item prop="telephone" label="电话">
                 <el-input v-model="formData.telephone" :disabled="'telephone'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+            <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -68,28 +69,27 @@
 
                         this.formData = res.data;
 
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
+                        if (this.$route.query.column) {
+                            this.formData[this.subColumn] = this.subValue;
+                        }
                     }
                 })
-            }else {
+            } else {
                 if (this.$route.query.column) {
                     this.formData[this.subColumn] = this.subValue;
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+        },
         data() {
             return {
                 saving: false,
                 formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                        },
-                                                                                                                        statusFlagOptions:[{ label: '审核中', value: 0}, { label: '通过', value: 1 },{ label: '失败', value: 2 }],
-                                                subColumn: '',
-            subValue: '',
-        }
+                rules: {},
+                statusFlagOptions: [{label: '审核中', value: 0}, {label: '通过', value: 1}, {label: '失败', value: 2}],
+                subColumn: '',
+                subValue: '',
+            }
         },
         methods: {
             onSave() {
@@ -116,10 +116,10 @@
                 });
             },
             onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
                     return this.$http.post({
-                    url: '/personalAuthentication/del',
-                    data: { id: this.formData.id }
+                        url: '/personalAuthentication/del',
+                        data: {id: this.formData.id}
                     })
                 }).then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/pages/StoreInfos.vue

@@ -5,11 +5,14 @@
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/storeInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            <el-button @click="$router.push({path:'/storeInfo',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
@@ -33,7 +36,8 @@
             <el-table-column v-if="isColumnShow('storeName')" prop="storeName" label="店铺名称" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('serviceType')" prop="serviceType" label="服务类型" :formatter="ServiceTypeFormatter" min-width="100">
+            <el-table-column v-if="isColumnShow('serviceType')" prop="serviceType" label="服务类型"
+                             :formatter="ServiceTypeFormatter" min-width="100">
             </el-table-column>
             <!--
             <el-table-column v-if="isColumnShow('subclass')" prop="subclass" label="服务小类" :formatter="ServiceTypeDetailFormatter" min-width="100">
@@ -44,7 +48,8 @@
 
             <el-table-column v-if="isColumnShow('icon')" prop="icon" label="头像" min-width="100">
                 <template slot-scope="{row}">
-                    <img :src="row.icon" @click="showImg(row.icon)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                    <img :src="row.icon" @click="showImg(row.icon)"
+                         style="width: 100px;height: 100px;vertical-align: middle;"/>
                 </template>
 
             </el-table-column>
@@ -64,13 +69,16 @@
             <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('hotFlag')" prop="hotFlag" label="热门" :formatter="YNFormatter" min-width="100">
+            <el-table-column v-if="isColumnShow('hotFlag')" prop="hotFlag" label="热门" :formatter="YNFormatter"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('homeFlag')" prop="homeFlag" label="首页" :formatter="YNFormatter" min-width="100">
+            <el-table-column v-if="isColumnShow('homeFlag')" prop="homeFlag" label="首页" :formatter="YNFormatter"
+                             min-width="100">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag" label="类型" :formatter="TypeFlagFormatter" min-width="100">
+            <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag" label="类型" :formatter="TypeFlagFormatter"
+                             min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('province')" prop="province" label="省" min-width="100">
@@ -103,8 +111,12 @@
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
                     <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="updateRow(scope.row,'N')" v-if="scope.row.useFlag=='Y'" type="danger" size="mini" plain>下架</el-button>
-                    <el-button @click="updateRow(scope.row,'Y')" v-if="scope.row.useFlag=='N'" type="success" size="mini" plain>上架</el-button>
+                    <el-button @click="updateRow(scope.row,'N')" v-if="scope.row.useFlag=='Y'" type="danger" size="mini"
+                               plain>下架
+                    </el-button>
+                    <el-button @click="updateRow(scope.row,'Y')" v-if="scope.row.useFlag=='N'" type="success"
+                               size="mini" plain>上架
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -117,7 +129,9 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange"
+                           :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -138,14 +152,16 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -175,7 +191,8 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -209,508 +226,508 @@
     </div>
 </template>
 <script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
 
-export default {
-    created() {
+    export default {
+        created() {
 
-        this.$http.get({
-            url: '/serviceType/all'
-        }).then(res => {
-            if (res.success) {
-                this.serviceTypes = res.data;
+            this.$http.get({
+                url: '/serviceType/all'
+            }).then(res => {
+                if (res.success) {
+                    this.serviceTypes = res.data;
 
-                this.serviceTypes.forEach(element => {
+                    this.serviceTypes.forEach(element => {
 
-                    this.serviceTypeDetails[element.id] = element.serviceTypeDetailList
+                        this.serviceTypeDetails[element.id] = element.serviceTypeDetailList
+
+                    });
+                }
+            });
 
-                });
-            }
-        });
-
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 20,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '用户ID',
-                    value: 'userId',
-                    show: true
-                },
-                {
-                    label: '用户',
-                    value: 'userName',
-                    show: true
-                },
-                {
-                    label: '店铺名称',
-                    value: 'storeName',
-                    show: true
-                },
-                {
-                    label: '服务类型',
-                    value: 'serviceType',
-                    show: true
-                },
-                {
-                    label: '描述',
-                    value: 'description',
-                    show: true
-                },
-                {
-                    label: '头像',
-                    value: 'icon',
-                    show: true
-                },
-                {
-                    label: '省',
-                    value: 'province',
-                    show: true
-                },
-                {
-                    label: '市',
-                    value: 'citye',
-                    show: true
-                },
-                {
-                    label: '区',
-                    value: 'district',
-                    show: true
-                },
-                {
-                    label: '详细地址',
-                    value: 'addressDetail',
-                    show: true
-                },
-                {
-                    label: '银行卡号',
-                    value: 'bankCard',
-                    show: true
-                },
-                {
-                    label: '开户行',
-                    value: 'bankName',
-                    show: true
-                },
-                {
-                    label: '开户人',
-                    value: 'openName',
-                    show: true
-                },
-                {
-                    label: '信誉等级',
-                    value: 'credit',
-                    show: true
-                },
-                {
-                    label: '可用',
-                    value: 'useFlag',
-                    show: true
-                },
-                {
-                    label: '排序',
-                    value: 'rank',
-                    show: true
-                },
-                {
-                    label: '响应时间',
-                    value: 'responseTime',
-                    show: true
-                },
-                {
-                    label: '返片率',
-                    value: 'reworkRate',
-                    show: true
-                },
-                {
-                    label: '热门',
-                    value: 'hotFlag',
-                    show: true
-                },
-                {
-                    label: '首页',
-                    value: 'homeFlag',
-                    show: true
-                },
-                {
-                    label: '类型',
-                    value: 'typeFlag',
-                    show: true
-                },
-                // {
-                //     label: '服务小类',
-                //     value: 'subclass',
-                //     show: true
-                // },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '用户ID',
-                    value: 'user_id'
-                },
-                {
-                    label: '用户',
-                    value: 'user_name'
-                },
-                {
-                    label: '店铺名称',
-                    value: 'store_name'
-                },
-                {
-                    label: '服务类型',
-                    value: 'service_type'
-                },
-                {
-                    label: '描述',
-                    value: 'description'
-                },
-                {
-                    label: '头像',
-                    value: 'icon'
-                },
-                {
-                    label: '省',
-                    value: 'province'
-                },
-                {
-                    label: '市',
-                    value: 'citye'
-                },
-                {
-                    label: '区',
-                    value: 'district'
-                },
-                {
-                    label: '详细地址',
-                    value: 'address_detail'
-                },
-                {
-                    label: '银行卡号',
-                    value: 'bank_card'
-                },
-                {
-                    label: '开户行',
-                    value: 'bank_name'
-                },
-                {
-                    label: '开户人',
-                    value: 'open_name'
-                },
-                {
-                    label: '信誉等级',
-                    value: 'credit'
-                },
-                {
-                    label: '可用',
-                    value: 'use_flag'
-                },
-                {
-                    label: '排序',
-                    value: 'rank'
-                },
-                {
-                    label: '响应时间',
-                    value: 'response_time'
-                },
-                {
-                    label: '返片率',
-                    value: 'rework_rate'
-                },
-                {
-                    label: '热门',
-                    value: 'hot_flag'
-                },
-                {
-                    label: '首页',
-                    value: 'home_flag'
-                },
-                {
-                    label: '类型',
-                    value: 'type_flag'
-                },
-                // {
-                //     label: '服务小类',
-                //     value: 'subclass'
-                // },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-            serviceTypes: [],
-            serviceTypeDetails: {},
-        }
-    },
-    computed: {
-        ...mapState(['tableHeight']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
             this.getData();
         },
-        getData() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                searchKey: this.filter1,
-                advancedQuery: this.advancedQuerySearchKey,
-                orderByStr: this.orderByStr,
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                    {
+                        label: '用户ID',
+                        value: 'userId',
+                        show: true
+                    },
+                    {
+                        label: '用户',
+                        value: 'userName',
+                        show: true
+                    },
+                    {
+                        label: '店铺名称',
+                        value: 'storeName',
+                        show: true
+                    },
+                    {
+                        label: '服务类型',
+                        value: 'serviceType',
+                        show: true
+                    },
+                    {
+                        label: '描述',
+                        value: 'description',
+                        show: true
+                    },
+                    {
+                        label: '头像',
+                        value: 'icon',
+                        show: true
+                    },
+                    {
+                        label: '省',
+                        value: 'province',
+                        show: true
+                    },
+                    {
+                        label: '市',
+                        value: 'citye',
+                        show: true
+                    },
+                    {
+                        label: '区',
+                        value: 'district',
+                        show: true
+                    },
+                    {
+                        label: '详细地址',
+                        value: 'addressDetail',
+                        show: true
+                    },
+                    {
+                        label: '银行卡号',
+                        value: 'bankCard',
+                        show: true
+                    },
+                    {
+                        label: '开户行',
+                        value: 'bankName',
+                        show: true
+                    },
+                    {
+                        label: '开户人',
+                        value: 'openName',
+                        show: true
+                    },
+                    {
+                        label: '信誉等级',
+                        value: 'credit',
+                        show: true
+                    },
+                    {
+                        label: '可用',
+                        value: 'useFlag',
+                        show: true
+                    },
+                    {
+                        label: '排序',
+                        value: 'rank',
+                        show: true
+                    },
+                    {
+                        label: '响应时间',
+                        value: 'responseTime',
+                        show: true
+                    },
+                    {
+                        label: '返片率',
+                        value: 'reworkRate',
+                        show: true
+                    },
+                    {
+                        label: '热门',
+                        value: 'hotFlag',
+                        show: true
+                    },
+                    {
+                        label: '首页',
+                        value: 'homeFlag',
+                        show: true
+                    },
+                    {
+                        label: '类型',
+                        value: 'typeFlag',
+                        show: true
+                    },
+                    // {
+                    //     label: '服务小类',
+                    //     value: 'subclass',
+                    //     show: true
+                    // },
+                ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                    {
+                        label: '用户ID',
+                        value: 'user_id'
+                    },
+                    {
+                        label: '用户',
+                        value: 'user_name'
+                    },
+                    {
+                        label: '店铺名称',
+                        value: 'store_name'
+                    },
+                    {
+                        label: '服务类型',
+                        value: 'service_type'
+                    },
+                    {
+                        label: '描述',
+                        value: 'description'
+                    },
+                    {
+                        label: '头像',
+                        value: 'icon'
+                    },
+                    {
+                        label: '省',
+                        value: 'province'
+                    },
+                    {
+                        label: '市',
+                        value: 'citye'
+                    },
+                    {
+                        label: '区',
+                        value: 'district'
+                    },
+                    {
+                        label: '详细地址',
+                        value: 'address_detail'
+                    },
+                    {
+                        label: '银行卡号',
+                        value: 'bank_card'
+                    },
+                    {
+                        label: '开户行',
+                        value: 'bank_name'
+                    },
+                    {
+                        label: '开户人',
+                        value: 'open_name'
+                    },
+                    {
+                        label: '信誉等级',
+                        value: 'credit'
+                    },
+                    {
+                        label: '可用',
+                        value: 'use_flag'
+                    },
+                    {
+                        label: '排序',
+                        value: 'rank'
+                    },
+                    {
+                        label: '响应时间',
+                        value: 'response_time'
+                    },
+                    {
+                        label: '返片率',
+                        value: 'rework_rate'
+                    },
+                    {
+                        label: '热门',
+                        value: 'hot_flag'
+                    },
+                    {
+                        label: '首页',
+                        value: 'home_flag'
+                    },
+                    {
+                        label: '类型',
+                        value: 'type_flag'
+                    },
+                    // {
+                    //     label: '服务小类',
+                    //     value: 'subclass'
+                    // },
+                ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+                serviceTypes: [],
+                serviceTypeDetails: {},
             }
-
-            if (this.$route.query.column) {
-                var tempColumn = this.$route.query.column;
-                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-            }
-
-            this.$http.get({
-                url: '/storeInfo/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
         },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
             }
         },
-        editRow(row) {
-            this.$router.push({
-                path: '/storeInfo',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
                 }
-            })
-        },
-        updateRow(row, useFlag) {
-            this.$http.post({
-                url: '/storeInfo/update',
-                data: {
-                    id: row.id,
-                    useFlag: useFlag
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
                 }
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('操作成功');
-                    this.getData()
+
+                this.$http.get({
+                    url: '/storeInfo/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
                 }
-            })
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
-        },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
-        },
-        advancedQuery() {
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/storeInfo',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            updateRow(row, useFlag) {
+                this.$http.post({
+                    url: '/storeInfo/update',
+                    data: {
+                        id: row.id,
+                        useFlag: useFlag
+                    }
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('操作成功');
+                        this.getData()
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
 
-            this.advancedQuerySearchKey = '';
+                this.advancedQuerySearchKey = '';
 
-            if (this.advancedQueryFields.length > 0) {
+                if (this.advancedQueryFields.length > 0) {
 
-                var templist = [];
+                    var templist = [];
 
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
-                    }
-                })
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
 
-                if (templist.length > 0) {
+                    if (templist.length > 0) {
 
-                    this.advancedQuerySearchKey = templist.join('_;');
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
                 }
-            }
 
-            this.getData();
-            this.showAdvancedQueryDialog = false;
-        },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
-        },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
-        },
-        tableSortQuery() {
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
 
-            this.orderByStr = '';
+                this.orderByStr = '';
 
-            if (this.tableSortFields.length > 0) {
+                if (this.tableSortFields.length > 0) {
 
-                var templist = [];
+                    var templist = [];
 
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
 
-                if (templist.length > 0) {
+                    if (templist.length > 0) {
 
-                    this.orderByStr = templist.join('_;');
+                        this.orderByStr = templist.join('_;');
+                    }
                 }
-            }
 
-            this.getData();
-            this.showTableSortDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/storeInfo/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/storeInfo/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
                 this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
-
-        },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
-
-        },
-        ServiceTypeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                var serviceType = '';
-                this.serviceTypes.forEach(item => {
-                    if (item.id == Number(cellValue)) {
-                        serviceType = item.shortName;
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/storeInfo/exportExcel?searchKey="
+                    + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/storeInfo/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
                     }
                 })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
 
-                return serviceType;
-            }
-
-        },
-
-        ServiceTypeDetailFormatter(row, column, cellValue) {
-            if (cellValue && row.serviceType) {
-                var serviceTypeDetail = '';
-                if (this.serviceTypeDetails[row.serviceType]) {
-                    this.serviceTypeDetails[row.serviceType].forEach(item => {
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
 
+            },
+            ServiceTypeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    var serviceType = '';
+                    this.serviceTypes.forEach(item => {
                         if (item.id == Number(cellValue)) {
-                            serviceTypeDetail = item.typeName;
+                            serviceType = item.shortName;
                         }
                     })
+
+                    return serviceType;
                 }
 
+            },
 
-                return serviceTypeDetail;
-            }
+            ServiceTypeDetailFormatter(row, column, cellValue) {
+                if (cellValue && row.serviceType) {
+                    var serviceTypeDetail = '';
+                    if (this.serviceTypeDetails[row.serviceType]) {
+                        this.serviceTypeDetails[row.serviceType].forEach(item => {
 
-        },
+                            if (item.id == Number(cellValue)) {
+                                serviceTypeDetail = item.typeName;
+                            }
+                        })
+                    }
 
-        YNFormatter(row, column, cellValue) {
-            return cellValue ? 'Y' : 'N';
 
-        },
-        TypeFlagFormatter(row, column, cellValue) {
-
-            var valueStr = '';
-            switch (cellValue) {
-                case 0:
-                    valueStr = '官方';
-                    break;
-                case 1:
-                    valueStr = '企业';
-                    break
-                case 2:
-                    valueStr = '个人';
-                    break
-            }
+                    return serviceTypeDetail;
+                }
 
-            return valueStr;
+            },
+
+            YNFormatter(row, column, cellValue) {
+                return cellValue ? 'Y' : 'N';
+
+            },
+            TypeFlagFormatter(row, column, cellValue) {
+
+                var valueStr = '';
+                switch (cellValue) {
+                    case 0:
+                        valueStr = '官方';
+                        break;
+                    case 1:
+                        valueStr = '企业';
+                        break
+                    case 2:
+                        valueStr = '个人';
+                        break
+                }
 
-        },
+                return valueStr;
 
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
-        },
+            },
+
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
 
+        }
     }
-}
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/User.vue

@@ -2,11 +2,11 @@
     <div>
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
-            <el-form-item prop="icon" label="头像">
-                <single-upload v-model="formData.icon"></single-upload>
-            </el-form-item>
             <el-form-item prop="username" label="用户名">
                 <el-input v-model="formData.username"></el-input>
+            </el-form-item>
+             <el-form-item prop="password" label="密码">
+                <el-input v-model="formData.password" type="password"></el-input>
             </el-form-item>
             <el-form-item prop="phone" label="手机">
                 <el-input v-model="formData.phone"></el-input>
@@ -21,26 +21,12 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item prop="departId" label="部门">
-                <el-cascader
-                    :options="departs"
-                    v-model="formData.departId">
-                </el-cascader>
-            </el-form-item>
-            <el-form-item prop="birthday" label="生日">
-                <el-date-picker
-                    v-model="formData.birthday"
-                    format="yyyy-MM-dd"
-                    value-format="timestamp">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item prop="createTime" label="创建时间">
-                <el-date-picker
-                    v-model="formData.createTime"
-                    type="datetime"
-                    format="yyyy-MM-dd HH:mm:ss"
-                    value-format="timestamp">
-                </el-date-picker>
+            <el-form-item prop="departId" label="营业厅">
+                <el-select v-model="formData.departId" filterable placeholder="请选择" size="small">
+                    <el-option v-for="item in stations" :key="item.id+''" :label="item.stationName" :value="item.id+''">
+                    </el-option>
+                </el-select>
+
             </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -50,118 +36,133 @@
     </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from "../formValidator";
 
-    export default {
-        created() {
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/userInfo/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        res.data.roleId = res.data.roleId ? res.data.roleId.split(',').map(i => Number(i)) : [];
-                        res.data.departId = res.data.departId ? res.data.departId.split(',') : [];
-                        this.formData = res.data;
-                    }
-                })
-            }
-            this.$http.get({
-                url: '/sysRole/all'
-            }).then(res => {
-                if (res.success) {
-                    this.roles = res.data;
-                }
+export default {
+  created() {
+    if (this.$route.query.id) {
+      this.$http
+        .get({
+          url: "/userInfo/getOne",
+          data: {
+            id: this.$route.query.id
+          }
+        })
+        .then(res => {
+          if (res.success) {
+            res.data.roleId = res.data.roleId? res.data.roleId.split(",").map(i => Number(i)): [];
+            this.formData = res.data;
+          }
+        });
+    }
+
+    this.$http
+      .get({
+        url: "/stationInfo/all"
+      })
+      .then(res => {
+        if (res.success) {
+          this.stations = res.data;
+        }
+      });
+
+    this.$http
+      .get({
+        url: "/sysRole/all"
+      })
+      .then(res => {
+        if (res.success) {
+          this.roles = res.data;
+        }
+      });
+    this.$http
+      .get({
+        url: "/departInfo/departTree"
+      })
+      .then(res => {
+        if (res.success) {
+          const parse = trees => {
+            trees.sort((a, b) => {
+              return a.extra.sort - b.extra.sort;
             });
-            this.$http.get({
-                url: '/departInfo/departTree'
-            }).then(res => {
-                if (res.success) {
-                    const parse = (trees) => {
-                        trees.sort((a, b) => {
-                            return a.extra.sort - b.extra.sort;
-                        });
-                        return trees.map(i => {
-                            let t = {
-                                value: i.id,
-                                label: i.name,
-                                parentId: i.parentId,
-                                extra: i.extra
-                            };
-                            if (i.children instanceof Array) {
-                                t.children = parse(i.children);
-                            }
-                            return t;
-                        });
-                    };
-                    this.departs = parse(res.data);
-                }
+            return trees.map(i => {
+              let t = {
+                value: i.id,
+                label: i.name,
+                parentId: i.parentId,
+                extra: i.extra
+              };
+              if (i.children instanceof Array) {
+                t.children = parse(i.children);
+              }
+              return t;
             });
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                    departId: []
-                },
-                rules: {
-                    icon: [
-                        {required: true, message: '请上传头像', trigger: 'blur'},
-                    ],
-                    username: [
-                        {required: true, message: '请输入昵称', trigger: 'blur'},
-                    ],
-                    phone: [
-                        {required: true, message: '请输入手机号', trigger: 'blur'},
-                        {
-                            validator: (rule, value, callback) => {
-                                if (!value) {
-                                    callback(new Error('请输入手机号'));
-                                } else if (/^1[3-9]\d{9}$/.test(value)) {
-                                    callback();
-                                } else {
-                                    callback(new Error('请输入正确的手机号'));
-                                }
-                            }, trigger: 'blur'
-                        }
-                    ],
-                    // roleId: [
-                    //     {required: true, message: '请选择角色', trigger: 'blur'},
-                    // ]
-                },
-                roles: [],
-                departs: [],
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
+          };
+          this.departs = parse(res.data);
+        }
+      });
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {
+      departId: []
+      },
+      stations: [],
+      rules: {
+        icon: [{ required: true, message: "请上传头像", trigger: "blur" }],
+        username: [{ required: true, message: "请输入昵称", trigger: "blur" }],
+        phone: [
+          { required: true, message: "请输入手机号", trigger: "blur" },
+          {
+            validator: (rule, value, callback) => {
+              if (!value) {
+                callback(new Error("请输入手机号"));
+              } else if (/^1[3-9]\d{9}$/.test(value)) {
+                callback();
+              } else {
+                callback(new Error("请输入正确的手机号"));
+              }
             },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/userInfo/update' : '/userInfo/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
+            trigger: "blur"
+          }
+        ]
+        // roleId: [
+        //     {required: true, message: '请选择角色', trigger: 'blur'},
+        // ]
+      },
+      roles: [],
+      departs: []
+    };
+  },
+  methods: {
+    onSave() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.submit();
+        } else {
+          return false;
         }
+      });
+    },
+    submit() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      this.$http
+        .post({
+          url: this.formData.id ? "/userInfo/update" : "/userInfo/save",
+          data: data
+        })
+        .then(res => {
+          if (res.success) {
+            this.$message.success("成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("失败");
+          }
+        });
     }
+  }
+};
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/Users.vue

@@ -2,16 +2,6 @@
     <div>
         <div class="filters-container">
             <el-input placeholder="用户名" size="small" v-model="filter1" clearable class="filter-item"></el-input>
-            <el-select placeholder="性别" size="small" v-model="filter2" clearable class="filter-item">
-                <el-option
-                    label="女"
-                    value="item1">
-                </el-option>
-                <el-option
-                    label="男"
-                    value="item2">
-                </el-option>
-            </el-select>
             <el-button @click="getData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
             <el-button @click="$router.push('/user')" type="primary" size="small" icon="el-icon-edit"
@@ -42,6 +32,12 @@
                 type="index"
                 min-width="50"
                 align="center">
+            </el-table-column>
+             <el-table-column
+                prop="departId"
+                label="营业厅"
+                :formatter="stationFormatter"
+                min-width="100">
             </el-table-column>
             <el-table-column
                 v-if="isColumnShow('username')"
@@ -49,31 +45,9 @@
                 label="用户名"
                 min-width="300">
             </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('nickname')"
-                prop="nickname"
-                label="昵称"
-                min-width="300">
-            </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('icon')"
-                label="头像"
-                min-width="300">
-                <template slot-scope="scope">
-                    <img :src="scope.row.icon"
-                         style="width: 32px;height: 32px;border-radius: 50%;vertical-align: middle;"/>
-                </template>
-            </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('sex')"
-                prop="sex"
-                label="性别"
-                min-width="300">
-            </el-table-column>
-            <el-table-column
-                v-if="isColumnShow('openId')"
-                prop="openId"
-                label="openId"
+             <el-table-column
+                prop="phone"
+                label="电话"
                 min-width="300">
             </el-table-column>
             <el-table-column
@@ -113,6 +87,14 @@
     export default {
         created() {
             this.getData();
+
+            this.$http.get({
+                url: '/stationInfo/all'
+            }).then(res => {
+                if (res.success) {
+                    this.stations = res.data;
+                }
+            });
         },
         data() {
             return {
@@ -120,6 +102,7 @@
                 totalPage: 0,
                 currentPage: 1,
                 pageSize: 20,
+                stations: [],
                 tableData: [],
                 filter1: '',
                 filter2: '',
@@ -200,6 +183,18 @@
                     message: this.selection
                 });
             },
+            stationFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    var departId = '';
+                    this.stations.forEach(item => {
+                        if (item.id == Number(cellValue)) {
+                            departId = item.stationName;
+                        }
+                    })
+
+                    return departId;
+                }
+            },
             operation2() {
                 this.$message('操作2');
             }

src/main/vue/src/router/index.js

@@ -548,65 +548,65 @@ const router = new Router({
                 {
                     path: '/userOrders',
                     name: 'UserOrders',
-                    component: () => import('../pages/UserOrders')
-                },
-                {
-                    path: '/storeLabel',
-                    name: 'StoreLabel',
-                    component: () => import('../pages/StoreLabel')
-                },
-                {
-                    path: '/storeLabels',
-                    name: 'StoreLabels',
-                    component: () => import('../pages/StoreLabels')
-                },
-                {
-                    path: '/alipayTemp',
-                    name: 'AlipayTemp',
-                    component: () => import('../pages/AlipayTemp')
-                },
-                {
-                    path: '/alipayTemps',
-                    name: 'AlipayTemps',
-                    component: () => import('../pages/AlipayTemps')
-                },
-                {
-                    path: '/wxpayTemp',
-                    name: 'WxpayTemp',
-                    component: () => import('../pages/WxpayTemp')
-                },
-                {
-                    path: '/wxpayTemps',
-                    name: 'WxpayTemps',
-                    component: () => import('../pages/WxpayTemps')
-                },
-                {
-                    path: '/companyType',
-                    name: 'CompanyType',
-                    component: () => import('../pages/CompanyType')
-                },
-                {
-                    path: '/companyTypes',
-                    name: 'CompanyTypes',
-                    component: () => import('../pages/CompanyTypes')
-                },
-                {
-                    path: '/logisticsInfo',
-                    name: 'LogisticsInfo',
-                    component: () => import('../pages/LogisticsInfo')
-                },
-                {
-                    path: '/logisticsInfos',
-                    name: 'LogisticsInfos',
-                    component: () => import('../pages/LogisticsInfos')
-                },
-                {
-                    path: '/imageUploadLog',
-                    name: 'ImageUploadLog',
-                    component: () => import('../pages/ImageUploadLog')
-                },
-                {
-                    path: '/imageUploadLogs',
+
+                    path: '/imacomponent: () => import(\'../pages/UserOrders\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/storeLabel\',\n' +
+                    '                    name: \'StoreLabel\',\n' +
+                    '                    component: () => import(\'../pages/StoreLabel\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/storeLabels\',\n' +
+                    '                    name: \'StoreLabels\',\n' +
+                    '                    component: () => import(\'../pages/StoreLabels\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/alipayTemp\',\n' +
+                    '                    name: \'AlipayTemp\',\n' +
+                    '                    component: () => import(\'../pages/AlipayTemp\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/alipayTemps\',\n' +
+                    '                    name: \'AlipayTemps\',\n' +
+                    '                    component: () => import(\'../pages/AlipayTemps\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/wxpayTemp\',\n' +
+                    '                    name: \'WxpayTemp\',\n' +
+                    '                    component: () => import(\'../pages/WxpayTemp\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/wxpayTemps\',\n' +
+                    '                    name: \'WxpayTemps\',\n' +
+                    '                    component: () => import(\'../pages/WxpayTemps\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/companyType\',\n' +
+                    '                    name: \'CompanyType\',\n' +
+                    '                    component: () => import(\'../pages/CompanyType\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/companyTypes\',\n' +
+                    '                    name: \'CompanyTypes\',\n' +
+                    '                    component: () => import(\'../pages/CompanyTypes\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/logisticsInfo\',\n' +
+                    '                    name: \'LogisticsInfo\',\n' +
+                    '                    component: () => import(\'../pages/LogisticsInfo\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/logisticsInfos\',\n' +
+                    '                    name: \'LogisticsInfos\',\n' +
+                    '                    component: () => import(\'../pages/LogisticsInfos\')\n' +
+                    '                },\n' +
+                    '                {\n' +
+                    '                    path: \'/imageUploadLog\',\n' +
+                    '                    name: \'ImageUploadLog\',\n' +
+                    '                    component: () => import(\'../pages/ImageUploadLog\')\n' +
+                    '                },\n' +
+                    '                {geUploadLogs',
                     name: 'ImageUploadLogs',
                     component: () => import('../pages/ImageUploadLogs')
                 },
@@ -649,6 +649,146 @@ const router = new Router({
                     path: '/companyInfoDetails',
                     name: 'CompanyInfoDetails',
                     component: () => import('../pages/CompanyInfoDetails')
+                },
+                {
+                    path: '/stationInfo',
+                    name: 'StationInfo',
+                    component: () => import('../pages/StationInfo')
+                },
+                {
+                    path: '/stationInfos',
+                    name: 'StationInfos',
+                    component: () => import('../pages/StationInfos')
+                },
+                {
+                    path: '/bannerInfo',
+                    name: 'BannerInfo',
+                    component: () => import('../pages/BannerInfo')
+                },
+                {
+                    path: '/bannerInfos',
+                    name: 'BannerInfos',
+                    component: () => import('../pages/BannerInfos')
+                },
+                {
+                    path: '/menuInfo',
+                    name: 'MenuInfo',
+                    component: () => import('../pages/MenuInfo')
+                },
+                {
+                    path: '/menuInfos',
+                    name: 'MenuInfos',
+                    component: () => import('../pages/MenuInfos')
+                },
+                {
+                    path: '/financialData',
+                    name: 'FinancialData',
+                    component: () => import('../pages/FinancialData')
+                },
+                {
+                    path: '/financialDatas',
+                    name: 'FinancialDatas',
+                    component: () => import('../pages/FinancialDatas')
+                },
+                {
+                    path: '/pinpaijuzhen',
+                    name: 'Pinpaijuzhen',
+                    component: () => import('../pages/Pinpaijuzhen')
+                },
+                {
+                    path: '/pinpaijuzhens',
+                    name: 'Pinpaijuzhens',
+                    component: () => import('../pages/Pinpaijuzhens')
+                },
+                {
+                    path: '/pinpaimenmian',
+                    name: 'Pinpaimenmian',
+                    component: () => import('../pages/Pinpaimenmian')
+                },
+                {
+                    path: '/pinpaimenmians',
+                    name: 'Pinpaimenmians',
+                    component: () => import('../pages/Pinpaimenmians')
+                },
+                {
+                    path: '/equipmentInfo',
+                    name: 'EquipmentInfo',
+                    component: () => import('../pages/EquipmentInfo')
+                },
+                {
+                    path: '/equipmentInfos',
+                    name: 'EquipmentInfos',
+                    component: () => import('../pages/EquipmentInfos')
+                },
+                {
+                    path: '/clickHistory',
+                    name: 'ClickHistory',
+                    component: () => import('../pages/ClickHistory')
+                },
+                {
+                    path: '/clickHistorys',
+                    name: 'ClickHistorys',
+                    component: () => import('../pages/ClickHistorys')
+                },
+                {
+                    path: '/playInfo',
+                    name: 'PlayInfo',
+                    component: () => import('../pages/PlayInfo')
+                },
+                {
+                    path: '/playInfos',
+                    name: 'PlayInfos',
+                    component: () => import('../pages/PlayInfos')
+                },
+                {
+                    path: '/imgInfo',
+                    name: 'ImgInfo',
+                    component: () => import('../pages/ImgInfo')
+                },
+                {
+                    path: '/imgInfos',
+                    name: 'ImgInfos',
+                    component: () => import('../pages/ImgInfos')
+                },
+                {
+                    path: '/subItem',
+                    name: 'SubItem',
+                    component: () => import('../pages/SubItem')
+                },
+                {
+                    path: '/subItems',
+                    name: 'SubItems',
+                    component: () => import('../pages/SubItems')
+                },
+                {
+                    path: '/memberInfo',
+                    name: 'MemberInfo',
+                    component: () => import('../pages/MemberInfo')
+                },
+                {
+                    path: '/memberInfos',
+                    name: 'MemberInfos',
+                    component: () => import('../pages/MemberInfos')
+                },
+                {
+                    path: '/exhibitionContent',
+                    name: 'ExhibitionContent',
+                    component: () => import('../pages/ExhibitionContent')
+                },
+                {
+                    path: '/exhibitionContents',
+                    name: 'ExhibitionContents',
+                    component: () => import('../pages/ExhibitionContents')
+                },
+                {
+                    path: '/fileInfo',
+                    name: 'FileInfo',
+                    component: () => import('../pages/FileInfo')
+                },
+                {
+                    path: '/fileInfos',
+                    name: 'FileInfos',
+                    component: () => import('../pages/FileInfos')
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f6d1776f7d7de20783ea.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.ec298cb679344c0b7b7b.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d657bab663e639026bc.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.14c4398f2fac4a790ab9.js></script></body></html>

src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.e3592871ba27bb87430f70b5187df37a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f6d1776f7d7de20783ea.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.6d69922289be9d8484c8.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.2ed282ab01a38b8227b781a50aa24445.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d657bab663e639026bc.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.d5f3af517363483af368.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f6d1776f7d7de20783ea.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d657bab663e639026bc.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>