Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/Home.vue

@@ -51,7 +51,9 @@
                     style="width: 20px; line-height: 150px; padding-top: 5px"
                   />
                 </span>
-                用用户权限管理</span
+                <span style="width: 20px">1</span>
+
+                用户权限管理</span
               >
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item

src/views/common-settings/ItemType.vue

@@ -15,9 +15,9 @@
             <i class="el-icon-link" @click="append"></i><span> 项目类别</span>
           </div>
           <div style="margin-top: 20px">
-            <el-button type="" @click="addll" class="commonbutton"
+            <!-- <el-button type="" @click="addll" class="commonbutton"
               >新增同集</el-button
-            >
+            > -->
           </div>
           <el-tree
             :default-expand-all="true"
@@ -32,12 +32,19 @@
             <span slot-scope="{ node, data }">
               <span style="padding: 5px">{{ node.label }}</span>
               <span>
-                <el-button
+                 <el-button
                   type="primary"
                   size="mini"
                   style="padding: 5px; font-size: 15px; margin-left: 10%"
+                  @click="addll(node, data)"
+                  >新增同级</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  style="padding: 5px; font-size: 15px; margin-left: %"
                   @click="append(node, data)"
-                  >新增子集</el-button
+                  >新增子级</el-button
                 >
                 <el-button
                   type="danger"
@@ -69,8 +76,9 @@
           width="40%"
           :close-on-click-modal="false"
         >
-          <span>上级部门</span>
+          <span  v-if="title==2?true:false">上级部门</span>
           <el-cascader
+           v-if="title==2"
             ref="depref"
             @change="cascaderchang"
             :show-all-levels="false"
@@ -180,7 +188,7 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px" class="buttonarea">
-      <el-button type="" @click="addll" class="commonbutton">新增</el-button>
+      <!-- <el-button type="" @click="addll" class="commonbutton">新增</el-button> -->
     </div>
   </div>
 </template>
@@ -267,10 +275,24 @@ export default {
       value: "", //指引类别选择的数据
       dialogVisible: false,
       guideoptions: [],
+      tableHeight: window.innerHeight - 220, //表格动态高度
+      screenHeight: window.innerHeight, //内容区域高度
     };
   },
+  watch: {
+    // 监听screenHeight从而改变table的高度
+    screenHeight(val) {
+      this.screenHeight = val;
+      this.tableHeight = this.screenHeight - 220;
+    },
+  },
   created() {
     this.getlist();
+    return (() => {
+      // window.innerHeight:浏览器的可用高度
+      window.screenHeight = window.innerHeight;
+      this.screenHeight = window.screenHeight;
+    })();
   },
   mounted() {
     window.onresize = () => {

src/views/fee-settings/Asbitem.vue

@@ -879,13 +879,15 @@ export default {
       console.log(sampleGroupId);
       let sdate = [];
       console.log(this.rightdata, "2222");
-      let sss = { itemId: this.itemid, asbitemId: sampleGroupId };
-      sdate.push(sss);
+      // let sss = { itemId: this.itemid, asbitemId: sampleGroupId };
+      // sdate.push(sss);
       this.rightdata.forEach((element) => {
         console.log("项目元素id", element.id);
         console.log("组合项目id", sampleGroupId);
         sdate.push({ asbitemId: sampleGroupId, itemId: element.id });
-        sdate.splice(sdate[0], 1);
+      });
+      this.leftdata.forEach((element) => {
+        sdate.push({ asbitemId: sampleGroupId, itemId: element.id });
       });
       // this.leftdata.forEach((element) => {
       //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };

src/views/user-list/AuditLog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="elcard" style="border-radius: 15px" >
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">安全日志</div>
       <el-table
         :data="tableData"
@@ -78,7 +78,12 @@
         </el-table>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="queddialogVisible" class="bulletcommit">确 定</el-button>
+          <el-button
+            type="primary"
+            @click="queddialogVisible"
+            class="bulletcommit"
+            >确 定</el-button
+          >
         </span>
       </el-dialog>
       <el-pagination
@@ -151,6 +156,6 @@ export default {
 ::v-deep .el-table__header th {
   /* font-size: px; */
   background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
-  ;color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
 }
 </style>