123123

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

@@ -12,6 +12,7 @@
         <result column="post" property="post" jdbcType="VARCHAR"/>
         <result column="certificateNum" property="certificatenum" jdbcType="VARCHAR"/>
         <result column="qualification" property="qualification" jdbcType="VARCHAR"/>
+        <result column="station_id" property="stationId" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         <trim suffixOverrides=",">
@@ -35,6 +36,8 @@
 
             qualification,
 
+            station_id,
+
         </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -81,6 +84,9 @@
             <if test="qualification!= null">
                 qualification,
             </if>
+            <if test="stationId!= null">
+                station_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -113,6 +119,9 @@
             <if test="qualification != null">
                 #{qualification,jdbcType=VARCHAR},
             </if>
+            <if test="stationId != null">
+                #{stationId,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.MemberInfo">
@@ -148,6 +157,9 @@
             <if test="qualification != null">
                 qualification= #{qualification,jdbcType=VARCHAR},
             </if>
+            <if test="stationId != null">
+                station_id= #{stationId,jdbcType=INTEGER},
+            </if>
         </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
@@ -198,6 +210,9 @@
             <if test="record.qualification != null and !&quot;&quot;.equals(record.qualification)">
                 and qualification = #{record.qualification}
             </if>
+            <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 name LIKE concat('%',#{record.searchKey},'%')
@@ -298,6 +313,9 @@
             <if test="qualification != null and !&quot;&quot;.equals(qualification)">
                 and qualification = #{qualification}
             </if>
+            <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 name LIKE concat('%',#{searchKey},'%')
@@ -394,6 +412,9 @@
             <if test="qualification != null and !&quot;&quot;.equals(qualification)">
                 and qualification = #{qualification}
             </if>
+            <if test="stationId != null and !&quot;&quot;.equals(stationId)">
+                and station_id = #{stationId}
+            </if>
 
         </where>
         LIMIT 1

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,9 @@ public class BannerInfoController {
     @Autowired
     private BannerInfoService bannerInfoService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -65,6 +73,14 @@ public class BannerInfoController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, BannerInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<BannerInfo> pp =bannerInfoService.getBannerInfoByPage(page, record);
@@ -81,8 +97,22 @@ public class BannerInfoController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(BannerInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = bannerInfoService.createBannerInfo(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加公示投教banner: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,9 +124,17 @@ public class BannerInfoController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateBannerInfo(BannerInfo record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = bannerInfoService.updateBannerInfo(record);
         if (num) {
-        return new Result(true, "保存成功");
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新公示投教banner: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }

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

@@ -2,9 +2,12 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +37,14 @@ public class ClickHistoryController {
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(ClickHistory record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         List<ClickHistory> pp = clickHistoryService.getClickHistoryList(record);
         return new Result(true, pp);
     }
@@ -65,6 +76,14 @@ public class ClickHistoryController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, ClickHistory record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<ClickHistory> pp =clickHistoryService.getClickHistoryByPage(page, record);
@@ -81,6 +100,14 @@ public class ClickHistoryController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(ClickHistory record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = clickHistoryService.createClickHistory(record);
         if (num) {
         return new Result(true, record.getId());

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

@@ -6,7 +6,9 @@ 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.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -86,7 +88,33 @@ public class DataController {
     @RequiresAuthentication
     @RequestMapping(value = "/gongshitoujiao", method = RequestMethod.GET)
     @ResponseBody
-    public GongShiTouJiao getGongShiTouJiao(FindPara findPara) {
+    public Object getGongShiTouJiao(FindPara findPara) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        int userStationId;
+        if(userInfo != null)
+        {
+            userStationId = Integer.parseInt(userInfo.getDepartId());
+
+            if(userStationId == 2)
+            {
+                findPara.setStationId(null);
+            }
+            else {
+                if(findPara.getStationId() == null)
+                {
+                    findPara.setStationId(userStationId);
+                }
+                else if(findPara.getStationId() != userStationId)
+                {
+                        return "营业厅ID与账号不符";
+                }
+            }
+        }else {
+            return "请先登录";
+        }
+
         GongShiTouJiao gs = new GongShiTouJiao();
         ExhibitionContent ec = new ExhibitionContent();
         ec.setStationId(findPara.getStationId());
@@ -134,7 +162,32 @@ public class DataController {
     @RequiresAuthentication
     @RequestMapping(value = "/financialData", method = RequestMethod.GET)
     @ResponseBody
-    public FinancialData getFinancialData(FindPara findPara) {
+    public Object getFinancialData(FindPara findPara) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        int userStationId;
+        if(userInfo != null)
+        {
+            userStationId = Integer.parseInt(userInfo.getDepartId());
+            if(findPara.getStationId() != userStationId)
+            {
+                return "营业厅ID与账号不符";
+            }
+
+            if(findPara.getStationId() == null)
+            {
+                findPara.setStationId(userStationId);
+
+                if(findPara.getStationId() == 2)
+                {
+                    findPara.setStationId(null);
+                }
+            }
+        }else {
+            return "请先登录";
+        }
+
         ExhibitionContent ec = new ExhibitionContent();
         ec.setStationId(findPara.getStationId());
         ec.setId(findPara.getExhibitionId());
@@ -154,7 +207,32 @@ public class DataController {
     @RequiresAuthentication
     @RequestMapping(value = "/pinpaijuzhen", method = RequestMethod.GET)
     @ResponseBody
-    public Pinpaijuzhen getPinpaijuzhen(FindPara findPara) {
+    public Object getPinpaijuzhen(FindPara findPara) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        int userStationId;
+        if(userInfo != null)
+        {
+            userStationId = Integer.parseInt(userInfo.getDepartId());
+            if(findPara.getStationId() != userStationId)
+            {
+                return "营业厅ID与账号不符";
+            }
+
+            if(findPara.getStationId() == null)
+            {
+                findPara.setStationId(userStationId);
+
+                if(findPara.getStationId() == 2)
+                {
+                    findPara.setStationId(null);
+                }
+            }
+        }else {
+            return "请先登录";
+        }
+
         ExhibitionContent ec = new ExhibitionContent();
         ec.setStationId(findPara.getStationId());
         ec.setId(findPara.getExhibitionId());
@@ -180,7 +258,33 @@ public class DataController {
     @RequiresAuthentication
     @RequestMapping(value = "/pinpaimenmian", method = RequestMethod.GET)
     @ResponseBody
-    public Pinpaimenmian getPinpaimenmian(FindPara findPara) {
+    public Object getPinpaimenmian(FindPara findPara) {
+
+            Subject subject = SecurityUtils.getSubject();
+            UserInfo userInfo = (UserInfo) subject.getPrincipal();
+            int userStationId;
+            if(userInfo != null)
+            {
+                userStationId = Integer.parseInt(userInfo.getDepartId());
+
+                if(userStationId == 2)
+                {
+                    findPara.setStationId(null);
+                }
+                else {
+                    if(findPara.getStationId() == null)
+                    {
+                        findPara.setStationId(userStationId);
+                    }
+                    else if(findPara.getStationId() != userStationId)
+                    {
+                        return "营业厅ID与账号不符";
+                    }
+                }
+            }else {
+                return "请先登录";
+            }
+
         ExhibitionContent ec = new ExhibitionContent();
         ec.setStationId(findPara.getStationId());
         ec.setId(findPara.getExhibitionId());
@@ -207,7 +311,32 @@ public class DataController {
      */
     @RequestMapping(value = "/editStatus", method = RequestMethod.POST)
     @ResponseBody
-    public Result editStatus(EquipmentInfo equipmentInfo) {
+    public Object editStatus(EquipmentInfo equipmentInfo) {
+
+            Subject subject = SecurityUtils.getSubject();
+            UserInfo userInfo = (UserInfo) subject.getPrincipal();
+            int userStationId;
+            if(userInfo != null)
+            {
+                userStationId = Integer.parseInt(userInfo.getDepartId());
+
+                if(userStationId == 2)
+                {
+                }
+                else {
+                    if(equipmentInfo.getStationId() == null)
+                    {
+                        equipmentInfo.setStationId(userStationId);
+                    }
+                    else if(equipmentInfo.getStationId() != userStationId)
+                    {
+                        return "营业厅ID与账号不符";
+                    }
+                }
+            }else {
+                return "请先登录";
+            }
+
         EquipmentInfo ei = new EquipmentInfo();
         ei.setStationId(equipmentInfo.getStationId());
         ei.setExhibitionId(equipmentInfo.getExhibitionId());
@@ -227,7 +356,32 @@ public class DataController {
      */
     @RequestMapping(value = "/addClickHistory", method = RequestMethod.POST)
     @ResponseBody
-    public Result addClickHistory(ClickHistory clickHistory) {
+    public Object addClickHistory(ClickHistory clickHistory) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        int userStationId;
+        if(userInfo != null)
+        {
+            userStationId = Integer.parseInt(userInfo.getDepartId());
+
+            if(userStationId == 2)
+            {
+            }
+            else {
+                if(clickHistory.getStationId() == null)
+                {
+                    clickHistory.setStationId(userStationId);
+                }
+                else if(clickHistory.getStationId() != userStationId)
+                {
+                    return "营业厅ID与账号不符";
+                }
+            }
+        }else {
+            return "请先登录";
+        }
+
         if(clickHistoryService.createClickHistory(clickHistory))
         {
             return new Result(true, clickHistory);

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,9 @@ public class EquipmentInfoController {
     @Autowired
     private EquipmentInfoService equipmentInfoService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -34,6 +42,14 @@ public class EquipmentInfoController {
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(EquipmentInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         List<EquipmentInfo> pp = equipmentInfoService.getEquipmentInfoList(record);
         return new Result(true, pp);
     }
@@ -65,6 +81,14 @@ public class EquipmentInfoController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, EquipmentInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<EquipmentInfo> pp =equipmentInfoService.getEquipmentInfoByPage(page, record);
@@ -81,8 +105,21 @@ public class EquipmentInfoController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(EquipmentInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = equipmentInfoService.createEquipmentInfo(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加设备: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,8 +131,15 @@ public class EquipmentInfoController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateEquipmentInfo(EquipmentInfo record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = equipmentInfoService.updateEquipmentInfo(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加设备: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
@@ -108,6 +152,8 @@ public class EquipmentInfoController {
     @ResponseBody
     public Result deleteEquipmentInfo(EquipmentInfo record) {
 
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = equipmentInfoService.deleteEquipmentInfo(record);
         if (num) {
         return new Result(true, "删除成功");

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,9 @@ public class ExhibitionContentController {
     @Autowired
     private ExhibitionContentService exhibitionContentService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -34,6 +42,14 @@ public class ExhibitionContentController {
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(ExhibitionContent record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         List<ExhibitionContent> pp = exhibitionContentService.getExhibitionContentList(record);
         return new Result(true, pp);
     }
@@ -65,6 +81,14 @@ public class ExhibitionContentController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, ExhibitionContent record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<ExhibitionContent> pp =exhibitionContentService.getExhibitionContentByPage(page, record);
@@ -81,8 +105,22 @@ public class ExhibitionContentController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(ExhibitionContent record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = exhibitionContentService.createExhibitionContent(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加展项: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,8 +132,17 @@ public class ExhibitionContentController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateExhibitionContent(ExhibitionContent record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = exhibitionContentService.updateExhibitionContent(record);
         if (num) {
+
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新展项: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
         return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,10 @@ public class FinancialDataController {
     @Autowired
     private FinancialDataService financialDataService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -65,6 +74,14 @@ public class FinancialDataController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, FinancialData record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<FinancialData> pp =financialDataService.getFinancialDataByPage(page, record);
@@ -81,8 +98,22 @@ public class FinancialDataController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(FinancialData record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = financialDataService.createFinancialData(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加金融大数据: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,9 +125,18 @@ public class FinancialDataController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateFinancialData(FinancialData record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = financialDataService.updateFinancialData(record);
         if (num) {
-        return new Result(true, "保存成功");
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新金融大数据: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }

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

@@ -3,10 +3,15 @@ package com.izouma.awesomeadmin.web;
 import java.util.*;
 
 import com.izouma.awesomeadmin.model.ImgInfo;
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.ImgInfoService;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +37,9 @@ public class MemberInfoController {
     @Autowired
     private ImgInfoService imgInfoService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
 
     /**
     * <p>获取全部记录。</p>
@@ -71,6 +79,14 @@ public class MemberInfoController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, MemberInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<MemberInfo> pp =memberInfoService.getMemberInfoByPage(page, record);
@@ -87,9 +103,23 @@ public class MemberInfoController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(MemberInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = memberInfoService.createMemberInfo(record);
         if (num) {
 
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加公示投教员工: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
             ImgInfo img = new ImgInfo();
             img.setFatherId(record.getId());
             img.setType(3);
@@ -107,9 +137,18 @@ public class MemberInfoController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMemberInfo(MemberInfo record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+
         boolean num = memberInfoService.updateMemberInfo(record);
         if (num) {
 
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新公示投教员工: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
             ImgInfo img = new ImgInfo();
             img.setFatherId(record.getId());
             img.setType(3);

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

@@ -3,10 +3,15 @@ package com.izouma.awesomeadmin.web;
 import java.util.*;
 
 import com.izouma.awesomeadmin.model.ImgInfo;
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.ImgInfoService;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +37,9 @@ public class MenuInfoController {
     @Autowired
     private ImgInfoService imgInfoService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -70,6 +78,14 @@ public class MenuInfoController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, MenuInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationInfo(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<MenuInfo> pp =menuInfoService.getMenuInfoByPage(page, record);
@@ -86,9 +102,23 @@ public class MenuInfoController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(MenuInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationInfo(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = menuInfoService.createMenuInfo(record);
         if (num) {
 
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加公示投教栏目: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
             ImgInfo img = new ImgInfo();
             img.setFatherId(record.getId());
             img.setType(0);
@@ -105,9 +135,18 @@ public class MenuInfoController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMenuInfo(MenuInfo record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+
         boolean num = menuInfoService.updateMenuInfo(record);
         if (num) {
 
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新公示投教栏目: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
             ImgInfo img = new ImgInfo();
             img.setFatherId(record.getId());
             img.setType(0);

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,9 @@ public class PinpaijuzhenController {
     @Autowired
     private PinpaijuzhenService pinpaijuzhenService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -65,6 +73,14 @@ public class PinpaijuzhenController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, Pinpaijuzhen record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<Pinpaijuzhen> pp =pinpaijuzhenService.getPinpaijuzhenByPage(page, record);
@@ -81,8 +97,21 @@ public class PinpaijuzhenController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(Pinpaijuzhen record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = pinpaijuzhenService.createPinpaijuzhen(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加品牌矩阵: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,8 +123,15 @@ public class PinpaijuzhenController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updatePinpaijuzhen(Pinpaijuzhen record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = pinpaijuzhenService.updatePinpaijuzhen(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新品牌矩阵: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,9 @@ public class PinpaimenmianController {
     @Autowired
     private PinpaimenmianService pinpaimenmianService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
     * <p>获取全部记录。</p>
     */
@@ -65,6 +73,14 @@ public class PinpaimenmianController {
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, Pinpaimenmian record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         Map<String, Object> result = new HashMap<>();
 
         List<Pinpaimenmian> pp =pinpaimenmianService.getPinpaimenmianByPage(page, record);
@@ -81,8 +97,22 @@ public class PinpaimenmianController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(Pinpaimenmian record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+        if(!"2".equals(userInfo.getDepartId()))
+        {
+            record.setStationId(Integer.parseInt(userInfo.getDepartId()));
+        }
+
         boolean num = pinpaimenmianService.createPinpaimenmian(record);
         if (num) {
+
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加品牌门面: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,8 +124,16 @@ public class PinpaimenmianController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updatePinpaimenmian(Pinpaimenmian record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+
         boolean num = pinpaimenmianService.updatePinpaimenmian(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新品牌门面: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");

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

@@ -2,9 +2,14 @@ package com.izouma.awesomeadmin.web;
 
 import java.util.*;
 
+import com.izouma.awesomeadmin.model.OperateHistory;
+import com.izouma.awesomeadmin.model.UserInfo;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,8 @@ public class StationInfoController {
     @Autowired
     private StationInfoService stationInfoService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
     /**
     * <p>获取全部记录。</p>
     */
@@ -81,8 +88,18 @@ public class StationInfoController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(StationInfo record) {
+
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = stationInfoService.createStationInfo(record);
         if (num) {
+
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加营业厅: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
         return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -94,8 +111,15 @@ public class StationInfoController {
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateStationInfo(StationInfo record) {
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = stationInfoService.updateStationInfo(record);
         if (num) {
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新营业厅: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
         return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");

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

@@ -3,8 +3,10 @@ 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.OperateHistory;
 import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.DepartInfoService;
+import com.izouma.awesomeadmin.service.OperateHistoryService;
 import com.izouma.awesomeadmin.service.UserInfoService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
 import org.apache.commons.lang.StringUtils;
@@ -36,6 +38,9 @@ public class UserInfoController {
     @Autowired
     private UserInfoService userInfoService;
 
+    @Autowired
+    private OperateHistoryService operateHistoryService;
+
     /**
      * <p>获取全部记录。</p>
      */
@@ -44,6 +49,7 @@ public class UserInfoController {
     @ResponseBody
     public Result all(UserInfo record) {
 
+
         List<UserInfo> pp = userInfoService.getUserInfoList(record);
         return new Result(true, pp);
     }
@@ -97,6 +103,7 @@ public class UserInfoController {
     @ResponseBody
     public Result page(Page page, UserInfo record) {
 
+
         Map<String, Object> result = new HashMap<>();
 
         List<UserInfo> pp = userInfoService.getUserInfoByPage(page, record);
@@ -114,8 +121,17 @@ public class UserInfoController {
     @ResponseBody
     public Result save(UserInfo record) {
 
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
         boolean num = userInfoService.createUserInfo(record);
         if (num) {
+
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("添加用户: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
             return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
@@ -129,8 +145,18 @@ public class UserInfoController {
     @ResponseBody
     public Result updateUserInfo(UserInfo record) {
 
+        Subject subject = SecurityUtils.getSubject();
+        UserInfo userInfo = (UserInfo) subject.getPrincipal();
+
         boolean num = userInfoService.updateUserInfo(record);
         if (num) {
+
+            OperateHistory oh = new OperateHistory();
+            oh.setUsername(userInfo.getUsername());
+            oh.setStationId(Integer.parseInt(userInfo.getDepartId()));
+            oh.setContent("更新用户: id="+record.getId());
+            operateHistoryService.createOperateHistory(oh);
+
             return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");

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

@@ -2,16 +2,17 @@
     <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="url" label="图片链接">
-                <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
+             <el-form-item prop="url" label="图片">
+                <single-upload v-model="formData.url" :disabled="'imgUrl'==subColumn"></single-upload>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="uploadTime" label="更新时间">
-                <el-input v-model="formData.uploadTime" :disabled="'uploadTime'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="stationId" label="营业点id">
-                <el-input v-model="formData.stationId" :disabled="'stationId'==subColumn"></el-input>
+              <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
+                <el-select v-model="formData.stationId" 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-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>
@@ -21,7 +22,7 @@
 </template>
 <script>
     import formValidator from '../formValidator'
-
+    import { mapState } from "vuex";
     export default {
         created() {
             if (this.$route.query.column) {
@@ -29,6 +30,16 @@
                 this.subValue = this.$route.query.column.split(',')[0];
             }
 
+            this.$http
+            .get({
+                url: "/stationInfo/all"
+            })
+            .then(res => {
+                if (res.success) {
+                this.stations = res.data;
+                }
+            });
+
             if (this.$route.query.id) {
                 this.$http.get({
                     url: '/bannerInfo/getOne',
@@ -38,30 +49,33 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+
                         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: {
-                                                                                                                                                                                                                                                                                },
-                                                                                    subColumn: '',
-            subValue: '',
-        }
+                      stations: [],
+                rules: {},
+                subColumn: '',
+                subValue: '',
+            }
+        },
+         computed: {
+            ...mapState(["userInfo"]),
         },
         methods: {
             onSave() {
@@ -88,10 +102,10 @@
                 });
             },
             onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
                     return this.$http.post({
-                    url: '/bannerInfo/del',
-                    data: { id: this.formData.id }
+                        url: '/bannerInfo/del',
+                        data: {id: this.formData.id}
                     })
                 }).then(() => {
                     this.$message.success('删除成功');

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

@@ -57,11 +57,10 @@
                 :formatter="DateTimeFormatter"
                 min-width="100">
             </el-table-column>
-
             <el-table-column
-                v-if="isColumnShow('stationId')"
                 prop="stationId"
-                label="营业点id"
+                label="营业厅"
+                :formatter="stationFormatter"
                 min-width="100">
             </el-table-column>
             <el-table-column
@@ -195,10 +194,21 @@
     export default {
         created() {
             this.getData();
+
+            this.$http
+            .get({
+                url: "/stationInfo/all"
+            })
+            .then(res => {
+                if (res.success) {
+                this.stations = res.data;
+                }
+            });
         },
         data() {
             return {
                 totalNumber: 0,
+                stations: [],
                 totalPage: 10,
                 currentPage: 1,
                 pageSize: 20,
@@ -431,6 +441,18 @@
                     return format(cellValue, 'YYYY/MM/DD', {locale: zh})
                 }
 
+            },
+            stationFormatter(row, column, cellValue) {
+            if (cellValue) {
+                var stationId = "";
+                this.stations.forEach(item => {
+                if (item.id == Number(cellValue)) {
+                    stationId = item.stationName;
+                }
+                });
+
+                return stationId;
+            }
             },
             showImg(img) {
                 this.imgSrc = img;

src/main/vue/src/pages/ClickHistorys.vue

@@ -43,20 +43,21 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('stationId')"
-                                prop="stationId"
-                                label="营业厅ID"
-                                min-width="100">
-                        </el-table-column>
+            <el-table-column
+                v-if="isColumnShow('stationId')"
+                prop="stationId"
+                label="营业厅"
+                :formatter="stationFormatter"
+                min-width="100">
+            </el-table-column>
+            <el-table-column
+                v-if="isColumnShow('exhibitionId')"
+                prop="exhibitionId"
+                label="展项"
+                :formatter="exhibitionFormatter"
+                min-width="100">
+            </el-table-column>
                                                                 
-                                            <el-table-column
-                                v-if="isColumnShow('exhibitionId')"
-                                prop="exhibitionId"
-                                label="展项ID"
-                                min-width="100">
-                        </el-table-column>
                                                                 
                                             <el-table-column
                                 v-if="isColumnShow('clickedId')"
@@ -188,252 +189,293 @@
     </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();
+
+     this.$http.get({
+                url: '/stationInfo/all'
+            }).then(res => {
+                if (res.success) {
+                    this.stations = res.data;
+                }
+            });
+  },
+  data() {
+    return {
+      totalNumber: 0,
+      totalPage: 10,
+      currentPage: 1,
+      pageSize: 20,
+      tableData: [],
+            stations: [],
+        exhibitions:[],
+      filter1: "",
+      filter2: "",
+      tableColumns: [
+        {
+          label: "营业厅ID",
+          value: "stationId",
+          show: true
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '营业厅ID',
-                                value: 'stationId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '展项ID',
-                                value: 'exhibitionId',
-                                show: true
-                            },
-                                                                                                {
-                                label: '被点击栏目的ID',
-                                value: 'clickedId',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '营业厅ID',
-                                value: 'station_id'
-                            },
-                                                                                                {
-                                label: '展项ID',
-                                value: 'exhibition_id'
-                            },
-                                                                                                {
-                                label: '被点击栏目的ID',
-                                value: 'clicked_id'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        {
+          label: "展项ID",
+          value: "exhibitionId",
+          show: true
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
-            }
+        {
+          label: "被点击栏目的ID",
+          value: "clickedId",
+          show: true
+        }
+      ],
+      multipleMode: false,
+      showAdvancedQueryDialog: false,
+      advancedQueryFields: [],
+      showTableSortDialog: false,
+      tableSortFields: [],
+      searchMethods: ["=", "!=", ">", ">=", "<", "<=", "like"],
+      advancedQueryColumns: [
+        {
+          label: "营业厅ID",
+          value: "station_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: '/clickHistory/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: '/clickHistory',
-                    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 + "/clickHistory/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: '/clickHistory/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: "展项ID",
+          value: "exhibition_id"
+        },
+        {
+          label: "被点击栏目的ID",
+          value: "clicked_id"
+        }
+      ],
+      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: "/clickHistory/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: "/clickHistory",
+        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 +
+        "/clickHistory/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: "/clickHistory/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 });
+      }
+    },
+    stationFormatter(row, column, cellValue) {
+      if (cellValue) {
+        var stationId = "";
+        this.stations.forEach(item => {
+          if (item.id == Number(cellValue)) {
+            stationId = item.stationName;
+          }
+        });
+
+        return stationId;
+      }
+    },
+    exhibitionFormatter(row, column, cellValue) {
+      if (cellValue) {
+        var exhibitionId = "";
+        this.exhibitons.forEach(item => {
+          if (item.id == Number(cellValue)) {
+            exhibitionId = item.name;
+          }
+        });
+
+        return exhibitionId;
+      }
+    },
+    showImg(img) {
+      this.imgSrc = img;
+      this.imageDialogVisible = true;
     }
+  }
+};
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/EquipmentInfo.vue

@@ -2,7 +2,7 @@
     <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="stationId" label="营业厅">
+            <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
                 <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
                     <el-option v-for="item in stations" :key="item.id" :label="item.stationName" :value="item.id">
                     </el-option>
@@ -26,7 +26,7 @@
 </template>
 <script>
     import formValidator from '../formValidator'
-
+    import { mapState } from "vuex";
     export default {
         created() {
             if (this.$route.query.column) {
@@ -88,6 +88,9 @@
                 subColumn: '',
                 subValue: '',
             }
+        },
+          computed: {
+            ...mapState(["userInfo"]),
         },
         methods: {
             onSave() {

src/main/vue/src/pages/FinancialData.vue

@@ -2,13 +2,16 @@
     <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="stationId" label="营业厅">
+            <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
                 <el-select v-model="formData.stationId" 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 prop="stationId" label="提示" v-if="userInfo.departId!='2'">
+                是否确认创建金融数据模块？
+            </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>
@@ -19,7 +22,7 @@
 </template>
 <script>
     import formValidator from '../formValidator'
-
+    import { mapState } from "vuex";
     export default {
         created() {
             if (this.$route.query.column) {
@@ -68,6 +71,9 @@
                 stations: [],
                 subValue: '',
             }
+        },
+          computed: {
+            ...mapState(["userInfo"]),
         },
         methods: {
             onSave() {

src/main/vue/src/pages/MemberInfo.vue

@@ -20,7 +20,7 @@
                 <single-upload v-model="formData.imgUrl" :disabled="'imgUrl'==subColumn"></single-upload>
             </el-form-item>
 
-<el-form-item prop="stationId" label="营业厅">
+            <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
                 <el-select v-model="formData.stationId" filterable placeholder="请选择" size="small">
                     <el-option v-for="item in stations" :key="item.id" :label="item.stationName" :value="item.id">
                     </el-option>
@@ -38,7 +38,7 @@
 </template>
 <script>
 import formValidator from "../formValidator";
-
+import { mapState } from "vuex";
 export default {
   created() {
     if (this.$route.query.column) {
@@ -89,6 +89,9 @@ export default {
       subValue: ""
     };
   },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
   methods: {
     onSave() {
       this.$refs.form.validate(valid => {

src/main/vue/src/pages/MemberInfos.vue

@@ -296,7 +296,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["tableHeight"]),
+    ...mapState(["tableHeight","userInfo"]),
     selection() {
       return this.$refs.table.selection.map(i => i.id);
     }

src/main/vue/src/pages/MenuInfo.vue

@@ -25,7 +25,7 @@
                 </template>
             </el-form-item>
 
-            <el-form-item prop="stationInfo" label="营业厅">
+            <el-form-item prop="stationInfo" label="营业厅" v-if="userInfo.departId=='2'">
                 <el-select v-model="formData.stationInfo" filterable placeholder="请选择" size="small">
                     <el-option v-for="item in stations" :key="item.id" :label="item.stationName" :value="item.id">
                     </el-option>
@@ -43,6 +43,7 @@
 </template>
 <script>
     import formValidator from '../formValidator'
+    import { mapState } from "vuex";
 
     export default {
         created() {
@@ -94,6 +95,9 @@
                 subColumn: '',
                 subValue: '',
             }
+        },
+          computed: {
+            ...mapState(["userInfo"]),
         },
         methods: {
             onSave() {

src/main/vue/src/pages/Pinpaijuzhen.vue

@@ -3,13 +3,18 @@
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
 
-            <el-form-item prop="stationId" label="营业厅">
+            <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
                 <el-select v-model="formData.stationId" 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 prop="stationId" label="提示" v-if="userInfo.departId!='2'">
+                是否确认创建金融数据模块？
+            </el-form-item>    
+
             <el-form-item>
 
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -21,7 +26,7 @@
 </template>
 <script>
     import formValidator from "../formValidator";
-
+    import { mapState } from "vuex";
     export default {
         created() {
             if (this.$route.query.column) {
@@ -71,6 +76,9 @@
                 stations: [],
                 subValue: ""
             };
+        },
+          computed: {
+            ...mapState(["userInfo"]),
         },
         methods: {
             onSave() {

src/main/vue/src/pages/Pinpaimenmian.vue

@@ -2,13 +2,18 @@
     <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="stationId" label="营业厅">
+           <el-form-item prop="stationId" label="营业厅" v-if="userInfo.departId=='2'">
                 <el-select v-model="formData.stationId" 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 prop="stationId" label="提示" v-if="userInfo.departId!='2'">
+                是否确认创建金融数据模块？
+            </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>
@@ -19,7 +24,7 @@
 </template>
 <script>
 import formValidator from "../formValidator";
-
+import { mapState } from "vuex";
 export default {
   created() {
     if (this.$route.query.column) {
@@ -70,6 +75,9 @@ export default {
       subValue: ""
     };
   },
+    computed: {
+            ...mapState(["userInfo"]),
+        },
   methods: {
     onSave() {
       this.$refs.form.validate(valid => {

src/main/vue/src/pages/StationInfos.vue

@@ -43,7 +43,11 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+               <el-table-column
+                                prop="id"
+                                label="营业厅id"
+                                min-width="100">
+                        </el-table-column>
                                             <el-table-column
                                 v-if="isColumnShow('stationName')"
                                 prop="stationName"

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

@@ -789,6 +789,26 @@ const router = new Router({
                     path: '/fileInfos',
                     name: 'FileInfos',
                     component: () => import('../pages/FileInfos')
+                },
+                {
+                    path: '/operateHistory',
+                    name: 'OperateHistory',
+                    component: () => import('../pages/OperateHistory')
+                },
+                {
+                    path: '/operateHistorys',
+                    name: 'OperateHistorys',
+                    component: () => import('../pages/OperateHistorys')
+                },
+                {
+                    path: '/operateHistory',
+                    name: 'OperateHistory',
+                    component: () => import('../pages/OperateHistory')
+                },
+                {
+                    path: '/operateHistorys',
+                    name: 'OperateHistorys',
+                    component: () => import('../pages/OperateHistorys')
                 }
                 /**INSERT_LOCATION**/
             ]