Browse Source

更改了文档级别管理弹窗样式,分组管理的分配成员返回按钮和重置按钮样式

yxc 2 years ago
parent
commit
4a292f6cce

+ 38 - 50
src/views1/File/Individual/Share/ShareView.vue

@@ -1,16 +1,5 @@
 <template>
   <div class="containe">
-    <div class="header">
-      <span>文档管理</span>
-      <img src="../../../../assets/img/chevron-down.png" alt="" />
-      <img src="../../../../assets/img/slash.png" alt="" />
-      <span>个人文档</span>
-      <img src="../../../../assets/img/chevron-down.png" alt="" class="top2" />
-      <img src="../../../../assets/img/slash.png" alt="" />
-      <span class="top1">分享</span>
-      <img src="../../../../assets/img/chevron-up.png" alt="" class="top2" />
-      <img src="../../../../assets/img/slash.png" alt="" />
-    </div>
     <div class="top">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item prop="isSecret" label="是否机密">
@@ -18,11 +7,6 @@
             active-color="red"> </el-switch>
           <span>(如果选择机密,则共享用户打开时需要输入自己的用户密码才能查看)</span>
         </el-form-item>
-        <el-form-item prop="onlyOneTime" label="阅后即焚">
-          <el-switch v-model="form.onlyOneTime" active-value="1" inactive-value="0" @change="shareChange()"
-            active-color="red"> </el-switch>
-          <span>(如果选择阅后即焚,则共享用户只能打开一次)</span>
-        </el-form-item>
       </el-form>
     </div>
     <div class="main">
@@ -277,45 +261,49 @@
     font-weight: 500;
     padding-left: calc(100vw * (20 / 1920));
 
