20181225客户现场修改问题

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

@@ -10,6 +10,10 @@ public class FindPara {
 
     private Integer stationId;
     private Integer exhibitionId;
+    /**
+     * 展项名称 20181225添加
+     */
+    private String exhibitionName;
 
     public Integer getStationId() {
         return stationId;
@@ -26,5 +30,13 @@ public class FindPara {
     public void setExhibitionId(Integer exhibitionId) {
         this.exhibitionId = exhibitionId;
     }
+
+    public String getExhibitionName() {
+        return exhibitionName;
+    }
+
+    public void setExhibitionName(String exhibitionName) {
+        this.exhibitionName = exhibitionName;
+    }
 }
 

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

@@ -61,6 +61,12 @@ public class AssetsController {
                 MultipartFile file = multiRequest.getFile(it.next().toString());
                 if (file != null) {
                     try {
+
+                        String originalFilename = file.getOriginalFilename();
+
+                        //不带后缀名的文件名
+                        String singleFileName = originalFilename.substring(0, originalFilename.lastIndexOf("."));
+
                         Random random = new Random();
                         StringBuilder randomCode = new StringBuilder();
                         for (int i = 0; i < 8; i++) {
@@ -69,7 +75,9 @@ public class AssetsController {
                         String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
                         String fileType = file.getContentType().substring(0, file.getContentType().indexOf("/"));
                         String imageName = String.format("%s/%s-%s%s", fileType, new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss").format(new Date()), randomCode, ext);
-
+                        if(fileType.equals("video")){
+                            imageName = String.format("%s/%s--%s%s", fileType, singleFileName, randomCode, ext);
+                        }
 
                         String path = OSSFileService.upload(file.getInputStream(), imageName);
                         paths.add(path);

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

@@ -6,6 +6,7 @@ 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.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.subject.Subject;
@@ -24,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/data")
 public class DataController {
@@ -72,8 +73,8 @@ public class DataController {
     private ClickHistoryService clickHistoryService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -93,25 +94,19 @@ public class DataController {
         Subject subject = SecurityUtils.getSubject();
         UserInfo userInfo = (UserInfo) subject.getPrincipal();
         int userStationId;
-        if(userInfo != null)
-        {
+        if (userInfo != null) {
             userStationId = Integer.parseInt(userInfo.getDepartId());
 
-            if(userStationId == 2)
-            {
+            if (userStationId == 2) {
                 findPara.setStationId(null);
-            }
-            else {
-                if(findPara.getStationId() == null)
-                {
+            } else {
+                if (findPara.getStationId() == null) {
                     findPara.setStationId(userStationId);
-                }
-                else if(findPara.getStationId() != userStationId)
-                {
-                        return "营业厅ID与账号不符";
+                } else if (findPara.getStationId() != userStationId) {
+                    return "营业厅ID与账号不符";
                 }
             }
-        }else {
+        } else {
             return "请先登录";
         }
 
@@ -131,12 +126,10 @@ public class DataController {
 
         MenuInfo menuinfo = new MenuInfo();
         menuinfo.setStationInfo(findPara.getStationId());
-        List<MenuInfo> menus =menuInfoService.getMenuInfoList(menuinfo);
-        for(MenuInfo m:menus)
-        {
+        List<MenuInfo> menus = menuInfoService.getMenuInfoList(menuinfo);
+        for (MenuInfo m : menus) {
 
-            if("1".equals(m.getType()))
-            {
+            if ("1".equals(m.getType())) {
                 SubItem s = new SubItem();
                 s.setMenuInfoId(m.getId());
                 List<SubItem> items = subItemService.getSubItemList(s);
@@ -167,24 +160,20 @@ public class DataController {
         Subject subject = SecurityUtils.getSubject();
         UserInfo userInfo = (UserInfo) subject.getPrincipal();
         int userStationId;
-        if(userInfo != null)
-        {
+        if (userInfo != null) {
             userStationId = Integer.parseInt(userInfo.getDepartId());
-            if(findPara.getStationId() != userStationId)
-            {
+            if (findPara.getStationId() != userStationId) {
                 return "营业厅ID与账号不符";
             }
 
-            if(findPara.getStationId() == null)
-            {
+            if (findPara.getStationId() == null) {
                 findPara.setStationId(userStationId);
 
-                if(findPara.getStationId() == 2)
-                {
+                if (findPara.getStationId() == 2) {
                     findPara.setStationId(null);
                 }
             }
-        }else {
+        } else {
             return "请先登录";
         }
 
@@ -212,24 +201,20 @@ public class DataController {
         Subject subject = SecurityUtils.getSubject();
         UserInfo userInfo = (UserInfo) subject.getPrincipal();
         int userStationId;
-        if(userInfo != null)
-        {
+        if (userInfo != null) {
             userStationId = Integer.parseInt(userInfo.getDepartId());
-            if(findPara.getStationId() != userStationId)
-            {
+            if (findPara.getStationId() != userStationId) {
                 return "营业厅ID与账号不符";
             }
 
-            if(findPara.getStationId() == null)
-            {
+            if (findPara.getStationId() == null) {
                 findPara.setStationId(userStationId);
 
-                if(findPara.getStationId() == 2)
-                {
+                if (findPara.getStationId() == 2) {
                     findPara.setStationId(null);
                 }
             }
-        }else {
+        } else {
             return "请先登录";
         }
 
@@ -244,7 +229,7 @@ public class DataController {
         out.setVersion(ec.getVersion());
 
         PlayInfo pi = new PlayInfo();
-        pi.setFatherId(out.getId()+"");
+        pi.setFatherId(out.getId() + "");
         pi.setType(0);
         List<PlayInfo> pis = playInfoService.getPlayInfoList(pi);
         out.setPlaylist(pis);
@@ -260,30 +245,24 @@ public class DataController {
     @ResponseBody
     public Object getPinpaimenmian(FindPara findPara) {
 
-            Subject subject = SecurityUtils.getSubject();
-            UserInfo userInfo = (UserInfo) subject.getPrincipal();
-            int userStationId;
-            if(userInfo != null)
-            {
-                userStationId = Integer.parseInt(userInfo.getDepartId());
+        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与账号不符";
-                    }
+            if (userStationId == 2) {
+                findPara.setStationId(null);
+            } else {
+                if (findPara.getStationId() == null) {
+                    findPara.setStationId(userStationId);
+                } else if (findPara.getStationId() != userStationId) {
+                    return "营业厅ID与账号不符";
                 }
-            }else {
-                return "请先登录";
             }
+        } else {
+            return "请先登录";
+        }
 
         ExhibitionContent ec = new ExhibitionContent();
         ec.setStationId(findPara.getStationId());
@@ -296,7 +275,7 @@ public class DataController {
         out.setVersion(ec.getVersion());
 
         PlayInfo pi = new PlayInfo();
-        pi.setFatherId(out.getId()+"");
+        pi.setFatherId(out.getId() + "");
         pi.setType(1);
         List<PlayInfo> pis = playInfoService.getPlayInfoList(pi);
         out.setPlaylist_tm(pis);
@@ -306,6 +285,47 @@ public class DataController {
         return out;
     }
 
+
+    /**
+     * 获取展项信息
+     * 20181225添加
+     *
+     * @param findPara stationId exhibitionName
+     * @return
+     */
+    @RequiresAuthentication
+    @RequestMapping(value = "/exhibitionInfo", method = RequestMethod.GET)
+    @ResponseBody
+    public Object getExhibitionInfo(FindPara findPara) {
+
+        if (StringUtils.isNotEmpty(findPara.getExhibitionName())) {
+            ExhibitionContent exhibitionContent = new ExhibitionContent();
+            exhibitionContent.setStationId(findPara.getStationId());
+            exhibitionContent.setName(findPara.getExhibitionName());
+
+            exhibitionContent = exhibitionContentService.getExhibitionContent(exhibitionContent);
+
+            if (exhibitionContent != null) {
+
+                findPara.setExhibitionId(exhibitionContent.getId());
+
+                if ("公示投教".equals(findPara.getExhibitionName())) {
+                    return getGongShiTouJiao(findPara);
+                } else if ("金融大数据".equals(findPara.getExhibitionName())) {
+                    return getFinancialData(findPara);
+                } else if ("品牌矩阵".equals(findPara.getExhibitionName())) {
+                    return getPinpaijuzhen(findPara);
+                } else if ("品牌门面".equals(findPara.getExhibitionName())) {
+                    return getPinpaimenmian(findPara);
+                }
+            }
+
+
+        }
+
+        return "展项名称不匹配";
+    }
+
     /**
      * <p>修改设备状态</p>
      */
@@ -313,40 +333,32 @@ public class DataController {
     @ResponseBody
     public Object editStatus(EquipmentInfo equipmentInfo) {
 
-            Subject subject = SecurityUtils.getSubject();
-            UserInfo userInfo = (UserInfo) subject.getPrincipal();
-            int userStationId;
-            if(userInfo != null)
-            {
-                userStationId = Integer.parseInt(userInfo.getDepartId());
+        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与账号不符";
-                    }
+            if (userStationId == 2) {
+            } else {
+                if (equipmentInfo.getStationId() == null) {
+                    equipmentInfo.setStationId(userStationId);
+                } else if (equipmentInfo.getStationId() != userStationId) {
+                    return "营业厅ID与账号不符";
                 }
-            }else {
-                return "请先登录";
             }
+        } else {
+            return "请先登录";
+        }
 
         EquipmentInfo ei = new EquipmentInfo();
         ei.setStationId(equipmentInfo.getStationId());
         ei.setExhibitionId(equipmentInfo.getExhibitionId());
         ei = equipmentInfoService.getEquipmentInfo(ei);
         ei.setStatus(equipmentInfo.getStatus());
-        if(equipmentInfoService.updateEquipmentInfo(ei))
-        {
+        if (equipmentInfoService.updateEquipmentInfo(ei)) {
             return new Result(true, ei);
-        }
-        else {
+        } else {
             return new Result(false, ei);
         }
     }
@@ -361,39 +373,31 @@ public class DataController {
         Subject subject = SecurityUtils.getSubject();
         UserInfo userInfo = (UserInfo) subject.getPrincipal();
         int userStationId;
-        if(userInfo != null)
-        {
+        if (userInfo != null) {
             userStationId = Integer.parseInt(userInfo.getDepartId());
 
-            if(userStationId == 2)
-            {
-            }
-            else {
-                if(clickHistory.getStationId() == null)
-                {
+            if (userStationId == 2) {
+            } else {
+                if (clickHistory.getStationId() == null) {
                     clickHistory.setStationId(userStationId);
-                }
-                else if(clickHistory.getStationId() != userStationId)
-                {
+                } else if (clickHistory.getStationId() != userStationId) {
                     return "营业厅ID与账号不符";
                 }
             }
-        }else {
+        } else {
             return "请先登录";
         }
 
-        if(clickHistoryService.createClickHistory(clickHistory))
-        {
+        if (clickHistoryService.createClickHistory(clickHistory)) {
             return new Result(true, clickHistory);
-        }
-        else {
+        } else {
             return new Result(false, "添加错误");
         }
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getMenuInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getMenuInfo(@RequestParam(required = false, value = "id") String id) {
@@ -402,8 +406,8 @@ public class DataController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(MenuInfo record) {
@@ -413,14 +417,14 @@ public class DataController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <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);
+        List<MenuInfo> pp = menuInfoService.getMenuInfoByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -429,8 +433,8 @@ public class DataController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(MenuInfo record) {
@@ -442,14 +446,14 @@ public class DataController {
             img.setType(0);
             img.setUrl(record.getImgUrl());
             imgInfoService.createImgInfo(img);
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateMenuInfo(MenuInfo record) {
@@ -461,66 +465,67 @@ public class DataController {
             img.setType(0);
             img.setUrl(record.getImgUrl());
             imgInfoService.createImgInfo(img);
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <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(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出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);
+        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"  };
+        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());
-                    }
+            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);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
+}
 

src/main/resources/properties/jdbc.properties

@@ -6,4 +6,9 @@ jdbc.username=microball
 jdbc.password=2wsx@WSX#EDC
 jdbc.databaseName=huatai
 
+#jdbc.url=jdbc:mysql://192.168.1.5:3306/huatai?useUnicode=true&characterEncoding=utf8
+#jdbc.username=root
+#jdbc.password=
+#jdbc.databaseName=huatai
+
 

src/main/resources/properties/outsidews.properties

@@ -11,7 +11,7 @@ rongyunappkey=x18ywvqfxbmic
 rongyunappsecret=MnM3kGXf7a
 jwtsecret=3MgWy/pJjxHCQW2pHlQbkjomTUPRo9WhsPFjUPYZZlo=
 host=http://1eaed69e.ngrok.io
-base_domain=http://localhost:8080
+base_domain=http://192.168.1.5:8080
 ALIPAY_APP_ID=2016101100660827
 ALIPAY_APP_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNbcuW0ij0mOezs+mRAYoyXlN5jZzr8WaO4q1kXTy7Xu9+C3+vurYgrqb9j+IeVsph4rhyF9P98H0cFQABnumiV6jaY3/wke/9aj8uBV5zvHC3GrkSDUQotPAmE+blwqFdofQsaoOuHOR1FfstLg29jOaVipoNvkSGmOJqfIjAGaMEQy7p2S2jLIqyKGMj71TvoITAMCkkwbim0kmbN4reh5XPKTeT2upOa+64FNnYK3mJ141e2LNWNx2HAIhaw88+KUiHNXUS3LA+aGw0inZP3UdSPAetsEagNeD+NXNtWf7DeABn/0K8SGgUkScODeC8TesOpS5lcmVj5W5w9hK7AgMBAAECggEBAIzxG5Fqtza6AZ5FfaZDTDGqjdMD2fn3Mcous4/8eEKFrALqmLxUeciKi3/ES/tMyKXIC4wb1RKRAQVXUx3JjboYMn1Dbu/68JEJaDeG73qwexTlfLxp5a2YFnvJg813b4byKriei6HVqNi8MAybYEoAdeN7qJ5tQE6obg9pSdmhgg6tnza51ASlwepZqxQ2YDMvROg7KA2PHlIrdVhLBy0GGG3YvSxsl2jOmXst96mihYa6vD4rXZjVXnd+kwS+x5Mpw7tLdEkS+PSrFRFpW6W0LwnGcJm1lC3L5X8wQ+lXGT3X2TrZV4j+NCwTyn3WFr3yGRnLAzJD5vMJI/sTY8ECgYEA8o1+9ZW7XIvO+zIBEsq177pEYlqFoW2e8acokeYPXex6RmIhaikQVegnwSQcu8hvD2Gh0ozGEH1Y47vCvGi6Q9pswy4pT47BQyuir/8EVSPsO+2atWa/YXot0Gcmm2GSWXT/DNJViaGB+oT4m15mCDtzVeJIndytglx0TF9saFMCgYEA2NFob1K+fi4+NZD8WrkAnjPKodeOsu+YxNnB3E53xd8BgVLVgC9F/eEwDkbWazil5Wykwf07OGbBK5+rUv9w2DHJMHyaGQ5HpCRx06P2gxquFdudXjWwV+6TseEQDloyE13oKT8+oJBedYTNI3D6mjGv+ni+gksaU74WS0mtvvkCgYEAx5SSUTXBk6ceyyccJwBRsE6Oknd12Zy/2ov3IAYzws8g1eVNJXNgk6+RdqVmV0XXzMpDQ2K+Xzck+062MB3kloyWTgwfxezrLYAsP7EROZVzfuRGFtnSxDyqkf8uj1A8Agv5Ce3QoI0azK65ee60+jUg9BxcMDkzND8rGuSx6S0CgYAu2JAH/YjLGpK2YC0mLPLFO8t8TGa4oqwPXD1WrF2UkypwFsWqfIxS3mTTsNqDMCon9+FhSKWS+iCinE0YEbj//UHLCCEDaOJxxK4TXEnW6dzTPDA0OsVvOk0PEeG2OCa5qICQ6OlPJ+JA4gCwt6htyG6NX6lJ3ZBCp7+JZNH1gQKBgCbsC8LzVOLIw6GR87X0oeWTfq7KKVD6rMfG58jHpTSAdY6ge9f2CyxKhfUyemZtu7BsRCFeuI5NDmtmg5uXS6Nu1dL/R5Xs33mB64fwYX/kXErnrHYrCekC1uIM8I/hTyVfbUvoMArq+3s2W7KTmq63ygBEnNOAqomJDHeW+/wv
 ALIPAY_CHARSET=utf-8

src/main/vue/src/pages/Dashboard.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-button v-if="editable" size="small" @click="save">保存</el-button>
+        <!-- <el-button v-if="editable" size="small" @click="save">保存</el-button>
         <el-button v-else size="small" @click="editable=true">编辑</el-button>
         <grid-layout
             style="margin:0 -10px;"
@@ -23,7 +23,7 @@
                        :key="item.i">
                 <component :is="item.name"></component>
             </grid-item>
-        </grid-layout>
+        </grid-layout> -->
     </div>
 </template>
 

src/main/vue/src/pages/FileInfo.vue

@@ -44,7 +44,7 @@
       </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="onDelete" v-if="formData.id>1" type="danger">删除</el-button>
         <el-button @click="$router.go(-1)">取消</el-button>
       </el-form-item>
     </el-form>
@@ -104,7 +104,9 @@ export default {
   data() {
     return {
       saving: false,
-      formData: {},
+      formData: {
+        url:'',
+      },
       rules: {
         url: [{ required: true, message: "请上传资源", trigger: "blur" }]
       },

src/main/vue/src/pages/ImgInfo.vue

@@ -9,8 +9,8 @@
       size="small"
       style="max-width: 500px;"
     >
-      <el-form-item prop="imgUrl" label="图片">
-        <single-upload v-model="formData.url" :disabled="'imgUrl'==subColumn"></single-upload>
+      <el-form-item prop="url" label="图片">
+        <single-upload v-model="formData.url" :disabled="'url'==subColumn"></single-upload>
       </el-form-item>
       <el-form-item v-if="false" prop="type" label="分类">
         <el-input v-model="formData.type" :disabled="subType!=''"></el-input>
@@ -78,7 +78,7 @@ export default {
       saving: false,
       formData: {},
       rules: {
-        imgUrl: [{ required: true, message: "请上传图片", trigger: "blur" }]
+        url: [{ required: true, message: "请上传图片", trigger: "blur" }]
       },
       subColumn: "",
       subValue: "",

src/main/vue/src/pages/ImgInfos.vue

@@ -65,7 +65,7 @@
             <el-table-column
                 v-if="isColumnShow('type')"
                 prop="type"
-                label="分类 :0:menu_ico  1:subItem   2:menu_info  3:member"
+                label="分类"
                 min-width="100">
             </el-table-column>
 

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

@@ -18,7 +18,7 @@
       <el-form-item prop="abstractInfo" label="栏目概要">
         <el-input v-model="formData.abstractInfo" :disabled="'abstractInfo'==subColumn"></el-input>
       </el-form-item>
-      <el-form-item prop="statusFlag" label="栏目类型">
+      <el-form-item prop="type" label="栏目类型">
         <template>
           <el-select
             v-model="formData.type"
@@ -108,7 +108,7 @@ export default {
         abstractInfo: [
           { required: true, message: "请输入栏目概要", trigger: "blur" }
         ],
-        statusFlag: [
+        type: [
           { required: true, message: "请选择栏目类型", trigger: "blur" }
         ],
         stationInfo: [

src/main/vue/src/pages/MenuInfos.vue

@@ -54,7 +54,7 @@
             <el-table-column
                 v-if="isColumnShow('abstractInfo')"
                 prop="abstractInfo"
-                label="公司介绍"
+                label="栏目简介"
                 min-width="100">
             </el-table-column>
 
@@ -232,7 +232,7 @@
                         show: true
                     },
                     {
-                        label: '公司介绍',
+                        label: '栏目简介',
                         value: 'abstractInfo',
                         show: true
                     },
@@ -259,7 +259,7 @@
                         value: 'menu_name'
                     },
                     {
-                        label: '公司介绍',
+                        label: '栏目简介',
                         value: 'abstract_info'
                     },
                     {

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.3b5ffc7eb6bc8f7fdc5c4070e419686e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f29d56083b1032f25f89.js></script><script type=text/javascript src=/static/js/vendor.c81c6b23d91dbf49d5b2.js></script><script type=text/javascript src=/static/js/admin.1fbe614326d18caee35d.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.3b5ffc7eb6bc8f7fdc5c4070e419686e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.891f11fc04793f04fddf.js></script><script type=text/javascript src=/static/js/vendor.c81c6b23d91dbf49d5b2.js></script><script type=text/javascript src=/static/js/admin.0f3fc7121bf8a06f949b.js></script></body></html>

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.63eab42dead19bcb4efef871b8526186.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f29d56083b1032f25f89.js></script><script type=text/javascript src=/static/js/vendor.c81c6b23d91dbf49d5b2.js></script><script type=text/javascript src=/static/js/loginAdmin.ad145a90087e128c6380.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.63eab42dead19bcb4efef871b8526186.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.891f11fc04793f04fddf.js></script><script type=text/javascript src=/static/js/vendor.c81c6b23d91dbf49d5b2.js></script><script type=text/javascript src=/static/js/loginAdmin.ad145a90087e128c6380.js></script></body></html>

src/main/webapp/static/js/120.e7ef352b700e56d44b66.js → src/main/webapp/static/js/119.b4211aab83e0c304fb47.js

@@ -1 +1 @@
-webpackJsonp([120],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});
+webpackJsonp([119],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});