Merge branch 'hjw-spfmui' into 'test-new'

市场工作台ui功能改造

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

src/pages/main/leader/index.vue

@@ -35,7 +35,7 @@
                 <hometask></hometask>
               </el-col>
               <el-col :span="6">
-                <numberhits :numHits="numHits"></numberhits>
+                <numberhits :numHits="numHits"  :numHits1="numHits1"  ></numberhits>
               </el-col>
             </div>
             <div v-else>
@@ -100,6 +100,7 @@ export default {
       status: true,
       dynamicTags: [], //已添加的常用功能
       numHits: [], //点击率排行
+      numHits1:[],
       menuqList: [], //有权限的菜单
       dialogStatus: false,
       datalist:[],
@@ -236,6 +237,7 @@ export default {
           }
         }
         this.numHits = newmen;
+        this.numHits1= newmen.slice(0, 10);
       });
     },
   },

src/pages/main/leader/leaderTag.vue

@@ -39,16 +39,16 @@
         ✚ 添加功能
       </el-button>
       <el-dialog
-        title="菜单配置"
+        title="添加常用功能"
         :visible.sync="menuStatus"
-        width="50%"
+        width="40%"
         :close-on-press-escape="false"
         :show-close="false"
         :destroy-on-close="true"
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div style="height: 400px; overflow: auto">
+        <div style="height: 300px; overflow: auto">
           <el-tree
             class="tree-line-style"
             :expand-on-click-node="true"
@@ -88,6 +88,59 @@
           <el-button v-show="subBtn" @click="subMenu">确 定</el-button>
         </div>
       </el-dialog>
+      <el-dialog
+        title="设置常用功能"
+        :visible.sync="setStatus"
+        width="40%"
+        :close-on-press-escape="false"
+        :show-close="false"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 300px; overflow: auto">
+          <el-tree
+            class="tree-line-style"
+            :expand-on-click-node="true"
+            :auto-expand-parent="true"
+            :default-expand-all="true"
+            draggable
+            :allow-drop="collapse"
+            :default-checked-keys="checkedMenu"
+            :data="dynamicTags"
+            show-checkbox
+            @check="checkChange"
+            node-key="functionCode"
+          >
+            <span class="custom-tree-node" slot-scope="{ node }">
+              <span>
+                <!-- <span
+                  v-if="node.data.children.length > 0"
+                  style="color: #009cff"
+                  class="iconfont icon-wenjianjia"
+                ></span> -->
+                <span
+                  style="color: #fdb441"
+                  class="iconfont icon-wenjian"
+                ></span>
+                {{ node.data.functionName }}
+              </span>
+            </span>
+          </el-tree>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            @click="
+              () => {
+                setStatus = false;
+              }
+            "
+            >取 消</el-button
+          >
+          <el-button v-show="subBtn" @click="deletMenu">删 除</el-button>
+          <el-button v-show="subBtn" @click="saveMenu">保存</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -104,17 +157,30 @@ export default {
       checkedMenu: [], // 选中节点的functionCode
       subBtn: true,
       menuStatus: false,
+      setStatus: false,
       menuList: [], // tree数据源
       checkedNodes: [],
     };
   },
   methods: {
+    collapse(moveNode, inNode, type) {//只允许拖拽
+      if (type === "inner") return;
+      if (moveNode.nextSibling === undefined) {
+        return type === "prev";
+      } else if (inNode.nextSibling === undefined) {
+        return type === "next";
+      } else if (moveNode.nextSibling.id !== inNode.id) {
+        return type === "prev";
+      } else {
+        return type === "next";
+      }
+    },
     tagrouter(e, item, index) {
       // console.log(e, item, index);
       this.$router.push(item.jspUrl);
     },
     RowTitle() {
-      console.log(11);
+      this.setStatus = true;
     },
     // 树形图 复选框监听事件
     checkChange(a, b, c, d) {
@@ -152,8 +218,55 @@ export default {
         this.menuList = newmen;
       });
     },
+    //设置 保存按钮
+    saveMenu() {
+      console.log(this.dynamicTags);
+      this.$http({
+        url: "/market/usuaFun/reSetOrder",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {
+          data: this.dynamicTags,
+        },
+      }).then((res) => {
+        if (res.data.result == 0) {
+          this.$notify({
+            title: "成功",
+            message: res.data.desc,
+            type: "success",
+          });
+          this.menuStatus = false;
+          location.reload();
+        }
+      });
+    },
+    //删除常用功能
+    deletMenu() {
+      this.$http({
+        url: "/market/usuaFun/delete",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {
+          data: this.checkedNodes,
+        },
+      }).then((res) => {
+        if (res.data.result == 0) {
+          this.$notify({
+            title: "成功",
+            message: res.data.desc,
+            type: "success",
+          });
+          this.menuStatus = false;
+          location.reload();
+        }
+      });
+    },
 
-    // 提交
+    // 提交常用功能
     subMenu() {
       // let checknode = [];
       // this.checkedNodes.map(function (item, index) {

src/pages/main/leader/numberHits.vue

@@ -3,6 +3,7 @@
     <div class="bgnum">
       <div class="bgnum1"><span>点击率排行</span></div>
       <span
+        @click="morenum"
         style="float: right; cursor: pointer; color: orange; margin-right: 10px"
         >更多>></span
       >
@@ -10,7 +11,7 @@
     <div>
       <el-table
         class="numbox1"
-        :data="numHits"
+        :data="numHits1"
         height="250"
         size="small"
         :header-cell-style="{ background: '#F2F2F2' }"
@@ -21,12 +22,14 @@
             <span style="color: #afb2d8; margin-right: 5px"
               >{{ scope.$index + 1 }}.</span
             >
-            <span @click="RowTitle(scope.row.jsp_url)" style="cursor: pointer; color: blue">{{
-              scope.row.module_name
-            }}</span>
+            <span
+              @click="RowTitle(scope.row.jsp_url)"
+              style="cursor: pointer; color: blue"
+              >{{ scope.row.module_name }}</span
+            >
           </template>
         </el-table-column>
-        <el-table-column prop="count" label="点击量" width="70" align="center" >
+        <el-table-column prop="count" label="点击量" width="70" align="center">
           <template> </template>
         </el-table-column>
       </el-table>
@@ -36,19 +39,25 @@
 
 <script>
 export default {
-  props: ["numHits"],
+  props: ["numHits","numHits1"],
   data() {
     return {
-      // numHits: [],
+      // numHits2: [],
+      dialogStatus:false,
     };
   },
   methods: {
     RowTitle(route) {
       // this.$router.push(route);
     },
+    morenum() {
+      this.numHits1 = this.numHits;
+      
+    },
+  },
+  created() {
+    // this.numHits2 = this.numHits.slice(0, 10);
   },
-  mounted(){
-  }
 };
 </script>
 <style lang="scss" scoped>