修改登陆界面

industry-admin/src/views/login/index.vue

@@ -11,7 +11,7 @@
       >
         <div class="title-container">
 <!--          <h3 class="title">工业实时数据可视化管理系统</h3>-->
-          <h3 class="title">工业实时数据报表软件</h3>
+<!--          <h3 class="title">工业实时数据报表软件</h3>-->
         </div>
         <el-form-item prop="userName">
           <span class="svg-container">
@@ -20,7 +20,7 @@
           <el-input
             ref="userName"
             v-model="loginForm.userName"
-            placeholder="用户名"
+            placeholder="用户名称"
             name="userName"
             type="text"
             tabindex="1"
@@ -42,7 +42,7 @@
               ref="password"
               v-model="loginForm.password"
               :type="passwordType"
-              placeholder="密码"
+              placeholder="登录口令"
               name="password"
               tabindex="2"
               auto-complete="off"
@@ -254,7 +254,7 @@ export default {
           {
             required: true,
             trigger: ['blur', 'change'],
-            message: '请输入您的用户名',
+            message: '请输入您的用户名称',
             pattern: '[^ \x22]+'
           }
         ],
@@ -262,7 +262,7 @@ export default {
           {
             required: true,
             trigger: ['blur', 'change'],
-            message: '请输入您的密码',
+            message: '请输入您的登录口令',
             pattern: '[^ \x22]+'
           }
         ]
