Merge branch 'ui-tag' into 'master'

市场工作台ui改造

See merge request spfm/spfm-market-front!283

src/components/deptTreeOnly.vue

@@ -10,6 +10,7 @@
       :default-checked-keys="defaultListc"
       :default-expanded-keys="defaultListc"
       @node-click="handleNodeClick"
+      @node-expand="handleNodeClick"
       :filter-node-method="filterNode"
     >
       <span class="custom-tree-node" slot-scope="{ node, data }">

src/components/deptTreeP.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="treebox">
-        <el-tree ref="tree" @node-click="handleCheckChange" :data="treeList" node-key="o"
+        <el-tree ref="tree" @node-expand="handleNodeClick" @node-click="handleCheckChange" :data="treeList" node-key="o"
             :default-checked-keys="defaultListc" :default-expanded-keys="defaultList"></el-tree>
     </div>
 </template>

src/components/deptTreeUser.vue

@@ -3,7 +3,7 @@
         <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input>
         <el-tree :highlight-current="true" :check-strictly="true" ref="tree" @check-change="handleCheckChange"
             :data="treeList" node-key="id" :default-checked-keys="defaultListc" :default-expanded-keys="defaultListc"
-            @node-click="handleNodeClick" :filter-node-method="filterNode">
+            @node-click="handleNodeClick" @node-expand="handleNodeClick" :filter-node-method="filterNode">
             <span class="custom-tree-node" slot-scope="{ node, data }" @click="cs(node)">
                 <em style="display: inline-block;width: 20px;" v-if="node.data.haveUserFlag == 'N'&& node.data.children.length == 0"></em>
                 <i class="el-icon-caret-right" v-if="node.data.haveUserFlag == 'Y' && node.data.children.length == 0"></i>

src/components/deptTreeUserNew.vue

@@ -3,7 +3,7 @@
         <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input>
         <el-tree :highlight-current="true" :check-strictly="true" ref="tree" @check-change="handleCheckChange"
             :data="treeList" node-key="id" :default-checked-keys="defaultListc" :default-expanded-keys="defaultListc"
-            @node-click="handleNodeClick" :filter-node-method="filterNode">
+            @node-click="handleNodeClick" @node-expand="handleNodeClick" :filter-node-method="filterNode">
             <span class="custom-tree-node" slot-scope="{ node, data }" @click="cs(node)">
                 <em style="display: inline-block;width: 20px;" v-if="node.data.haveUserFlag == 'N'&& node.data.children.length == 0"></em>
                 <i class="el-icon-caret-right" v-if="node.data.haveUserFlag == 'Y' && node.data.children.length == 0"></i>

src/components/p-menu-item.vue

@@ -23,7 +23,7 @@
           </el-tooltip>
           <span v-else>{{ menu.name }}</span>
         </template>
-        <MenuTree :menuData="menu.children"></MenuTree>
+        <MenuTree style="align: center" :menuData="menu.children"></MenuTree>
       </el-submenu>
       <el-menu-item
         v-show="menu.systemflag != 1"
@@ -38,9 +38,9 @@
           :content="menu.name"
           placement="right"
           v-if="menu.name.length > 9"
-          ><span>{{ menu.name }}</span>
+          ><span style="margin-left:10px;">{{ menu.name }}</span>
         </el-tooltip>
-        <span v-else>{{ menu.name }}</span>
+        <span style="margin-left:10px;" v-else>{{ menu.name }}</span>
       </el-menu-item>
     </template>
   </div>
@@ -95,13 +95,10 @@ export default {
   border-left: 3px solid #34a0ce;
 }
 ::v-deep .el-submenu__title {
-  padding-left: 30px !important;
-
-  .el-submenu__icon-arrow {
-    position: absolute;
-    right: 8px;
-  }
-  /* background-color: #ecf5ff;
+   /* padding-left: 30px !important; */
+}
+	.el-submenu__title {
+		/* background-color: #ecf5ff;
   border-radius: 30px;
   margin-bottom: 10px; */
 }

src/components/p-tabs.vue

@@ -7,9 +7,8 @@
         :key="item.name + item.rountPath || item.jspUrl"
         :class="{
           'tab-item-active':
-            (item.rountPath == undefined
-              ? item.jspUrl
-              : item.rountPath) == getDefaultActive,
+            (item.rountPath == undefined ? item.jspUrl : item.rountPath) ==
+            getDefaultActive,
         }"
         @click="handleClick($event, item, index)"
         @contextmenu.prevent="clickright($event, item, index)"
