个人文档模块的标签更新

src/views1/File/Individual/IndividualView.vue

@@ -63,16 +63,16 @@
               </el-form-item>
               <el-form-item label="标签" prop="params">
               <el-select
-               v-model="queryParams.params"
+               v-model="queryParams.params.tagId"
                placeholder="请输入标签名称"
                @change="handleQuery"
                style="width: 180px"
             >
               <el-option
               v-for="item in tags"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              :key="item.tagId"
+              :label="item.tagName"
+              :value="item.tagId"
               />
             </el-select>
               </el-form-item>
@@ -186,7 +186,7 @@
               <el-table-column label="标签" align="center" prop="tagName" width="250">
                 <template slot-scope="scope">
               <div v-if="scope.row.tagList!=[]">
-                <el-tag v-for="(item,index) in scope.row.tagList" :key="index">
+                <el-tag v-for="item in scope.row.tagList" :key="item.tagId">
                   {{item.tagName}}
                 </el-tag>
               </div>
@@ -284,74 +284,76 @@
         >
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="" prop="docPath">
-              <!-- <el-input v-model="form.docPath" placeholder="请输入文件路径" /> -->
-              <file-upload v-model="form.docPath" />
-            </el-form-item>
-            <el-form-item label="文件目录" prop="dirId">
-              <treeselect
-                v-model="form.dirId"
-                :options="dirList"
-                :normalizer="normalizer"
-                placeholder="请选择文件目录"
-              />
-            </el-form-item>
-            <el-form-item label="文件名称" prop="docName">
-              <el-input v-model="form.docName" placeholder="请输入文件名称" />
-            </el-form-item>
-            <el-form-item label="文件描述">
-              <el-input
-                v-model="form.docDesc"
-                type="textarea"
-                placeholder="请输入内容"
-              />
-            </el-form-item>
-            <el-form-item label="文件级别" prop="docLevel">
-              <el-select v-model="form.docLevel" placeholder="请选择文件级别">
-                <el-option
-                  v-for="item in levelOptions"
-                  :key="item.levelId"
-                  :label="item.levelName"
-                  :value="item.levelId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="选择标签(最多5个)" prop="tagName" color="red">
-              <el-tag
-                :key="tag"
-                v-for="tag in dynamicTags"
-                closable
-                :disable-transitions="false"
-                @close="handleClose(tag)"
-              >
-                {{ tag }}
-              </el-tag>
-              <el-input
-                class="input-new-tag"
-                v-if="inputVisible"
-                v-model="inputValue"
-                ref="saveTagInput"
-                size="small"
-                @keyup.enter.native="handleInputConfirm"
-                @blur="handleInputConfirm"
-              >
-              </el-input>
-              <el-button
-                v-else
-                class="button-new-tag"
-                size="small"
-                @click="showInput"
-                >添加标签</el-button
-              >
-            </el-form-item>
-            <el-form-item label="文件标签" color="red">
-              <el-tag
-                 v-for="tag in tags"
-                 :key="tag.name"
-                 :type="tag.type"
-                 @click="handleInputConfirm1(tag)">
-                 {{ tag.name }}
-            </el-tag>
-            </el-form-item>
+  <!-- <el-input v-model="form.docPath" placeholder="请输入文件路径" /> -->
+  <file-upload v-model="form.docPath" />
+</el-form-item>
+<el-form-item label="文件目录" prop="dirId">
+  <treeselect
+    v-model="form.dirId"
+    :options="dirList"
+    :normalizer="normalizer"
+    placeholder="请选择文件目录"
+  />
+</el-form-item>
+<el-form-item label="文件名称" prop="docName">
+  <el-input v-model="form.docName" placeholder="请输入文件名称" />
+</el-form-item>
+<el-form-item label="文件级别" prop="docLevel">
+  <el-select v-model="form.docLevel" placeholder="请选择文件级别">
+    <el-option
+      v-for="item in levelOptions"
+      :key="item.levelId"
+      :label="item.levelName"
+      :value="item.levelId"
+    ></el-option>
+  </el-select>
+</el-form-item>
+<el-form-item label="选择标签(最多5个)" prop="tagName" color="red">
+  <el-tag
+    :key="tag"
+    v-for="tag in dynamicTags"
+    closable
+    :disable-transitions="false"
+    @close="handleClose(tag)"
+  >
+    {{ tag }}
+  </el-tag>
+  <el-input
+    class="input-new-tag"
+    v-if="inputVisible"
+    v-model="inputValue"
+    ref="saveTagInput"
+    size="small"
+    @keyup.enter.native="handleInputConfirm"
+    @blur="handleInputConfirm"
+    maxlength="5"
+    placeholder="最多输入五个字"
+  >
+  </el-input>
+  <el-button
+    v-else
+    class="button-new-tag"
+    size="small"
+    @click="showInput"
+    >添加标签</el-button
+  >
+</el-form-item>
+<el-form-item label="文件标签" color="red">
+  <el-tag
+     v-for="tag in tags"
+     :key="tag.tagName"
+     :type="tag.type"
+     @click="handleInputConfirm1(tag)">
+     {{ tag.tagName }}
+</el-tag>
+</el-form-item>
+<el-form-item label="文件描述">
+  <el-input
+    v-model="form.docDesc"
+    type="textarea"
+    placeholder="请输入内容"
+  />
+</el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -366,6 +368,8 @@
 <script>
 import "@/styles1/element-ui1.scss";
 