@@ -429,7 +429,7 @@ export default {
 </script>
 
 <style lang="scss">
-$imgBg: url("~@/assets/images/cqcybg.png");
+$imgBg: url("~@/assets/images/cqcybg2.jpg");
 $dark_gray: #889aa4;
 
 

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/UserGroupUser.java

@@ -23,4 +23,9 @@ public class UserGroupUser implements Serializable {
      * 用户id
      */
     private String userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
 }

industry-system/industry-da/src/main/java/com/example/opc_da/controller/UserGroupController.java

@@ -93,6 +93,17 @@ public class UserGroupController {
     }
 
     /**
+     * 获取当前登录人，创建的用户组
+     *
+     * @return
+     */
+    @GetMapping("/getAllUserGroupTree")
+    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.USERGROUP, OperationEnum = OperationEnum.SELECT)
+    public Result getAllUserGroupTree() {
+        return userGroupService.getAllUserGroupTree();
+    }
+
+    /**
      * 分页获取当前登录人，创建的用户组
      *
      * @return

industry-system/industry-da/src/main/java/com/example/opc_da/dao/UserGroupDao.java

@@ -11,6 +11,7 @@ import java.util.List;
 public interface UserGroupDao {
 
     List<UserGroup> getAllUserGroup(String userId);
+    List<UserGroup> getAllUserGroupTree(String userId);
 
     UserGroup getUserGroupById(Integer id);
 

industry-system/industry-da/src/main/java/com/example/opc_da/service/UserGroupService.java

@@ -10,6 +10,8 @@ public interface UserGroupService {
 
     Result getAllUserGroup();
 
+    Result getAllUserGroupTree();
+
     Result getUserGroupPage(Integer page, Integer limit);
 
     Result updateUserGroup(UserGroup userGroup);

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/UserGroupServiceImpl.java

@@ -3,6 +3,7 @@ package com.example.opc_da.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.example.opc_common.entity.Department;
 import com.example.opc_common.entity.ReportTable;
+import com.example.opc_common.entity.User;
 import com.example.opc_common.entity.UserGroup;
 import com.example.opc_common.enums.ResultEnum;
 import com.example.opc_common.util.Blank;
@@ -126,6 +127,22 @@ public class UserGroupServiceImpl implements UserGroupService {
         String userId = userUtil.getCurrentUserId();
         return Result.ok(userGroupDao.getAllUserGroup(userId));
     }
+    @Override
+    public Result getAllUserGroupTree() {
+        String userId = userUtil.getCurrentUserId();
+
+        List<UserGroup> userList = userGroupDao.getAllUserGroupTree(userId);
+        for(UserGroup u :userList){
+
+        }
+
+        //UserGroup userGroup = userGroupDao.getUserGroupById(id);
+        //List<String> userIdList = userGroupDao.getUserGroupUserByGroup(id);
+        //userGroup.setUserIdList(userIdList);
+
+
+        return null;
+    }
 
     @Override
     public Result getUserGroupPage(Integer page, Integer limit) {

industry-system/industry-da/src/main/resources/mapper/UserGroupDao.xml

@@ -40,6 +40,13 @@
         where user_id = #{userId} order by sort_num,create_time desc
     </select>
 
+    <select id="getAllUserGroupTree" resultType="com.example.opc_common.entity.UserGroup">
+        select
+        <include refid="userGroup"/>
+        from t_user_group
+        where user_id = #{userId} order by sort_num,create_time desc
+    </select>
+
     <select id="getUserGroupCount" resultType="java.lang.Integer">
         select count(*)
         from t_user_group
@@ -82,11 +89,15 @@
         from t_user_group_user
         where user_group_id = #{userGroupId}
     </select>
+    <select id="getUserGroupUserByGroup" resultType="java.lang.String">
+        select user_id
+        from t_user_group_user
+        where user_group_id = #{userGroupId}
+    </select>
 
     <select id="getUserByGroupId" resultType="com.example.opc_common.entity.User">
         select user_id,
                user_name,
-               PASSWORD,
                user_type,
                create_time,
                last_login_time,

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/sheet-util.js

@@ -60,9 +60,10 @@ layui.define(function(exports) {
 				move: false,
 				extend: false
 			}
+			let copyRange = null;
 			const $ = layui.jquery
 			const option = $.extend(true, {}, sheetOption)
-			option.container = 'luckysheet'
+			option.container = ''
 			const templateReportType = layui.sheetTypew.templateReportType
 			if ((templateReportType == 2 || templateReportType == 5) && !edit) {
 				option.row = parseInt(layui.sheetTypew.templateEventReportNum) + 50
@@ -104,6 +105,49 @@ layui.define(function(exports) {
 					}
 					return true
 				},
+				rangeCopyAfter:function(range,data){
+					// copyRange = range;
+					// let scol = copyRange[0].column[0];
+					// let ecol = copyRange[0].column[1];
+					// let srow = copyRange[0].row[0];
+					// let erow = copyRange[0].row[1];
+					// console.log(scol);
+					// console.log(srow);
+					// console.log(luckysheet.getCellValue(3, 6));
+					// for(let i=srow;i<=erow;i++){
+					// 	for(let j=scol;j<=ecol;j++){
+					// 		const cell = luckysheet.getCellValue(i, j);
+					// 		console.log(cell)
+					// 	}
+					// }
+				},
+				rangePasteBefore:function(range,data){
+					// console.log('rangePasteBefore')
+					// console.log(range);
+					// console.log(data);
+					// let scol = range[0].column[0];
+					// let ecol = range[0].column[1];
+					// let srow = range[0].row[0];
+					// let erow = range[0].row[1];
+					// console.log(scol);
+					// console.log(srow);
+					// console.log(luckysheet.getCellValue(3, 6));
+					// for(let i=srow;i<=erow;i++){
+					// 	for(let j=scol;j<=ecol;j++){
+					// 		const cell = luckysheet.getCellValue(i, j);
+					// 		console.log(cell)
+					// 	}
+					// }
+				},
+				cellMousedown:function(cell,position,sheet,ctx){
+					//console.log(position.r);
+					//console.log(position.c);
+					//console.log(cell);
+				},
+				rangePasteAfter:function(range,data){
+					//console.log('rangePasteAfter')
+					//console.log(data);
+				},
 				sheetMousemove: function(cell, position, sheet, moveState) {
 					if (moveState.cellSelectedMove && !moveJson.move) {
 						moveJson.sr = position.r