@@ -151,21 +150,36 @@ export default {
               ? list[index - 1].rountPath
               : list[index - 1].jspUrl;
             this.$store.commit("setDefaultActive", rountPath);
-            list.splice(index, 1);
-            this.$store.commit("setTabList", list);
-            this.$router.push(rountPath);
+            if (
+              (item.rountPath == undefined ? item.jspUrl : item.rountPath) !=
+              this.getDefaultActive
+            ) {
+              list.splice(index, 1);
+              this.$store.commit("setTabList", list);
+              this.$router.push(rountPath);
+            }
           } else if (list[index + 1]) {
             let rountPath = list[index + 1].hasOwnProperty("rountPath")
               ? list[index + 1].rountPath
               : list[index + 1].jspUrl;
             this.$store.commit("setDefaultActive", rountPath);
-            list.splice(index, 1);
-            this.$store.commit("setTabList", list);
-            this.$router.push(rountPath);
+            if (
+              (item.rountPath == undefined ? item.jspUrl : item.rountPath) !=
+              this.getDefaultActive
+            ) {
+              list.splice(index, 1);
+              this.$store.commit("setTabList", list);
+              this.$router.push(rountPath);
+            }
           } else {
-            list.splice(index, 1);
-            this.$store.commit("setTabList", list);
-            this.$router.push("/");
+            if (
+              (item.rountPath == undefined ? item.jspUrl : item.rountPath) !=
+              this.getDefaultActive
+            ) {
+              list.splice(index, 1);
+              this.$store.commit("setTabList", list);
+              this.$router.push("/");
+            }
           }
         }
       }