-    .header {
-      height: calc(100vh * (22 / 1080));
-      margin-top: calc(100vh * (20 / 1080));
-      margin-bottom: calc(100vh * (20 / 1080));
-      display: flex;
-      align-items: center;
-
-      img {
-        width: calc(100vw * (16 / 1920));
-        height: calc(100vh * (16 / 1080));
-        border: 1px dashed grey;
-        margin-left: 3px;
-        margin-right: 3px;
-      }
-
-      .top1 {
-        color: #2e8aecff;
-      }
-    }
-
-    .title {
-      height: calc(100vh * (22 / 1080));
-      margin-top: calc(100vh * (20 / 1080));
-      margin-bottom: calc(100vh * (20 / 1080));
-      color: #ffffffff;
-      font-size: 0.16rem;
-      font-weight: bold;
-      line-height: calc(100vh * (22 / 1080));
-    }
-
+    // .header {
+    //   height: calc(100vh * (22 / 1080));
+    //   margin-top: calc(100vh * (20 / 1080));
+    //   margin-bottom: calc(100vh * (20 / 1080));
+    //   display: flex;
+    //   align-items: center;
+
+    //   img {
+    //     width: calc(100vw * (16 / 1920));
+    //     height: calc(100vh * (16 / 1080));
+    //     border: 1px dashed grey;
+    //     margin-left: 3px;
+    //     margin-right: 3px;
+    //   }
+
+      // .top1 {
+      //   color: #2e8aecff;
+      //   margin-top: calc(100vh * (35 / 1080));
+      // }
+    // }
+
+    // .title {
+    //   height: calc(100vh * (22 / 1080));
+    //   margin-top: calc(100vh * (20 / 1080));
+    //   margin-bottom: calc(100vh * (20 / 1080));
+    //   color: #ffffffff;
+    //   font-size: 0.16rem;
+    //   font-weight: bold;
+    //   line-height: calc(100vh * (22 / 1080));
+    // }
+.top{
+  margin-top: calc(100vh * (20 / 1080));
+  margin-bottom: calc(100vh * (20 / 1080));
+}
     .main {
       width: calc(100vw * (1876 / 1920));
-      height: calc(100vh * (800 / 1080));
-
+      height: calc(100vh * (850 / 1080));
+    
       .app-container {
         width: calc(100vw * (1876 / 1920));
-        height: calc(100vh * (800 / 1080));
+        height: calc(100vh * (850 / 1080));
         background: url(../../../../assets/img/Group-615.png);
-        background-size: calc(100vw * (1876 / 1920)) calc(100vh * (800 / 1080));
+        background-size: calc(100vw * (1876 / 1920)) calc(100vh * (850 / 1080));
       }
 
       .mb8 {

+ 2 - 0
src/views1/File/Level/LevelView.vue

@@ -76,6 +76,8 @@
   </template>
     
 <script>
+  import "@/styles1/element-ui1.scss";
+
  import {
     listLevel,
     getLevel,

+ 330 - 220
src/views1/Group/Subgroup/SubgroupView.vue

@@ -1,229 +1,341 @@
 <template>
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="用户姓名" prop="userName">
-          <el-input v-model="queryParams.userName" placeholder="请输入用户姓名" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-            v-hasPermi="['doc:groupUser:add']">分配成员</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-circle-close" size="mini" :disabled="multiple"
-            @click="cancelGroupUserAll" v-hasPermi="['doc:groupUser:remove']">删除成员</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="warning" plain size="mini" @click="handleClose">返回</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table v-loading="loading" :data="groupUserList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
-        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-        <el-table-column label="状态" align="center" prop="status">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-circle-close" @click="cancelGroupUser(scope.row)"
-              v-hasPermi="['doc:groupUser:remove']">删除成员</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-  
-      <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
-      <select-user ref="select" :groupId="queryParams.groupId" @ok="handleQuery" />
-    </div>
-  </template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+          class="reset1"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['doc:groupUser:add']"
+          >分配成员</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-circle-close"
+          size="mini"
+          :disabled="multiple"
+          @click="cancelGroupUserAll"
+          v-hasPermi="['doc:groupUser:remove']"
+          >删除成员</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          size="mini"
+          @click="handleClose"
+          class="reset2"
+          >返回</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="groupUserList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="用户名称"
+        prop="userName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="用户昵称"
+        prop="nickName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="邮箱"
+        prop="email"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="手机"
+        prop="phonenumber"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-circle-close"
+            @click="cancelGroupUser(scope.row)"
+            v-hasPermi="['doc:groupUser:remove']"
+            >删除成员</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <select-user
+      ref="select"
+      :groupId="queryParams.groupId"
+      @ok="handleQuery"
+    />
+  </div>
+</template>
   
   <script>
-    import "@/styles1/element-ui1.scss";
+import "@/styles1/element-ui1.scss";
 
-    import {
-      listGroupUser,
-      getGroupUser,
-      delGroupUser,
-      addGroupUser,
-      updateGroupUser,
-      groupUserCancelAll
-    } from "@/api/doc/groupUser";
-    import selectUser from "./selectUser";
-    export default {
-      name: "GroupUser",
-      dicts: ['sys_normal_disable'],
-      components: {
-        selectUser
+import {
+  listGroupUser,
+  getGroupUser,
+  delGroupUser,
+  addGroupUser,
+  updateGroupUser,
+  groupUserCancelAll,
+} from "@/api/doc/groupUser";
+import selectUser from "./selectUser";
+export default {
+  name: "GroupUser",
+  dicts: ["sys_normal_disable"],
+  components: {
+    selectUser,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 分组成员表格数据
+      groupUserList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        userName: null,
       },
-      data() {
-        return {
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          // 非单个禁用
-          single: true,
-          // 非多个禁用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          // 总条数
-          total: 0,
-          // 分组成员表格数据
-          groupUserList: [],
-          // 弹出层标题
-          title: "",
-          // 是否显示弹出层
-          open: false,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            userId: null,
-            userName: null
-          },
-          // 表单参数
-          form: {},
-          // 表单校验
-          rules: {}
-        };
-      },
-      created() {
-        const groupId = this.$route.params && this.$route.params.groupId;
-        if (groupId) {
-          this.queryParams.groupId = groupId;
-          this.getList();
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    const groupId = this.$route.params && this.$route.params.groupId;
+    if (groupId) {
+      this.queryParams.groupId = groupId;
+      this.getList();
+    }
+  },
+  methods: {
+    // 返回按钮
+    handleClose() {
+      const obj = {
+        path: "/home/group/groups",
+      };
+      this.$tab.closeOpenPage(obj);
+    },
+    /** 查询分组成员列表 */
+    getList() {
+      this.loading = true;
+      listGroupUser(this.queryParams).then((response) => {
+        this.groupUserList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        groupId: null,
+        userId: null,
+        userName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.userId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs.select.show();
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.groupId != null) {
+            updateGroupUser(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGroupUser(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
         }
-      },
-      methods: {
-        // 返回按钮
-        handleClose() {
-          const obj = {
-            path: "/home/group/groups"
-          };
-          this.$tab.closeOpenPage(obj);
-        },
-        /** 查询分组成员列表 */
-        getList() {
-          this.loading = true;
-          listGroupUser(this.queryParams).then(response => {
-            this.groupUserList = response.rows;
-            this.total = response.total;
-            this.loading = false;
+      });
+    },
+    /** 删除按钮操作 */
+    cancelGroupUserAll(row) {
+      const groupId = this.queryParams.groupId;
+      const userIds = this.ids.join(",");
+      this.$modal
+        .confirm("是否确认删除选中的分组成员?")
+        .then(function () {
+          return groupUserCancelAll({
+            groupId: groupId,
+            userIds: userIds,
           });
-        },
-        // 取消按钮
-        cancel() {
-          this.open = false;
-          this.reset();
-        },
-        // 表单重置
-        reset() {
-          this.form = {
-            groupId: null,
-            userId: null,
-            userName: null
-          };
-          this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
+        })
+        .then(() => {
           this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryForm");
-          this.handleQuery();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.userId)
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-          this.$refs.select.show();
-        },
-        /** 提交按钮 */
-        submitForm() {
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-              if (this.form.groupId != null) {
-                updateGroupUser(this.form).then(response => {
-                  this.$modal.msgSuccess("修改成功");
-                  this.open = false;
-                  this.getList();
-                });
-              } else {
-                addGroupUser(this.form).then(response => {
-                  this.$modal.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-                });
-              }
-            }
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 删除按钮操作 */
+    cancelGroupUser(row) {
+      const groupId = this.queryParams.groupId;
+      const userIds = row.userId;
+      this.$modal
+        .confirm('是否确认删除分组成员"' + row.userName + '"的数据项?')
+        .then(function () {
+          return groupUserCancelAll({
+            groupId: groupId,
+            userIds: userIds,
           });
-        },
-        /** 删除按钮操作 */
-        cancelGroupUserAll(row) {
-          const groupId = this.queryParams.groupId;
-          const userIds = this.ids.join(",");
-          this.$modal.confirm('是否确认删除选中的分组成员?').then(function() {
-            return groupUserCancelAll({
-              groupId: groupId,
-              userIds: userIds
-            });
-          }).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
-        },
-        /** 删除按钮操作 */
-        cancelGroupUser(row) {
-          const groupId = this.queryParams.groupId;
-          const userIds = row.userId
-          this.$modal.confirm('是否确认删除分组成员"' + row.userName + '"的数据项?').then(function() {
-            return groupUserCancelAll({
-              groupId: groupId,
-              userIds: userIds
-            });
-          }).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
-        },
-      },
-    };
-  </script>
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
 
 <style scoped lang='scss'>
-
 .el-table {
-        width: calc(100vw * (1882 / 1920));
-        height: calc(100vh * (600 / 1080));
-        background: transparent;
-        color: #7EA4C8FF !important;
-        overflow: auto;
-      }
-
+  width: calc(100vw * (1882 / 1920));
+  height: calc(100vh * (600 / 1080));
+  background: transparent;
+  color: #7ea4c8ff !important;
+  overflow: auto;
+}
+.reset1 {
+  color: #2e8aecff;
+  background: transparent;
+  border: 1px solid #2e8aecff;
+}
+.reset2 {
+  background-color: #002a5cff;
+  color: #1890ff;
+  border: none;
+}
 //底部跳转
 ::v-deep .pagination-container {
   height: calc(100vh * (50 / 1080));
@@ -271,8 +383,7 @@
   border: none;
 }
 ::v-deep .el-button--success.is-plain.is-disabled,
-.el-button--danger.is-plain.is-disabled,
-.el-button{
+.el-button--danger.is-plain.is-disabled {
   background-color: #002a5cff;
   color: #1890ff;
   border: none;
@@ -282,9 +393,8 @@
   text-align: center;
 }
 //搜索刷新按钮颜色
-::v-deep .el-button.is-circle{
-    background: #006C9AFF;
-    color: white;
+::v-deep .el-button.is-circle {
+  background: #006c9aff;
+  color: white;
 }
-
 </style>

+ 6 - 1
src/views1/Group/Subgroup/selectUser.vue

@@ -27,7 +27,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="reset1">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row>
@@ -160,6 +160,11 @@ export default {
       right: 8%;
       bottom: 5%;
     }
+    .reset1 {
+        color: #2e8aecff;
+        background: transparent;
+        border: 1px solid #2e8aecff;
+      }
 }
 ::v-deep .el-dialog .el-input {
   width: calc(100vw * (240 / 1920)) !important;

+ 3 - 2
src/views1/Retrieval/RetrievalView.vue

@@ -80,6 +80,7 @@ export default {
       // console.log(scrollTop);
       // 是否达到页面底部
       if (scrollTop + clientHeight >= scrollHeight) {
+        // console.log('滚动到底部了!')
         this.page+=1
         // 执行加载
         this.searchs()
@@ -92,9 +93,9 @@ export default {
       // console.log('this.page=',this.page)
       // console.log('this.size=',this.size)
       ret({ content: this.input, page: this.page, size: this.size }).then((item) => {
-        console.log('item=',item)        
+        // console.log('item=',item)        
         if (item.length > 0) {
-          this.count.push(...item)
+          this.count.push(...item);
         }
       })
     },