+import {listTag} from"@/api/doc/tag.js"
+
 import {
   listInfo,
   getInfo,
@@ -395,11 +399,11 @@ export default {
     return {
     //标签列表
     tags: [
-          { name: '十四大', id:0 },
-          { name: '领导讲话', id:1 },
-          { name: '会议精神', id:2 },
-          { name: '党章', id:3 },
-          { name: '212专案', id:4 }
+          // { name: '十四大', id: 0 },
+          // { name: '领导讲话', id: 1 },
+          // { name: '会议精神', id: 2 },
+          // { name: '党章', id: 3 },
+          // { name: '212专案', id: 4 }
         ],
 
       //选择标签
@@ -438,6 +442,9 @@ export default {
         docName: null,
         docLevel: null,
         createYear: null,
+        params:{
+          tagId:null
+        },
       },
       // 表单参数
       form: {},
@@ -506,25 +513,49 @@ export default {
       // {
       //   tagId:tag.id,
       //   tagName:tag.name,
-      tag.name
+      tag.tagName
       // }
       );  
       this.form.tagList.push({
-        tagId:tag.id,
-        tagName:tag.name,
+        tagId:tag.tagId,
+        tagName:tag.tagName,
       });  
     },
     //自定义标签
     handleInputConfirm() {
       let inputValue = this.inputValue;
+      // if (inputValue) {
+      //   this.dynamicTags.push(inputValue);
+      // }
+      // this.inputVisible = false;
+      // this.inputValue = "";
+      // this.form.tagList.push({
+      //   tagName:inputValue,
+      // });  
+      //查询输入的标签是否存在
+    var Newtags=this.tags.find(value=>value.tagName==inputValue)
+    // console.log(a);
+    
       if (inputValue) {
         this.dynamicTags.push(inputValue);
       }
       this.inputVisible = false;
       this.inputValue = "";
+      if(Newtags){
       this.form.tagList.push({
+        tagId:Newtags.tagId,
+        tagName:Newtags.tagName,
+      });  
+    }else{
+       this.form.tagList.push({
         tagName:inputValue,
       });  
+    }
+  // console.log(this.form);
+
+
+    
+   
     },
 
     /** 转换目录信息数据结构 */
@@ -583,6 +614,11 @@ export default {
           this.levelOptions = response.rows;
         });
         this.loading = false;
+
+       //标签数据
+       listTag().then((res)=>{
+       this.tags=res.rows
+     })
       });
     },
     /**处理文档级别数据*/
@@ -647,12 +683,12 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      const para = {
-        tagId: 123, 
-      }
-      console.log(this.queryParams.params);
-      this.queryParams.params = para;
-
+      // const para = {
+      //   tagId: queryParams.params.tagId, 
+      // }
+      // this.queryParams.params = para;
+      // console.log(this.queryParams);
+      
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -661,6 +697,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.dirId = this.dirId;
       this.queryParams.searchValue = this.spaceId;
+      this.queryParams.params.tagId = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -687,7 +724,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      // console.log(this.form);
+      console.log(this.form);
       // console.log(this.dynamicTags);
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -894,6 +931,9 @@ export default {
   height: 0;
 }
 //table样式
+::v-deep .el-table {
+overflow: auto;
+}
 ::v-deep .el-table th {
   background: #016c9aa6;
   color: #2e8aec;
@@ -956,11 +996,27 @@ export default {
 ::v-deep .el-dialog__footer {
   padding: 0;
 }
+//弹窗关闭按钮
+::v-deep .el-dialog__headerbtn {
+  top: calc(100vh * (45 / 1080));
+  right: calc(100vw * (20 / 1920));
+  font-size: 20px;
+}
 ::v-deep .el-dialog5 {
   width: calc(100vw * (800 / 1920)) !important;
   height: calc(100vh * (1050 / 1080)) !important;
   background: url(../../../assets/img/Group-585.png);
   background-size: calc(100vw * (800 / 1920)) calc(100vh * (1050 / 1080));
+  //弹窗中间内容
+  .el-dialog__body {
+    // width: calc(100vw * (620 / 1920)) ;
+    height: calc(100vh * (780 / 1080));
+    margin-top: calc(100vh * (50 / 1080));
+    margin-bottom: calc(100vh * (20 / 1080));
+    padding-right: 50px;
+    overflow: auto;
+    // background: salmon;
+}
   .el-dialog__header {
     padding-bottom: 0;
   }
@@ -990,4 +1046,6 @@ export default {
   }
 }
 </style>
-  
+  
+
+

src/views1/HomeView.vue

@@ -129,9 +129,9 @@
           </el-submenu>
         </el-menu>
         <div class="right">
-          <span class="right_1">
+          <!-- <span class="right_1">
             <img src="../assets/img/2.jpg" />
-          </span>
+          </span> -->
           <span class="right_2">孙芳</span>
           <div class="right_3"></div>
           <span class="right_4">
@@ -159,6 +159,8 @@ export default {
     return {
       activeIndex: '',
       srcIndex: '',
+      // username:this.$store.username,
+
       // 图片数组
       icoUrl: 
         [
@@ -197,6 +199,9 @@ export default {
   //   personal,
   //   system
   // },
+  created(){
+    console.log(this.$cache.local.get('USERNAME')) // 输出'local value'
+  },
   methods: {
     handleSelect(key, keyPath) {
       this.srcIndex = keyPath[0];
@@ -206,7 +211,7 @@ export default {
     exit(){
       alert('你确定要注销界面吗？')
       this.$router.push('/login1')
-    }
+    },
   },
 };
 </script>

src/views1/System/User/UserView.vue

@@ -8,7 +8,7 @@
         <img src="../../../assets/img/chevron-up.png" alt="" class="top2" />
         <img src="../../../assets/img/slash.png" alt="" />
       </div>
-      <div class="title">用户管理1</div>
+      <div class="title">用户管理</div>
       <div class="main">
         <div class="app-container">
           <el-row :gutter="20">