@@ -381,7 +395,7 @@ export default {
   white-space: nowrap;
   overflow: hidden;
   // margin-top: 15px;
-  background: #f3f3f3;;
+  background: #f3f3f3;
   // padding-left: 40px;
   .tab-item {
     display: inline-block;
@@ -431,7 +445,7 @@ export default {
     }
 
     .close:hover {
-      color: #0056A9;
+      color: #0056a9;
     }
   }
 
@@ -460,9 +474,8 @@ export default {
       white-space: nowrap;
       text-overflow: ellipsis;
       // padding: 0px 16px;
-      font-weight:900;
-      color: #0056A9;
-      
+      font-weight: 900;
+      color: #0056a9;
     }
 
     .close {

src/pages/main/competitors/home.vue

@@ -1,5 +1,4 @@
-
- * @Author       : yuanrunwei
+* @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: daiqisheng
  * @LastEditTime: 2022-04-25 19:11:41
@@ -1935,4 +1934,3 @@ export default {
   }
 }
 </style>
-

src/pages/main/leader/leaderTag.vue

@@ -25,7 +25,7 @@
         >
           {{ item.icon }}
         </i>
-        <span @click="tagrouter($event, item, index)">
+        <span :title="item.functionName" @click="tagrouter($event, item, index)">
           <!-- <i class="el-icon-date"></i>  -->
           {{ item.functionName }}
         </span>
@@ -371,4 +371,4 @@ export default {
   color: #161616;
   border-color: #f2f2f2;
 }
-</style>
+</style>

src/pages/main/leader/leaderhomeTask.vue

@@ -237,7 +237,7 @@
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div style="height: 450px">
+        <div >
           <el-form :inline="true" :model="StatusList" class="demo-form-inline">
             <el-form-item label="工单标题">
               <el-input
@@ -255,14 +255,18 @@
             </el-form-item>
           </el-form>
           <h3>流程轨迹</h3>
-          <el-table :data="WorkOrderList" style="width: 100%" max-height="350">
+          <el-table :data="WorkOrderList" style="width: 100%" max-height="350" height="300">
             <el-table-column prop="createTime" label="节点开始时间" />
             <el-table-column prop="stepName" label="节点名称" width="180" />
             <el-table-column prop="assigneeName" label="处理角色" width="180" />
             <el-table-column prop="opTime" label="处理时间" />
           </el-table>
-          <el-button class="diobtn" @click="dlogStatus()">处理</el-button>
+        
+        </div>
+        <div class="diobtn">
+           <el-button  @click="dlogStatus()">处理</el-button>
         </div>
+         
       </el-dialog>
       <!-- 查看已办弹窗 -->
       <el-dialog
@@ -275,8 +279,8 @@
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div style="height: 450px">
-          <el-form :inline="true" :model="StatusList" class="demo-form-inline">
+        <div >
+          <el-form :inline="true" :model="StatusList" class="demo-form-inline" >
             <el-form-item label="工单标题">
               <el-input
                 v-model="StatusList.woTitle"
@@ -293,14 +297,18 @@
             </el-form-item>
           </el-form>
           <h3>流程轨迹</h3>
-          <el-table :data="DoneList" style="width: 100%" max-height="350">
+          <el-table :data="DoneList" style="width: 100%" max-height="350" height="300">
             <el-table-column prop="createTime" label="节点开始时间" />
             <el-table-column prop="stepName" label="节点名称" width="180" />
             <el-table-column prop="assigneeName" label="处理角色" width="180" />
             <el-table-column prop="opTime" label="处理时间" />
           </el-table>
-          <el-button class="diobtn" @click="dlogStatus()">查看详情</el-button>
+        
+        </div>
+        <div class="diobtn">
+          <el-button @click="dlogStatus()">查看详情</el-button>
         </div>
+          
       </el-dialog>
       <!-- 查看发起弹窗 -->
       <el-dialog
@@ -313,7 +321,7 @@
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div style="height: 450px">
+        <div >
           <el-form :inline="true" :model="StatusList" class="demo-form-inline">
             <el-form-item label="工单标题">
               <el-input
@@ -331,7 +339,7 @@
             </el-form-item>
           </el-form>
           <h3>流程轨迹</h3>
-          <el-table :data="launchList" style="width: 100%" max-height="350">
+          <el-table :data="launchList" style="width: 100%" max-height="350" height="300">
             <el-table-column prop="createTime" label="节点开始时间" />
             <el-table-column prop="stepName" label="节点名称" width="180" />
             <el-table-column prop="assigneeName" label="处理角色" width="180" />
@@ -615,8 +623,11 @@ export default {
 
 <style lang="scss" scoped>
 .diobtn {
-  float: right;
-  margin-right: 30px;
+  position: relative;
+  text-align: right;
+//  display: flex;
+//     justify-content: end;
+  margin-top: 10px;
 }
 .taskbox {
   width: 100%;
@@ -717,13 +728,13 @@ export default {
   background: #fafafa;
 }
 
-::v-deep .el-table--scrollable-y .el-table__body-wrapper {
-  overflow: hidden;
-}
-::v-deep .el-table th>.cell{
-  padding:0px;
-}
-::v-deep .el-table__body-wrapper .is-scrolling-left{
-  overflow-x: hidden;
-}
+// ::v-deep .el-table--scrollable-y .el-table__body-wrapper {
+//   overflow: hidden;
+// }
+// ::v-deep .el-table th>.cell{
+//   padding:0px;
+// }
+// ::v-deep .el-table__body-wrapper .is-scrolling-left{
+//   overflow-x: hidden;
+// }
 </style>

src/pages/main/leader/numberHits.vue

@@ -198,7 +198,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="count" label="点击量" width="70" align="center">
+        <el-table-column prop="count" label="本月点击量" width="130" align="center">
           <template> </template>
         </el-table-column>
       </el-table>
@@ -292,4 +292,4 @@ export default {
   padding-left:0px ;
   padding-right:0px ;
 }
-</style>
+</style>

src/pages/main/noticec/index.vue

@@ -238,6 +238,7 @@
                 this.dialogCli(2);
                 this.dialogStatus = false;
                 this.defaultList = [];
+                 this.dialogInfo = false;
 				this.depttype = 0;
             },
             //搜索数据

src/pages/main/sysRoleInfo/roleList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <fullscreen :fullscreen.sync="fullscreen" class="container-box">
+    <fullscreen :page-only="pageOnly" :teleport="teleport"  :fullscreen.sync="fullscreen" class="container-box">
       <div class="titbox">
         <h2 class="font-ui">角色管理</h2>
         <div>
@@ -80,7 +80,8 @@
       :close-on-press-escape="false"
       :show-close="false"
       :destroy-on-close="true"
-      :modal-append-to-body="false"
+      :append-to-body='true'
+      :modal-append-to-body="true"
       :close-on-click-modal="false"
     >
       <p-form
@@ -103,7 +104,8 @@
       :close-on-press-escape="false"
       :show-close="false"
       :destroy-on-close="true"
-      :modal-append-to-body="false"
+      :append-to-body='true'
+      :modal-append-to-body="true"
       :close-on-click-modal="false"
     >
       <div style="height: 400px; overflow: auto">
@@ -160,6 +162,8 @@ export default {
   data() {
     return {
       loading: false,
+      teleport:true,
+
       defaultProps: {
         children: "children",
         label: "functionName",
@@ -485,7 +489,10 @@ export default {
     }
   }
 }
-
+ .search{
+  display: flex;
+  justify-content:space-between;
+ }
 .tabbox {
   margin-top: 15px;
 }