Quellcode durchsuchen

首页新代办

hujunwei@agilestar.cn vor 1 Jahr
Ursprung
Commit
cffbab45e9

+ 49 - 157
src/pages/main/leader/index.vue

@@ -4,73 +4,48 @@
       <div class="mc-top">
         <div class="mc-top-left">
           <el-row>
-            <el-col :span="5">
-              <div
-                style="background-color: #fff;height:280px;margin: 10px 10px 0px 0px;border-radius: 10px;padding: 25px 5px 5px 5px;">
-                <div class="leaderuser"> 你好,{{ username }}</div>
-                <div class="usericon"><i class="el-icon-phone"></i>:{{ phone }}</div>
-                <div class="usericon"><i class="el-icon-user-solid"></i>:{{ userdept }}</div>
-              </div>
-            </el-col>
-            <el-col :span="13" style="padding-right: 8px">
-              <!-- <div v-if="indexstatus == 'IT'">
-                <rli></rli>
-              </div>
-              <div v-if="indexstatus == 'default'">
-                <rlinet></rlinet>
-              </div>
-              <div v-if="indexstatus == 'ZQ'"> -->
-                <rliZQ></rliZQ>
-              <!-- </div> -->
-            </el-col>
-            <el-col :span="6">
-              <div class="car-line-knowledge">
-                <div class="tit" v-if="noticeData.length != 0">
-                  <span style="font-weight: bold">公告</span>
-                  <span style=" font-size: 10px; color:  rgb(82, 212, 252);  margin-left: 20px;  cursor: pointer; "
-                    @click="jNotice('/noticec')">更多</span>
-                </div>
-                <div class="car-box" v-for="item in noticeData" :key="item.noticeId">
-                  <span :title="item.noticeTitle" class="car-box-span"
-                    style="color: #606266; font-size: 14px; cursor: pointer" @click="uploadsee(item)">{{
-                      item.noticeTitle }}</span>
-                  <span style="color: #606266;  font-size: 12px;float: right;cursor: auto;">
-                    {{ item.auditTime }}
-                  </span>
-                </div>
-                <div v-if="noticeData.length == 0" style="text-align: center">
-                  <div class="tit">
-                    <span style="font-weight: bold">公告</span>
+            <el-col :span="24">
+              <div class="car-line">
+                <el-carousel height="40px" direction="vertical" trigger="click" v-if="noticeData.length != '0'">
+                  <el-carousel-item v-for="item in noticeData" :key="item.noticeId">
+                    <div class="car-box">
+                      <i class="el-icon-message-solid"></i>
+                      <span>公告</span>
+                      <span style="color: #0b82ff" @click="uploadsee(item)">{{
+                        item.noticeTitle
+                      }}</span>
+                      <span @click="jNotice">更多</span>
+                    </div>
+                  </el-carousel-item>
+                </el-carousel>
+                <div height="40px" direction="vertical" trigger="click" v-if="noticeData.length == '0'">
+
+                  <div class="car-box" style="text-align: center;">
+                    暂无公告
                   </div>
-                  <img src="../../../assets/404.png" width="100%" alt="" />
-                  <div>暂无数据</div>
                 </div>
               </div>
             </el-col>
           </el-row>
           <el-row>
-          </el-row>
-          <el-row type="flex" v-if="indexstatus == 'default'">
-            <el-col :span="18">
-              <el-row style="background-color:#fff ;margin: 10px 0px; border-radius: 10px">
-                <leaderTag :dynamicTags="dynamicTags"></leaderTag>
-              </el-row>
-              <el-row style="margin-top: 10px;">
-                <hometask></hometask>
-              </el-row>
-            </el-col>
-            <el-col :span="6" style="background: #fafafa;border-radius: 10px;margin: 10px 0px 0px 10px;">
-              <numberhits :numHits="numHits" :numHits1="numHits1"></numberhits>
-            </el-col>
-            <div style="clear:both;"></div>
-          </el-row>
-          <el-row v-else>
-            <el-col :span="24" style="background: #fff; margin-top: 10px; border-radius: 10px">
+            <el-col :span="24" style="background: #fff; margin-top: 10px; border-radius: 5px">
               <leaderTag :dynamicTags="dynamicTags"></leaderTag>
             </el-col>
-            <el-col :span="24">
-              <hometask></hometask>
-            </el-col>
+          </el-row>
+          <el-row>
+            <div v-if="indexstatus == 'default'">
+              <el-col :span="18">
+                <hometask></hometask>
+              </el-col>
+              <el-col :span="6">
+                <numberhits :numHits="numHits" :numHits1="numHits1"></numberhits>
+              </el-col>
+            </div>
+            <div v-else>
+              <el-col :span="24">
+                <hometask></hometask>
+              </el-col>
+            </div>
           </el-row>
           <el-row style="margin-top: 10px">
             <ProcessingInstruction></ProcessingInstruction>
@@ -97,9 +72,6 @@ import ProcessingInstruction from "./leaderHprocess.vue";
 import hometask from "./leaderhomeTask.vue";
 import numberhits from "./numberHits.vue";
 import leaderTag from "./leaderTag.vue";
-import rli from "./rli.vue";
-import rlinet from "./rlinet.vue";
-import rliZQ from "./rliZQ.vue";
 import notiCheck from "../../../components/notiCheck.vue";
 import uploadDown from "../../../components/uploadDown";
 
@@ -109,9 +81,6 @@ export default {
     hometask,
     numberhits,
     leaderTag,
-    rli,
-    rlinet,
-    rliZQ,
     notiCheck,
     uploadDown,
   },
@@ -126,9 +95,6 @@ export default {
       dialogStatus: false,
       datalist: [],
       infolist: {},
-      username: JSON.parse(sessionStorage.getItem("userInfo")).loginName,
-      phone: '',
-      userdept: '',
     };
   },
   methods: {
@@ -139,7 +105,7 @@ export default {
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + 1 + '","pageSize":"5"}',
+          page: '{"pageNo":"' + 1 + '","pageSize":"10"}',
         },
         data: {
           sts: 2,
@@ -196,36 +162,6 @@ export default {
         this.dynamicTags = res.data;
       });
     },
-    //获取部门,电话
-    //获取员工信息
-    getuser() {
-      this.$http({
-        url: "/market/tygdProProcess/getPhone",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }).then((res) => {
-        this.phone = res.data
-      })
-      this.$http({
-        url: "/sysmgr/csysdept/queryGroupListByLoginNo",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        data: {},
-      }).then((res) => {
-        let a = res.data[0].description.split('/')
-        if (a.length == 3) {
-          this.dept = a[1]
-          this.userdept = a[1] + '/' + a[2]
-        } else {
-          this.dept = a[1]
-          this.userdept = a[1]
-        }
-      });
-    },
     //获取点击量
     getnumberHit() {
       // this.$http({
@@ -280,7 +216,6 @@ export default {
     },
   },
   mounted() {
-    this.getuser();
     this.getNotice();
     this.getTags();
     this.getnumberHit();
@@ -301,23 +236,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.usericon {
-  margin: 15px 0;
-  text-align: center;
-}
-
-.leaderuser {
-  color: #fff;
-  line-height: 100px;
-  text-align: center;
-  height: 100px;
-  font-size: 20px;
-  width: 75%;
-  background-color: #429DFF;
-  border-radius: 10px;
-  margin: 15px auto;
-}
-
 .mc-wrap {
   box-sizing: border-box !important;
   margin: 0;
@@ -333,15 +251,6 @@ export default {
     overflow-y: scroll;
     padding: 0 0 0 15px;
   }
-
-  .tit {
-    height: 30px;
-    background: #fff;
-    line-height: 35px;
-    padding: 0 20px;
-    display: flex;
-    justify-content: space-between;
-  }
 }
 
 .mc-top {
@@ -366,47 +275,30 @@ export default {
   }
 }
 
-
-.car-line-knowledge {
-  min-height: 280px;
-  max-height: 280px;
+.car-line {
+  height: 40px;
   background: #fff;
-  margin: 10px 0px 0px 2px;
-  border-radius: 10px;
-  overflow-y: auto;
+  border-radius: 5px;
+  // margin: 10px 0 0 0;
 
   .car-box {
     padding: 0 20px;
-    line-height: 44px;
-    height: 44px;
+    line-height: 40px;
     color: #333;
-    border-bottom: 1px solid #c1abfc;
 
-    .car-box-span {
-      float: left;
-      color: #0b82ff;
-      font-size: 14px;
+    span {
       cursor: pointer;
-      display: inline-block; //成为“块级”元素(block-level);span元素的默认display属性值为“inline”,
-      max-width: 13em; //限制字数
-      overflow: hidden; //对溢出内容的隐藏
-      white-space: nowrap; //只保留一个空白,文本不会换行,会在在同一行上继续,直到遇到br标签为止。
-      text-overflow: ellipsis //使得超出部分用“ … ”代替
+      margin-right: 20px;
     }
 
-    // span {
-    //   cursor: pointer;
-    //   margin-right: 20px;
-    // }
-
-    // span:first-child {
-    //   cursor: auto;
-    // }
+    span:first-child {
+      cursor: auto;
+    }
 
-    // span:last-child {
-    //   float: right;
-    //   margin-right: 0;
-    // }
+    span:last-child {
+      float: right;
+      margin-right: 0;
+    }
   }
 }
 </style>

+ 402 - 0
src/pages/main/leader/indexs.vue

@@ -0,0 +1,402 @@
+<template>
+    <div class="mc-wrap">
+        <div class="container-box">
+            <div class="mc-top">
+                <div class="mc-top-left">
+                    <el-row>
+                        <el-col :span="5">
+                            <div
+                                style="background-color: #fff;height:280px;margin: 10px 10px 0px 0px;border-radius: 10px;padding: 25px 5px 5px 5px;">
+                                <div class="leaderuser"> 你好,{{ username }}</div>
+                                <div class="usericon"><i class="el-icon-phone"></i>:{{ phone }}</div>
+                                <div class="usericon"><i class="el-icon-user-solid"></i>:{{ userdept }}</div>
+                            </div>
+                        </el-col>
+                        <el-col :span="13" style="padding-right: 8px">
+                            <rliZQ></rliZQ>
+                        </el-col>
+                        <el-col :span="6">
+                            <div class="car-line-knowledge">
+                                <div class="tit" v-if="noticeData.length != 0">
+                                    <span style="font-weight: bold">公告</span>
+                                    <span
+                                        style=" font-size: 10px; color:  rgb(82, 212, 252);  margin-left: 20px;  cursor: pointer; "
+                                        @click="jNotice('/noticec')">更多</span>
+                                </div>
+                                <div class="car-box" v-for="item in noticeData" :key="item.noticeId">
+                                    <span :title="item.noticeTitle" class="car-box-span"
+                                        style="color: #606266; font-size: 14px; cursor: pointer" @click="uploadsee(item)">{{
+                                            item.noticeTitle }}</span>
+                                    <span style="color: #606266;  font-size: 12px;float: right;cursor: auto;">
+                                        {{ item.auditTime }}
+                                    </span>
+                                </div>
+                                <div v-if="noticeData.length == 0" style="text-align: center">
+                                    <div class="tit">
+                                        <span style="font-weight: bold">公告</span>
+                                    </div>
+                                    <img src="../../../assets/404.png" width="100%" alt="" />
+                                    <div>暂无数据</div>
+                                </div>
+                            </div>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                    </el-row>
+                    <el-row type="flex" v-if="indexstatus == 'default'">
+                        <el-col :span="18">
+                            <el-row style="background-color:#fff ;margin: 10px 0px; border-radius: 10px">
+                                <leaderTag :dynamicTags="dynamicTags"></leaderTag>
+                            </el-row>
+                            <el-row style="margin-top: 10px;">
+                                <hometask></hometask>
+                            </el-row>
+                        </el-col>
+                        <el-col :span="6" style="background: #fafafa;border-radius: 10px;margin: 10px 0px 0px 10px;">
+                            <numberhits :numHits="numHits" :numHits1="numHits1"></numberhits>
+                        </el-col>
+                        <div style="clear:both;"></div>
+                    </el-row>
+                    <el-row v-else>
+                        <el-col :span="24" style="background: #fff; margin-top: 10px; border-radius: 10px">
+                            <leaderTag :dynamicTags="dynamicTags"></leaderTag>
+                        </el-col>
+                        <el-col :span="24">
+                            <hometask></hometask>
+                        </el-col>
+                    </el-row>
+                    <el-row style="margin-top: 10px">
+                        <ProcessingInstruction></ProcessingInstruction>
+                    </el-row>
+                </div>
+            </div>
+        </div>
+        <el-dialog title="公告" :visible.sync="dialogStatus" width="50%" :close-on-press-escape="false" :show-close="true"
+            :destroy-on-close="true" :modal-append-to-body="false" :close-on-click-modal="false" :fullscreen="true">
+            <el-form :model="infolist" ref="infolist">
+                <div style="height: calc(100vh - 180px); overflow-y: scroll">
+                    <notiCheck :infolist="infolist" :datalist="datalist" :dialogInfo="dialogStatus"></notiCheck>
+                </div>
+            </el-form>
+            <div class="myfooter" style="text-align: right; margin: 20px 20px 0 0">
+                <el-button @click="dialogStatus = false">确 定</el-button>
+                <el-button @click="dialogStatus = false">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import ProcessingInstruction from "./leaderHprocess.vue";
+import hometask from "./leaderhomeTask.vue";
+import numberhits from "./numberHits.vue";
+import leaderTag from "./leaderTag.vue";
+import rliZQ from "./rliZQ.vue";
+import notiCheck from "../../../components/notiCheck.vue";
+import uploadDown from "../../../components/uploadDown";
+
+export default {
+    components: {
+        ProcessingInstruction,
+        hometask,
+        numberhits,
+        leaderTag,
+        rliZQ,
+        notiCheck,
+        uploadDown,
+    },
+    data() {
+        return {
+            noticeData: [], // 公告数据源
+            indexstatus: '',
+            dynamicTags: [], //已添加的常用功能
+            numHits: [], //点击率排行
+            numHits1: [],
+            menuqList: [], //有权限的菜单
+            dialogStatus: false,
+            datalist: [],
+            infolist: {},
+            username: JSON.parse(sessionStorage.getItem("userInfo")).loginName,
+            phone: '',
+            userdept: '',
+        };
+    },
+    methods: {
+        //获取公告  分部门展示
+        getNotice() {
+            this.$http({
+                url: "/sysmgr/cnotice/queryListPage",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                    page: '{"pageNo":"' + 1 + '","pageSize":"5"}',
+                },
+                data: {
+                    sts: 2,
+                },
+            }).then((res) => {
+                this.noticeData = res.data.data;
+            });
+        },
+        //预览公告
+        uploadsee(v) {
+            this.dialogStatus = true;
+            this.infolist = v;
+            this.$http({
+                url: "/sysmgr/cnotice/queryInfo",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {
+                    noticeId: v.noticeId,
+                },
+            }).then((res) => {
+                this.uploadstatus = !this.uploadstatus;
+                this.datalist.attList = [];
+                this.datalist.attList = res.data.attList;
+                // if(res.data.attList){
+                //     res.data.attList.forEach(item => {
+                //         this.attList.push({
+                //             name: item.fileName,
+                //             url: '',
+                //             id: item.id,
+                //             fileName: item.fileName
+                //         });
+                //     })
+                //     this.datalist.attList = this.attList;
+                //     console.log(this.datalist.attList)
+                // }
+            });
+        },
+        jNotice() {
+            this.$router.push("/noticec");
+            // this.setabList("公告管理","/noticec");
+        },
+        //获取初始Tags
+        getTags() {
+            this.$http({
+                url: "/market/usuaFun/queryFun",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {},
+            }).then((res) => {
+                this.dynamicTags = res.data;
+            });
+        },
+        //获取部门,电话
+        //获取员工信息
+        getuser() {
+            this.$http({
+                url: "/market/tygdProProcess/getPhone",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            }).then((res) => {
+                this.phone = res.data
+            })
+            this.$http({
+                url: "/sysmgr/csysdept/queryGroupListByLoginNo",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {},
+            }).then((res) => {
+                let a = res.data[0].description.split('/')
+                if (a.length == 3) {
+                    this.dept = a[1]
+                    this.userdept = a[1] + '/' + a[2]
+                } else {
+                    this.dept = a[1]
+                    this.userdept = a[1]
+                }
+            });
+        },
+        //获取点击量
+        getnumberHit() {
+            // this.$http({
+            //   url: "/sysmgr/sys/login/auth/functions",
+            //   method: "post",
+            //   headers: {
+            //     "Content-Type": "application/json",
+            //   },
+            //   data: {
+            //     // roleCode: val.roleCode,
+            //     // roleCode: "647733085966045184"
+            //   },
+            // }).then((res) => {
+            //   let men = res.data.functions;
+            //   let newmen = [];
+            //   for (let i in men) {
+            //     if (men[i].jspUrl != "#") {
+            //       newmen.push(men[i]);
+            //     }
+            //   }
+            //   console.log("array", newmen);
+            //   this.menuqList = newmen;
+            //   let newmen1 = [];
+            //   for (let b in this.menuqList) {
+            //     for (let a in this.numHits) {
+            //       if (this.menuqList[b].jspUrl == this.numHits[a].jsp_url) {
+            //         newmen1.push(this.numHits[a]);
+            //       }
+            //     }
+            //   }
+            //   console.log(this.numHits)
+            //   console.log([...newmen1]);
+            // });
+            this.$http({
+                url: "/market/clickRate/queryClickRate",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {},
+            }).then((res) => {
+                let men = res.data;
+                let newmen = [];
+                for (let i in men) {
+                    if (men[i].jspUrl != "#") {
+                        newmen.push(men[i]);
+                    }
+                }
+                this.numHits = newmen;
+                this.numHits1 = newmen.slice(0, 10);
+            });
+        },
+    },
+    mounted() {
+        this.getuser();
+        this.getNotice();
+        this.getTags();
+        this.getnumberHit();
+    },
+    created() {
+        this.$http({
+            url: "/market/cmkline/queryMkLineGroupNameInfo",
+            method: "post",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            data: {},
+        }).then((res) => {
+            this.indexstatus = res.data.groupName;
+        });
+    }
+};
+</script>
+  
+<style lang="scss" scoped>
+.usericon {
+    margin: 15px 0;
+    text-align: center;
+}
+
+.leaderuser {
+    color: #fff;
+    line-height: 100px;
+    text-align: center;
+    height: 100px;
+    font-size: 20px;
+    width: 75%;
+    background-color: #429DFF;
+    border-radius: 10px;
+    margin: 15px auto;
+}
+
+.mc-wrap {
+    box-sizing: border-box !important;
+    margin: 0;
+    height: calc(100vh - 120px);
+    overflow: hidden;
+    width: 100%;
+    padding-right: 10px;
+
+    .container-box {
+        width: 100%;
+        height: calc(100% - 40px);
+        margin-top: 10px;
+        overflow-y: scroll;
+        padding: 0 0 0 15px;
+    }
+
+    .tit {
+        height: 30px;
+        background: #fff;
+        line-height: 35px;
+        padding: 0 20px;
+        display: flex;
+        justify-content: space-between;
+    }
+}
+
+.mc-top {
+    display: flex;
+    width: 100%;
+}
+
+.mc-wrap .mc-top-left {
+    width: 100%;
+    margin-right: 15px;
+}
+
+.mc-wrap .mc-top-right {
+    width: calc(20% - 15px);
+    background-color: white;
+    overflow: hidden;
+
+    .inner-box {
+        width: calc(100% + 20px);
+        background-color: white;
+        overflow-y: scroll;
+    }
+}
+
+
+.car-line-knowledge {
+    min-height: 280px;
+    max-height: 280px;
+    background: #fff;
+    margin: 10px 0px 0px 2px;
+    border-radius: 10px;
+    overflow-y: auto;
+
+    .car-box {
+        padding: 0 20px;
+        line-height: 44px;
+        height: 44px;
+        color: #333;
+        border-bottom: 1px solid #c1abfc;
+
+        .car-box-span {
+            float: left;
+            color: #0b82ff;
+            font-size: 14px;
+            cursor: pointer;
+            display: inline-block; //成为“块级”元素(block-level);span元素的默认display属性值为“inline”,
+            max-width: 13em; //限制字数
+            overflow: hidden; //对溢出内容的隐藏
+            white-space: nowrap; //只保留一个空白,文本不会换行,会在在同一行上继续,直到遇到br标签为止。
+            text-overflow: ellipsis //使得超出部分用“ … ”代替
+        }
+
+        // span {
+        //   cursor: pointer;
+        //   margin-right: 20px;
+        // }
+
+        // span:first-child {
+        //   cursor: auto;
+        // }
+
+        // span:last-child {
+        //   float: right;
+        //   margin-right: 0;
+        // }
+    }
+}
+</style>
+  

+ 107 - 59
src/pages/main/leader/leaderTag.vue

@@ -2,27 +2,64 @@
   <div class="numbox">
     <div class="numboxx">
       <span>常用功能</span>
-      <span @click="RowTitle" style="float: right; cursor: pointer; color: rgb(82, 212, 252)">设置>></span>
+      <span
+        @click="RowTitle"
+        style="float: right; cursor: pointer; color: rgb(82, 212, 252)"
+        >设置>></span
+      >
     </div>
     <div class="foxbox">
-      <el-tag v-for="(item, index) in dynamicTags" :key="index" size="large" type="info" class="tags"
-        :disable-transitions="false">
-        <i @click="tagrouter($event, item, index)" class="icon" v-if="item.icon" v-html="item.icon">
-          <!-- {{ item.icon }} -->
+      <el-tag
+        v-for="(item, index) in dynamicTags"
+        :key="index"
+        size="large"
+        type="info"
+        class="tags"
+        :disable-transitions="false"
+      >
+        <i
+          @click="tagrouter($event, item, index)"
+          class="icon"
+          v-if="item.icon"
+          v-html="item.icon"
+        >
+          {{ item.icon }}
         </i>
-        <span :title="item.functionName" @click="tagrouter($event, item, index)" style="display: inline-block;">
+        <span :title="item.functionName" @click="tagrouter($event, item, index)">
           <!-- <i class="el-icon-date"></i>  -->
           {{ item.functionName }}
         </span>
       </el-tag>
-      <el-button class="button-new-tag" type="info" size="small" @click="showMenu()" icon="el-icon-plus">添加功能
+      <el-button
+        class="button-new-tag"
+        type="info"
+        size="small"
+        @click="showMenu()"
+      >
+        ✚ 添加功能
       </el-button>
-      <el-dialog title="添加常用功能" :visible.sync="menuStatus" width="40%" :close-on-press-escape="false" :show-close="false"
-        :destroy-on-close="true" :modal-append-to-body="false" :close-on-click-modal="false">
+      <el-dialog
+        title="添加常用功能"
+        :visible.sync="menuStatus"
+        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" :default-checked-keys="checkedMenu" :data="menuList" show-checkbox
-            @check="checkChange" node-key="functionCode">
+          <el-tree
+            class="tree-line-style"
+            :expand-on-click-node="true"
+            :auto-expand-parent="true"
+            :default-expand-all="true"
+            :default-checked-keys="checkedMenu"
+            :data="menuList"
+            show-checkbox
+            @check="checkChange"
+            node-key="functionCode"
+          >
             <span class="custom-tree-node" slot-scope="{ node }">
               <span>
                 <!-- <span
@@ -30,27 +67,51 @@
                   style="color: #009cff"
                   class="iconfont icon-wenjianjia"
                 ></span> -->
-                <span style="color: #fdb441" class="iconfont icon-wenjian"></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="
-            () => {
-              menuStatus = false;
-            }
-          ">取 消</el-button>
+          <el-button
+            @click="
+              () => {
+                menuStatus = false;
+              }
+            "
+            >取 消</el-button
+          >
           <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">
+      <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">
+          <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
@@ -58,18 +119,24 @@
                   style="color: #009cff"
                   class="iconfont icon-wenjianjia"
                 ></span> -->
-                <span style="color: #fdb441" class="iconfont icon-wenjian"></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
+            @click="
+              () => {
+                setStatus = false;
+              }
+            "
+            >取 消</el-button
+          >
           <el-button v-show="subBtn" @click="deletMenu">删 除</el-button>
           <el-button v-show="subBtn" @click="saveMenu">保存</el-button>
         </div>
@@ -230,23 +297,17 @@ export default {
       });
     },
   },
-  mounted() { },
+  mounted() {},
 };
 </script>
 <style lang="scss" scoped>
-svg {
-  height: 60px !important;
-  width: 60px !important;
-}
-
 .numbox {
   width: 100%;
   background: #fff;
   margin-top: 10px;
-  margin-bottom: 10px;
-  // padding: 10px 0;
+  // padding-top: 10px;
   padding-left: 10px;
-  border-radius: 10px;
+  border-radius: 5px;
 
   .numboxx {
     border-bottom: 1px solid #e1e1e1;
@@ -256,53 +317,42 @@ svg {
     font-size: 16px;
     font-weight: 600;
   }
-
   .foxbox {
     background: #fff;
     margin-left: 5px;
   }
-
   .tags {
     margin: 5px;
     float: left;
     width: 165px;
     padding: 0;
-    height: 100px;
-    display: flex;
-    flex-direction: column;
-
+    height: 50px;
     // background: url(../../../../src/assets/djlph-bt-bj.jpg) no-repeat 5px center;
     span {
       cursor: pointer;
       display: inline-block;
       font-size: 14px;
-      // line-height: 50px;
-      text-align: center;
+      line-height: 50px;
       overflow: hidden;
-      text-overflow: ellipsis;
-      /*超出部分省略号表示*/
-      // width: 110px;
-      // text-align: left;
+      text-overflow: ellipsis; /*超出部分省略号表示*/
+      width: 110px;
+      text-align: left;
     }
-
     .icon {
       float: left;
-      margin: 0px 50px;
-      width: 60px;
-      height: 60px;
+      width: 50px;
+      height: 50px;
       cursor: pointer;
     }
   }
-
   .button-new-tag {
     margin: 5px;
     width: 165px;
     float: left;
-    height: 100px;
+    height: 50px;
     font-size: 16px;
   }
 }
-
 .el-button--info,
 .el-button--info:focus,
 .el-button--info.is-active,
@@ -311,13 +361,11 @@ svg {
   color: #161616;
   border-color: #f2f2f2;
 }
-
 .el-button--info:hover {
   background: #66a4a7;
   border-color: #66a4a7;
   color: #161616;
 }
-
 .el-tag--info {
   background: #f2f2f2;
   color: #161616;

+ 327 - 0
src/pages/main/leader/leaderTags.vue

@@ -0,0 +1,327 @@
+<template>
+    <div class="numbox">
+      <div class="numboxx">
+        <span>常用功能</span>
+        <span @click="RowTitle" style="float: right; cursor: pointer; color: rgb(82, 212, 252)">设置>></span>
+      </div>
+      <div class="foxbox">
+        <el-tag v-for="(item, index) in dynamicTags" :key="index" size="large" type="info" class="tags"
+          :disable-transitions="false">
+          <i @click="tagrouter($event, item, index)" class="icon" v-if="item.icon" v-html="item.icon">
+            <!-- {{ item.icon }} -->
+          </i>
+          <span :title="item.functionName" @click="tagrouter($event, item, index)" style="display: inline-block;">
+            <!-- <i class="el-icon-date"></i>  -->
+            {{ item.functionName }}
+          </span>
+        </el-tag>
+        <el-button class="button-new-tag" type="info" size="small" @click="showMenu()" icon="el-icon-plus">添加功能
+        </el-button>
+        <el-dialog title="添加常用功能" :visible.sync="menuStatus" 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" :default-checked-keys="checkedMenu" :data="menuList" 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="
+              () => {
+                menuStatus = false;
+              }
+            ">取 消</el-button>
+            <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>
+  
+  <script>
+  export default {
+    props: ["dynamicTags"],
+    data() {
+      return {
+        // dynamicTags: [],
+        inputVisible: false,
+        inputValue: "",
+        roleData: "", // 某一条数据
+        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() {
+        this.setStatus = true;
+      },
+      // 树形图 复选框监听事件
+      checkChange(a, b, c, d) {
+        this.checkedNodes = b.checkedNodes;
+        let list = {};
+        for (let i = 0; i < b.halfCheckedNodes.length; i++) {
+          list = Object.assign({}, b.halfCheckedNodes[i]);
+          list.children = "";
+          this.checkedNodes.push(list);
+        }
+      },
+      // 弹出菜单配置弹窗
+      showMenu() {
+        this.checkedMenu = [];
+        this.menuStatus = true;
+        this.$http({
+          url: "/sysmgr/sys/login/auth/functions",
+          method: "post",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          data: {
+            // roleCode: val.roleCode,
+            // roleCode: "647733085966045184"
+          },
+        }).then((res) => {
+          let men = res.data.functions;
+          let newmen = [];
+          for (let i in men) {
+            if (men[i].jspUrl != "#") {
+              newmen.push(men[i]);
+            }
+          }
+          // console.log("array", newmen);
+          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.setStatus = 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.setStatus = false;
+            location.reload();
+          }
+        });
+      },
+  
+      // 提交常用功能
+      subMenu() {
+        // let checknode = [];
+        // this.checkedNodes.map(function (item, index) {
+        //   console.log(item.jspUrl); // 1
+        //   checknode.push(item.jspUrl);
+        //   checknode.push(item.functionName);
+        // });
+        // console.log(checknode)
+        this.$http({
+          url: "/market/usuaFun/save",
+          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();
+          }
+        });
+      },
+    },
+    mounted() { },
+  };
+  </script>
+  <style lang="scss" scoped>
+  svg {
+    height: 60px !important;
+    width: 60px !important;
+  }
+  
+  .numbox {
+    width: 100%;
+    background: #fff;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    // padding: 10px 0;
+    padding-left: 10px;
+    border-radius: 10px;
+  
+    .numboxx {
+      border-bottom: 1px solid #e1e1e1;
+      padding-bottom: 5px;
+      padding-left: 5px;
+      padding-right: 5px;
+      font-size: 16px;
+      font-weight: 600;
+    }
+  
+    .foxbox {
+      background: #fff;
+      margin-left: 5px;
+    }
+  
+    .tags {
+      margin: 5px;
+      float: left;
+      width: 165px;
+      padding: 0;
+      height: 100px;
+      display: flex;
+      flex-direction: column;
+  
+      // background: url(../../../../src/assets/djlph-bt-bj.jpg) no-repeat 5px center;
+      span {
+        cursor: pointer;
+        display: inline-block;
+        font-size: 14px;
+        // line-height: 50px;
+        text-align: center;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        /*超出部分省略号表示*/
+        // width: 110px;
+        // text-align: left;
+      }
+  
+      .icon {
+        float: left;
+        margin: 0px 50px;
+        width: 60px;
+        height: 60px;
+        cursor: pointer;
+      }
+    }
+  
+    .button-new-tag {
+      margin: 5px;
+      width: 165px;
+      float: left;
+      height: 100px;
+      font-size: 16px;
+    }
+  }
+  
+  .el-button--info,
+  .el-button--info:focus,
+  .el-button--info.is-active,
+  .el-button--info:active {
+    background: #f2f2f2;
+    color: #161616;
+    border-color: #f2f2f2;
+  }
+  
+  .el-button--info:hover {
+    background: #66a4a7;
+    border-color: #66a4a7;
+    color: #161616;
+  }
+  
+  .el-tag--info {
+    background: #f2f2f2;
+    color: #161616;
+    border-color: #f2f2f2;
+  }
+  </style>
+  

+ 17 - 17
src/pages/main/leader/leaderhomeTask.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="display: flex; justify-content: space-between">
     <div class="taskbox">
-      <div class="tit">
+      <div class="homeTaskTit">
         <span class="span span1" @click="tabboxclick(0)">我的待办 ({{ this.daitotal }})</span>
         <span class="span" @click="tabboxclick(1)">我的已办</span>
         <span class="span" @click="tabboxclick(2)">我的发起</span>
@@ -15,7 +15,7 @@
               'text-align': 'center',
             }" :cell-style="{ background: '#FaFaFa' }" v-if="tabbox == 0" class="com-table" ref="multipleTable"
             :data="niticList" tooltip-effect="dark" size="small"
-            style="width: 100%; font-size: 16px; background: '#FaFaFa'" height="242px" v-loading="loading0">
+            style="width: 100%; font-size: 16px; background: '#FaFaFa'" height="442px" v-loading="loading0">
             <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span :title="scope.row.woTitle" @click="RowTitle(scope.row)" :style="scope.row.woTypeDesc == '预警工单'
@@ -67,7 +67,7 @@
               'text-align': 'center',
             }" :cell-style="{ background: '#FaFaFa' }" class="com-table" ref="tableDatayj" v-if="tabbox == 1"
             :data="tableDatayj" tooltip-effect="dark" size="small"
-            style="width: 100%; font-size: 16px; background: '#FaFaFa'" height="242px" v-loading="loading1">
+            style="width: 100%; font-size: 16px; background: '#FaFaFa'" height="442px" v-loading="loading1">
             <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span @click="RowDoneTitle(scope.row)" :title="scope.row.woTitle" style="cursor: pointer; color: blue">{{
@@ -102,7 +102,7 @@
               background: '#F2F2F2',
               'text-align': 'center',
             }" :cell-style="{ background: '#FaFaFa' }" class="com-table" ref="OpList" :data="OpList" v-if="tabbox == 2"
-            tooltip-effect="dark" size="small" style="width: 100%; font-size: 16px; background: '#FaFaFa'" height="242px" v-loading="loading2">
+            tooltip-effect="dark" size="small" style="width: 100%; font-size: 16px; background: '#FaFaFa'" height="442px" v-loading="loading2">
             <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span :title="scope.row.woTitle" @click="RowlaunchTitle(scope.row)"
@@ -258,13 +258,13 @@ export default {
       params: {},
       loginNo: '',
       daipage: 1, //第几页
-      daisize: 5, //一页多少条
+      daisize: 10, //一页多少条
       daitotal: 0, //总条目数
       yibanpage: 1, //第几页
-      yibansize: 5, //一页多少条
+      yibansize: 10, //一页多少条
       yibantotal: 0, //总条目数
       faqipage: 1, //第几页
-      faqisize: 5, //一页多少条
+      faqisize: 10, //一页多少条
       faqitotal: 0, //总条目数
       loading0:false,
       loading1:false,
@@ -490,7 +490,7 @@ export default {
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + n + '","pageSize":"5"}',
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
         data: {
           nextNo: this.loginNo,
@@ -511,7 +511,7 @@ export default {
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + n + '","pageSize":"5"}',
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
         data: {
           nextNo: this.loginNo,
@@ -546,7 +546,7 @@ export default {
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + n + '","pageSize":"5"}',
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
         data: {
           opNo: this.loginNo,
@@ -559,10 +559,10 @@ export default {
     },
     tabboxclick(e) {
       this.tabbox = e
-      document.querySelectorAll(".tit")[1].childNodes[0].className = 'span'
-      document.querySelectorAll(".tit")[1].childNodes[1].className = 'span'
-      document.querySelectorAll(".tit")[1].childNodes[2].className = 'span'
-      document.querySelectorAll(".tit")[1].childNodes[e].className = 'span span1'
+      document.querySelectorAll(".homeTaskTit")[0].childNodes[0].className = 'span'
+      document.querySelectorAll(".homeTaskTit")[0].childNodes[1].className = 'span'
+      document.querySelectorAll(".homeTaskTit")[0].childNodes[2].className = 'span'
+      document.querySelectorAll(".homeTaskTit")[0].childNodes[e].className = 'span span1'
       if (e == 0) {
         this.daiban({}, 1);
       } else if (e == 1) {
@@ -587,7 +587,7 @@ export default {
 
 <style lang="scss" scoped>
 .el-pagination {
-  padding: 10px;
+  // padding: 10px;
 }
 
 .diobtn {
@@ -603,7 +603,7 @@ export default {
   display: inline-block;
 }
 
-.tit {
+.homeTaskTit {
   margin-top: 10px;
   clear: both;
   height: 47px;
@@ -678,7 +678,7 @@ export default {
 .fatherbox {
   background: #fafafa;
   padding: 10px;
-  height: 305px;
+  height: 484px;
   border-bottom-left-radius: 10px;
   border-bottom-right-radius: 10px;
   width: 100%;

+ 2 - 1
src/pages/main/leader/numberHits.vue

@@ -12,6 +12,7 @@
       <el-table
         class="numbox1"
         :data="numHits1"
+        height="441"
         size="small"
         :header-cell-style="{ background: '#F2F2F2' }"
         :cell-style="{ background: '#FaFaFa' }"
@@ -232,7 +233,7 @@ export default {
   width: 97%;
   background: #fafafa;
   margin: 10px;
-  height: auto;
+  height: 530px;
   border-radius: 5px;
   .bgnum {
     background-image: linear-gradient(#fafafa, #f5f1d9);

Datei-Diff unterdrückt, da er zu groß ist
+ 295 - 0
src/pages/main/leader/numberHitss.vue


+ 0 - 840
src/pages/main/leader/rli.vue

@@ -1,840 +0,0 @@
-<template>
-    <div>
-        <!-- <div class="calendar">
-            <div class="arrow">
-                <i class="el-icon-arrow-left" @click="arrow('left')"></i>
-                <i class="el-icon-arrow-right" @click="arrow('right')"></i>
-            </div>
-            <el-calendar v-model="value" :range="dateRange"></el-calendar>
-        </div> -->
-        <!-- 下面的日历 -->
-        <div class="date">
-            <div class="arrow0">
-                <i class="el-icon-arrow-left" style="font-weight: 900;" @click="weekPre"></i>
-                <i class="el-icon-arrow-right" style="font-weight: 900;" @click="weekNext"></i>
-            </div>
-            <!-- 年份 月份 -->
-            <div class="month">
-                <span style="text-align: left;font-size: 16px;font-weight: 600;position: absolute;left: 20px;">我的日程</span>
-                <p>{{ currentYear }}年{{ currentMonth }}月</p>
-            </div>
-            <!-- 星期 -->
-            <ul class="weekdays">
-                <li>一</li>
-                <li>二</li>
-                <li>三</li>
-                <li>四</li>
-                <li>五</li>
-                <li>六</li>
-                <li>日</li>
-            </ul>
-            <!-- 日期 -->
-            <ul class="days">
-                <li @click="pick(day, index)" v-for="(day, index) in days" :key="index">
-                    <!--本月-->
-                    <span v-if="day.getMonth() + 1 != currentMonth" class="other-month">{{ day.getDate() }}</span>
-                    <span v-else>
-                        <!--今天-->
-                        <span
-                            v-if="day.getFullYear() == new Date().getFullYear() && day.getMonth() == new Date().getMonth() && day.getDate() == new Date().getDate()"
-                            class="active">{{ day.getDate() }}</span>
-                        <span v-else>{{ day.getDate() }}</span>
-                    </span>
-                </li>
-            </ul>
-            <div style="padding: 10px 0px;" @click="addnewr">
-                <div class="rlitable" v-if="tableData.length > 0">
-                    <div v-for="(item, index) in tableData" :key="index"
-                        :style="'color:' + item.textColor + ';padding:12px;display:inline-block;'">
-                        <span @click.stop="handleEventClick(item)">{{ item.title }}</span>
-                    </div>
-                </div>
-                <div v-else class="rlitable2">
-                    <div style="padding:10px;text-align: center;">
-                        暂无日程
-                    </div>
-                </div>
-            </div>
-            <!-- <el-table v-loading="loading" :data="tableData" style="width: 100%;" height="123">
-                <el-table-column prop="date" label="日期" width="180" align="center">
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" width="180" align="center">
-                </el-table-column>
-                <el-table-column prop="address" label="地址" align="center">
-                </el-table-column>
-            </el-table>
-            <el-pagination @current-change="currchange" :current-page="page" :page-size="size"
-                layout="total,prev, pager, next" :total="total">
-            </el-pagination> -->
-            <!--日程新增弹窗start-->
-            <el-dialog :title="titleNew" :visible.sync="dialogVisible" :before-close="close" :modal="false" width="45%">
-                <el-form :model="form" :rules="rules" ref="form" label-width="120px" size="small" class="demo-ruleForm"
-                    :disabled="auth ? false : 'disabled'">
-                    <el-form-item label="会议名称" prop="title">
-                        <el-input v-model="form.title"></el-input>
-                    </el-form-item>
-                    <el-form-item label="参会角色" prop="orgId">
-                        <el-select v-model="form.orgId" style="width: 70%; overflow: hidden" clearable filterable
-                            placeholder="参会角色" multiple>
-                            <el-option v-for="item in roleNameList" :key="item.userId" :label="item.name"
-                                :value="item.userId">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="是否是党会" prop="isParty">
-                        <el-select v-model="form.isParty" clearable style="width: 70%" filterable placeholder="是否是党会">
-                            <el-option v-for="item in isParrty" :key="item.is_party" :label="item.name"
-                                :value="item.is_party">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="发起科室" prop="leaderName">
-                        <el-input v-model="form.leaderName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="会议开始时间" required>
-                        <el-col :span="11">
-                            <el-form-item prop="begindate" style="margin-bottom: 0">
-                                <el-date-picker type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                    placeholder="选择日期" v-model="form.begindate" style="width: 100%">
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col class="line" :span="2">-</el-col>
-                        <el-col :span="11">
-                            <el-form-item prop="startTime" style="margin-bottom: 0">
-                                <el-select v-model="form.startTime" placeholder="选择时间" clearable>
-                                    <el-option v-for="item in timeOptions" :key="item.time" :disabled="item.disabled"
-                                        :label="item.time" :value="item.time" />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-form-item>
-                    <el-form-item label="会议结束时间" required>
-                        <el-col :span="11">
-                            <el-form-item prop="enddate" style="margin-bottom: 0">
-                                <el-date-picker type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                    placeholder="选择日期" v-model="form.enddate" style="width: 100%">
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col class="line" :span="2">-</el-col>
-                        <el-col :span="11">
-                            <el-form-item prop="endTime" style="margin-bottom: 0">
-                                <el-select v-model="form.endTime" placeholder="选择时间" clearable>
-                                    <el-option v-for="item in timeOptions" :key="item.time" :disabled="item.disabled"
-                                        :label="item.time" :value="item.time" />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-form-item>
-                    <el-form-item label="会议备注" prop="remark">
-                        <el-input type="textarea" v-model="form.remark"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button @click="resetForm('form')">取消</el-button>
-                        <el-button type="primary" @click="submitForm('form')">提交</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-dialog>
-            <!--日程新增弹窗end-->
-        </div>
-    </div>
-</template>
-   
-<script>
-import { getNowdata, } from "../../../http/api.js";//../../../http/api.js
-export default {
-    data() {
-        return {
-            // 上
-            value: "",
-            endDate: "",
-            dateRange: [],
-            dateNum: 0,
-            // 下
-            currentYear: "",   // 年份
-            currentMonth: "",  // 月份
-            currentDay: "",    // 日期
-            currentWeek: "",    // 星期
-            days: [],
-            tableData: [
-                {
-                    date: '2016-05-02',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                    date: '2016-05-04',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1517 弄'
-                },
-                {
-                    date: '2016-05-01',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1519 弄'
-                },
-            ],
-            loading: false,
-            params: {},
-            page: 1, //第几页
-            size: 10, //一页多少条
-            total: 50, //总条目数
-            subList: [],
-            array: [],
-            auth: false,
-            roleNameList: [
-                {
-                    userId: 1,
-                    name: "分管公司领导/部门负责人",
-                },
-                {
-                    userId: 2,
-                    name: "部门负责人",
-                },
-                {
-                    userId: 3,
-                    name: "部门分管线条领导/科室主任",
-                },
-            ],
-            isParrty: [
-                {
-                    is_party: "1",
-                    name: "是",
-                },
-                {
-                    is_party: "0",
-                    name: "否",
-                },
-            ],
-            dialogVisible: false,
-            titleNew: "",
-            form: {
-                title: "",
-                userId: "",
-                begindate: "",
-                startTime: "",
-                enddate: "",
-                endTime: "",
-                remark: "",
-                leaderName: "",
-                roleId: "",
-                roleColor: "",
-                id: "",
-                isParty: "否",
-                // roleName: '分管公司领导/部门负责人'
-                // roleName: [],
-                orgId: [2, 3],
-                // orgIds: "[2,3]",
-            },
-            rules: {
-                title: [{ required: true, message: "请输入会议主题", trigger: "blur" }],
-                userid: [
-                    { required: true, message: "请选择会议室使用人", trigger: "change" },
-                ],
-                begindate: [
-                    { required: true, message: "请选择开始日期", trigger: "change" },
-                ],
-                startTime: [
-                    { required: true, message: "请选择开始时间", trigger: "change" },
-                ],
-                enddate: [
-                    { required: true, message: "请选择结束日期", trigger: "change" },
-                ],
-                endTime: [
-                    { required: true, message: "请选择结束时间", trigger: "change" },
-                ],
-                remark: [
-                    { required: true, message: "请填写会议备注", trigger: "blur" },
-                ],
-                leaderName: [{ required: true, message: "发起科室", trigger: "blur" }],
-                isParty: [{ required: true, message: "是否是党会", trigger: "change" }],
-                // roleName:[{required: true, message: '参会角色', trigger: 'change'}],
-                orgId: [{ required: true, message: "参会角色", trigger: "change" }],
-                // orgIds: [{required: true, message: '参会角色', trigger: 'change'}]
-            },
-            // 时间选项
-            timeOptions: [
-                { time: "08:00" },
-                { time: "08:30" },
-                { time: "09:00" },
-                { time: "09:30" },
-                { time: "10:00" },
-                { time: "10:30" },
-                { time: "11:00" },
-                { time: "11:30" },
-                { time: "12:00" },
-                { time: "12:30" },
-                { time: "13:00" },
-                { time: "13:30" },
-                { time: "14:00" },
-                { time: "14:30" },
-                { time: "15:00" },
-                { time: "15:30" },
-                { time: "16:00" },
-                { time: "16:30" },
-                { time: "17:00" },
-                { time: "17:30" },
-                { time: "18:00" },
-            ],
-            // 备份
-            backupTimeOptions: [
-                { time: "08:00" },
-                { time: "08:30" },
-                { time: "09:00" },
-                { time: "09:30" },
-                { time: "10:00" },
-                { time: "10:30" },
-                { time: "11:00" },
-                { time: "11:30" },
-                { time: "12:00" },
-                { time: "12:30" },
-                { time: "13:00" },
-                { time: "13:30" },
-                { time: "14:00" },
-                { time: "14:30" },
-                { time: "15:00" },
-                { time: "15:30" },
-                { time: "16:00" },
-                { time: "16:30" },
-                { time: "17:00" },
-                { time: "17:30" },
-                { time: "18:00" },
-            ],
-            nowdata: '',
-        }
-    },
-    created() {
-        // 上面的日历
-        this.dateList(this.dateNum);
-        // console.log(this.dateRange);
-        // 下面的日历
-        this.initData();
-        this.getList();
-        this.queryRole();
-        this.getnowdata()
-    },
-    methods: {
-        getnowdata(val) {
-            let yy = new Date().getFullYear()
-            let mm = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
-            let dd = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
-            this.nowdata = yy + '-' + mm + '-' + dd
-        },
-        //重置数据
-        resetForm(formName) {
-            this.dialogVisible = false;
-            this.$refs[formName].resetFields();
-        },
-        // 获取会议信息
-        queryRole() {
-            this.$http({
-                url: "/market/calendar/queryRole",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { isFile: "0" },
-            }).then((res) => {
-                // console.log(res);
-                // console.log('res====', typeof res.data)
-                // console.log(res.data)
-                this.auth = res.data;
-                // console.log("res.data", res.data)
-            });
-        },
-        // 提交数据
-        submitForm(formName) {
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    this.form.begindate = `${this.form.begindate} ${this.form.startTime}`;
-                    this.form.enddate = `${this.form.enddate} ${this.form.endTime}`;
-                    // console.log(this.form, "数据");
-                    this.dialogVisible = false;
-                    if (this.form.id === "") {
-                        this.form === "";
-                    }
-                    if (new Date(this.form.enddate) < new Date(this.form.begindate)) {
-                        this.$message({
-                            message: "会议时间填写错误",
-                            type: "error",
-                        });
-                    } else {
-                        this.$http({
-                            url:
-                                this.form.id === ""
-                                    ? "/market/calendar/add"
-                                    : "/market/calendar/update",
-                            method: "post",
-                            headers: {
-                                "Content-Type": "application/json",
-                            },
-                            data: this.form,
-                        }).then((res) => {
-                            // console.log(res);
-                            this.loadinged = false;
-                            if (res.data.result === 1) {
-                                this.$message({
-                                    message: res.data.desc,
-                                    type: "error",
-                                });
-                            } else {
-                                this.$message({
-                                    message: "成功",
-                                    type: "success",
-                                });
-                                // location.reload();
-                                this.getList();
-                            }
-                        });
-                    }
-                } else {
-                    // console.log("error submit!!");
-                    return false;
-                }
-            });
-        },
-        // 日历日程点击事件
-        handleEventClick(e) {
-            console.log(e);
-            this.titleNew = "会议修改";
-            this.dialogVisible = true;
-            let id = e.id;
-            let info = this.subList.filter((item) => {
-                return item.id == id;
-            });
-            this.$nextTick(() => {
-                this.form = _.cloneDeep(info[0]);
-                // 处理时间回显
-                this.getShowTime(this.form.begindate, this.form.enddate);
-                // this.gitPeople(this.form.roleName);
-                this.orgId = this.form.roleName;
-                // this.orgIds=this.form.roleName
-                // this.roleNameList.userId=info[0].roleName
-            });
-        },
-        getShowTime(beginDate, endDate) {
-            this.form.begindate = this.dealWithTime(beginDate);
-            this.form.startTime = this.getHoursMin(beginDate);
-            this.form.enddate = this.dealWithTime(endDate);
-            this.form.endTime = this.getHoursMin(endDate);
-            // console.log(this.form);
-            // this.$forceUpdate()
-            this.form = { ...this.form };
-        },
-        //新增会议
-        addnewr() {
-            this.form={}
-            // console.log(111);
-            this.form.orgId = [];
-            this.form.isParty = "";
-            this.titleNew = "会议新增";
-            if (!this.auth) {
-                return;
-            }
-            //开始时间
-            this.form.begindate = this.nowdata;
-            //结束时间
-            this.form.enddate = this.nowdata;
-
-            this.dialogVisible = true;
-        },
-        //关闭弹窗,重置表单
-        close() {
-            this.dialogVisible = false;
-            this.$refs["form"].resetFields();
-        },
-        // 获取会议信息
-        getList() {
-            this.$http({
-                url: "/market/calendar/queryList",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { isFile: "0" },
-            }).then((res) => {
-                console.log("res", res);
-                if (res.data && res.data.length > 0) {
-                    this.array = res.data;
-                    // this.getReservationList(this.array.scheduleList0);
-                    this.getReservationList(this.array);
-                }
-            });
-        },
-        getReservationList(arrayData) {
-            let newArr = [];
-            let newAr2r = [];
-            this.subList = arrayData;
-            arrayData.forEach((item) => {
-                newArr.push({
-                    newBeginTime: item.begindate.split(" ")[1].substr(0, 5),
-                    newEndTime: item.enddate.split(" ")[1].substr(0, 5),
-                    start: this.dealWithTime(item.begindate),
-                    end: this.addDate(this.dealWithTime(item.enddate), 1),
-                    textColor: item.roleColor,
-                    id: item.id,
-                    title: `${this.getTitle(
-                        item.begindate,
-                        item.enddate,
-                        item.isParty
-                    )}   ${item.title}    ${"召集人:" + item.leaderName}`,
-                });
-            });
-            console.log(newArr);
-            console.log(this.nowdata);
-            newArr.map((item) => {
-                if (item.start == this.nowdata) {
-                    newAr2r.push(item)
-                }
-            })
-            this.tableData = newAr2r;
-        },
-        // 获取时分时间
-        getHoursMin(value) {
-            return value.substring(11, 16);
-        },
-        // 处理会议时间格式
-        dealWithTime(date) {
-            let newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(date)[0];
-            return newDate;
-        },
-        // 获取会议事件title
-        getTitle(date1, date2, isParty) {
-            let start =
-                isParty == "1"
-                    ? "★" + date1.substring(11, 16)
-                    : date1.substring(11, 16);
-            let end = date2.substring(11, 16);
-            return `${start}~${end}`;
-        },
-        // 日期加1天
-        addDate(date, days) {
-            var d = new Date(date);
-            d.setDate(d.getDate() + days);
-            var mon =
-                d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
-            let endD = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
-            return `${d.getFullYear()}-${mon}-${endD}`;
-        },
-        // 上面的日历
-
-        // 获取当前时间的周一
-        getMonday(date) {
-            var day = date.getDay();
-            var deltaDay;
-            if (day == 0) {
-                deltaDay = 6;
-            } else {
-                deltaDay = day - 1;
-            }
-            var monday = new Date(date.getTime() - deltaDay * 24 * 60 * 60 * 1000);
-            monday.setHours(0);
-            monday.setMinutes(0);
-            monday.setSeconds(0);
-            return monday; //返回选定时间的周一的0时0分0秒
-        },
-        getDateNew(time) {
-            console.log(time);
-            let times = new Date(time);
-            let year = times.getFullYear();
-            let month = times.getMonth() + 1 < 10 ? "0" + (times.getMonth() * 1 + 1) : times.getMonth() * 1 + 1;
-            let day = times.getDate() < 10 ? "0" + times.getDate() * 1 : times.getDate() * 1;
-            return year + "-" + month + "-" + day;
-        },
-        dateList(delta) {
-            //将时间对象转换为时间戳并加几天后转换为时间对象
-            var DateNews = this.getMonday(
-                new Date((new Date().getTime() / 1000 + 86400 * 7 * delta) * 1000)
-            );
-            let startDate = this.getDateNew(DateNews, delta);
-            this.endDate = this.getDateNew(
-                new Date((DateNews.getTime() / 1000 + 6 * 86400) * 1000)
-            );
-            this.dateRange = [startDate, this.endDate];
-        },
-        arrow(arrow) {
-            if (arrow == "left") {
-                this.dateNum--;
-                this.dateList(this.dateNum);
-            } else if (arrow == "right") {
-                this.dateNum++;
-                this.dateList(this.dateNum);
-            }
-        },
-
-        // 下面的日历
-
-        formatDate(year, month, day) {
-            const y = year
-            let m = month
-            if (m < 10) m = `0${m}`
-            let d = day
-            if (d < 10) d = `0${d}`
-            return `${y}-${m}-${d}`
-        },
-        initData(cur) {
-            let date = ''
-            if (cur) {
-                date = new Date(cur)
-            } else {
-                date = new Date()
-            }
-            this.currentDay = date.getDate()          // 今日日期 几号
-            this.currentYear = date.getFullYear()       // 当前年份
-            this.currentMonth = date.getMonth() + 1    // 当前月份
-            this.currentWeek = date.getDay() // 1...6,0   // 星期几
-            if (this.currentWeek === 0) {
-                this.currentWeek = 7
-            }
-            const str = this.formatDate(this.currentYear, this.currentMonth, this.currentDay) // 今日日期 年-月-日
-            this.days.length = 0
-            // 今天是周日,放在第一行第7个位置,前面6个 这里默认显示一周,如果需要显示一个月,则第二个循环为 i<= 35- this.currentWeek
-            /* eslint-disabled */
-            for (let i = this.currentWeek - 1; i >= 0; i -= 1) {
-                const d = new Date(str)
-                d.setDate(d.getDate() - i)
-                // console.log(y:" + d.getDate())
-                this.days.push(d)
-            }
-            for (let i = 1; i <= 7 - this.currentWeek; i += 1) {
-                const d = new Date(str)
-                d.setDate(d.getDate() + i)
-                this.days.push(d)
-            }
-        },
-        //  上个星期
-        weekPre() {
-            const d = this.days[0]    // 如果当期日期是7号或者小于7号
-            d.setDate(d.getDate() - 7)
-            this.initData(d)
-            let days = document.querySelector(".days");
-            for (var i = 0; i <= 6; i++) {
-                days.childNodes[i].childNodes[0].childNodes[0].className = ''
-            }
-        },
-        //  下个星期
-        weekNext() {
-            const d = this.days[6]    // 如果当期日期是7号或者小于7号
-            d.setDate(d.getDate() + 7)
-            this.initData(d)
-            let days = document.querySelector(".days");
-            for (var i = 0; i <= 6; i++) {
-                days.childNodes[i].childNodes[0].childNodes[0].className = ''
-            }
-        },
-        // 上一個月   传入当前年份和月份
-        pickPre(year, month) {
-            const d = new Date(this.formatDate(year, month, 1))
-            d.setDate(0)
-            this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
-        },
-        // 下一個月   传入当前年份和月份
-        pickNext(year, month) {
-            const d = new Date(this.formatDate(year, month, 1))
-            d.setDate(35)
-            this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
-        },
-        // 当前选择日期
-        pick(date, index) {
-            // console.log(date);
-            // console.log(index);
-            let days = document.querySelector(".days");
-            // console.log(days.childNodes[index].childNodes[0].childNodes);
-            // console.log(days.childNodes);
-            for (var i = 0; i <= 6; i++) {
-                days.childNodes[i].childNodes[0].childNodes[0].className = ''
-            }
-            if (days.childNodes[index].childNodes[0].childNodes[0].className == '') {
-                days.childNodes[index].childNodes[0].childNodes[0].className = 'active'
-            } else {
-                days.childNodes[index].childNodes[0].childNodes[0].className = ''
-            }
-            this.nowdata = this.formatDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-            this.getList()
-        },
-    },
-};
-</script>
-   
-<style lang="scss" scoped>
-::v-deep .el-table .el-table__cell {
-    padding: 8px 0;
-}
-
-::v-deep .el-table__header-wrapper {
-    display: none;
-}
-
-.rlitable {
-    display: flex;
-    flex-direction: column;
-    max-height: 161px;
-    overflow-y: auto;
-    padding-left: 20%;
-    height: 161px;
-    background-color: #d8eaf6;
-    border-radius: 10px;
-}
-
-.rlitable2 {
-    max-height: 161px;
-    overflow-y: auto;
-    height: 161px;
-    background-color: #d8eaf6;
-    border-radius: 10px;
-}
-
-ul {
-    padding: 0;
-}
-
-li {
-    list-style-type: none;
-}
-
-/* 上面的日历 */
-.calendar {
-    position: relative;
-    width: 100%;
-    background: #fff;
-    margin-top: 10px;
-    border-radius: 10px;
-    margin-left: 20px;
-}
-
-.el-calendar__header {
-    display: block;
-}
-
-.el-calendar-table .el-calendar-day {
-    height: auto;
-    text-align: center;
-}
-
-.el-calendar-table td.is-selected {
-    background-color: #24b18d;
-    color: #fff;
-}
-
-.el-calendar-table .el-calendar-day:hover {
-    background-color: #24b18d;
-    color: #fff;
-}
-
-.el-calendar-table {
-    border-bottom: 1px solid #e4e4e4;
-    padding-bottom: 15px;
-}
-
-.el-calendar-table .next {
-    color: rgb(143, 143, 143);
-}
-
-.el-calendar__title,
-.el-calendar__button-group {
-    text-align: center;
-}
-
-.arrow {
-    width: 100%;
-    max-height: 46px;
-    position: absolute;
-    top: 15px;
-    text-align: center;
-}
-
-.arrow i {
-    font-size: 20px;
-    cursor: pointer;
-}
-
-.arrow i:nth-child(1) {
-    margin-right: 10%;
-    text-align: left;
-}
-
-.arrow i:nth-child(2) {
-    margin-left: 10%;
-    text-align: right;
-}
-
-/* 下面的日历 */
-.date {
-    position: relative;
-    margin-top: 10px;
-    padding: 10px 20px;
-    border-radius: 10px;
-    background-color: #ffffff;
-}
-
-.arrow0 {
-    width: 100%;
-    max-height: 46px;
-    position: absolute;
-    top: 10px;
-    left: 0px;
-    text-align: center;
-}
-
-.arrow0 i {
-    font-size: 20px;
-    cursor: pointer;
-}
-
-.arrow0 i:nth-child(1) {
-    margin-right: 10%;
-    text-align: left;
-}
-
-.arrow0 i:nth-child(2) {
-    margin-left: 10%;
-    text-align: right;
-}
-
-.month {
-    text-align: center;
-}
-
-.weekdays {
-    display: flex;
-    margin: 10px 0px;
-}
-
-.weekdays li {
-    flex: 1;
-    text-align: center;
-}
-
-.days {
-    display: flex;
-}
-
-.days li {
-    flex: 1;
-    text-align: center;
-    cursor: pointer;
-}
-
-.days li span {
-    display: inline-block;
-    width: 22px;
-    height: 22px;
-    line-height: 22px;
-}
-
-.days li span:hover {
-    color: #fff;
-    background-color: #409EFF;
-    border-radius: 50%;
-}
-
-.active {
-    display: inline-block;
-    color: #fff;
-    border-radius: 50%;
-    background-color: #52d4fc !important;
-}
-
-.other-month {
-    color: #e4393c;
-}
-</style>

+ 0 - 839
src/pages/main/leader/rlinet.vue

@@ -1,839 +0,0 @@
-<template>
-    <div>
-        <!-- <div class="calendar">
-            <div class="arrow">
-                <i class="el-icon-arrow-left" @click="arrow('left')"></i>
-                <i class="el-icon-arrow-right" @click="arrow('right')"></i>
-            </div>
-            <el-calendar v-model="value" :range="dateRange"></el-calendar>
-        </div> -->
-        <!-- 下面的日历 -->
-        <div class="date">
-            <div class="arrow0">
-                <i class="el-icon-arrow-left" style="font-weight: 900;" @click="weekPre"></i>
-                <i class="el-icon-arrow-right" style="font-weight: 900;" @click="weekNext"></i>
-            </div>
-            <!-- 年份 月份 -->
-            <div class="month">
-                <span style="text-align: left;font-size: 16px;font-weight: 600;position: absolute;left: 20px;">我的日程</span>
-                <p>{{ currentYear }}年{{ currentMonth }}月</p>
-            </div>
-            <!-- 星期 -->
-            <ul class="weekdays">
-                <li>一</li>
-                <li>二</li>
-                <li>三</li>
-                <li>四</li>
-                <li>五</li>
-                <li>六</li>
-                <li>日</li>
-            </ul>
-            <!-- 日期 -->
-            <ul class="days">
-                <li @click="pick(day, index)" v-for="(day, index) in days" :key="index">
-                    <!--本月-->
-                    <span v-if="day.getMonth() + 1 != currentMonth" class="other-month">{{ day.getDate() }}</span>
-                    <span v-else>
-                        <!--今天-->
-                        <span
-                            v-if="day.getFullYear() == new Date().getFullYear() && day.getMonth() == new Date().getMonth() && day.getDate() == new Date().getDate()"
-                            class="active">{{ day.getDate() }}</span>
-                        <span v-else>{{ day.getDate() }}</span>
-                    </span>
-                </li>
-            </ul>
-            <div style="padding: 10px 0px;" @click="addnewr">
-                <div class="rlitable" v-if="tableData.length > 0">
-                    <span v-for="(item, index) in tableData" :key="index"
-                        :style="'color:' + item.textColor + ';padding:12px;display:inline-block;'">
-                        <span @click.stop="handleEventClick(item)" style="cursor:;">{{ item.title }}</span>
-                    </span>
-                </div>
-                <div v-else class="rlitable2">
-                    <div style="padding:10px;text-align: center;">
-                        暂无日程
-                    </div>
-
-                </div>
-            </div>
-            <!-- <el-table v-loading="loading" :data="tableData" style="width: 100%;" height="123">
-                <el-table-column prop="date" label="日期" width="180" align="center">
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" width="180" align="center">
-                </el-table-column>
-                <el-table-column prop="address" label="地址" align="center">
-                </el-table-column>
-            </el-table>
-            <el-pagination @current-change="currchange" :current-page="page" :page-size="size"
-                layout="total,prev, pager, next" :total="total">
-            </el-pagination> -->
-            <!--日程新增弹窗start-->
-            <el-dialog :title="titleNew" :visible.sync="dialogVisible" :before-close="close" :modal="false" width="45%">
-                <el-form :model="form" :rules="rules" ref="form" label-width="120px" size="small" class="demo-ruleForm"
-                    :disabled="auth ? false : 'disabled'">
-                    <el-form-item label="会议名称" prop="title">
-                        <el-input v-model="form.title"></el-input>
-                    </el-form-item>
-                    <el-form-item label="参会角色" prop="orgId">
-                        <el-select v-model="form.orgId" style="width: 70%; overflow: hidden" clearable filterable
-                            placeholder="参会角色" multiple>
-                            <el-option v-for="item in roleNameList" :key="item.userId" :label="item.name"
-                                :value="item.userId">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="是否是党会" prop="isParty">
-                        <el-select v-model="form.isParty" clearable style="width: 70%" filterable placeholder="是否是党会">
-                            <el-option v-for="item in isParrty" :key="item.is_party" :label="item.name"
-                                :value="item.is_party">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="发起科室" prop="leaderName">
-                        <el-input v-model="form.leaderName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="会议开始时间" required>
-                        <el-col :span="11">
-                            <el-form-item prop="begindate" style="margin-bottom: 0">
-                                <el-date-picker type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                    placeholder="选择日期" v-model="form.begindate" style="width: 100%">
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col class="line" :span="2">-</el-col>
-                        <el-col :span="11">
-                            <el-form-item prop="startTime" style="margin-bottom: 0">
-                                <el-select v-model="form.startTime" placeholder="选择时间" clearable>
-                                    <el-option v-for="item in timeOptions" :key="item.time" :disabled="item.disabled"
-                                        :label="item.time" :value="item.time" />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-form-item>
-                    <el-form-item label="会议结束时间" required>
-                        <el-col :span="11">
-                            <el-form-item prop="enddate" style="margin-bottom: 0">
-                                <el-date-picker type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                                    placeholder="选择日期" v-model="form.enddate" style="width: 100%">
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col class="line" :span="2">-</el-col>
-                        <el-col :span="11">
-                            <el-form-item prop="endTime" style="margin-bottom: 0">
-                                <el-select v-model="form.endTime" placeholder="选择时间" clearable>
-                                    <el-option v-for="item in timeOptions" :key="item.time" :disabled="item.disabled"
-                                        :label="item.time" :value="item.time" />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-form-item>
-                    <el-form-item label="会议备注" prop="remark">
-                        <el-input type="textarea" v-model="form.remark"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button @click="resetForm('form')">取消</el-button>
-                        <el-button type="primary" @click="submitForm('form')">提交</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-dialog>
-            <!--日程新增弹窗end-->
-        </div>
-    </div>
-</template>
-   
-<script>
-import { getNowdata, } from "../../../http/api.js";//../../../http/api.js
-export default {
-    data() {
-        return {
-            // 上
-            value: "",
-            endDate: "",
-            dateRange: [],
-            dateNum: 0,
-            // 下
-            currentYear: "",   // 年份
-            currentMonth: "",  // 月份
-            currentDay: "",    // 日期
-            currentWeek: "",    // 星期
-            days: [],
-            tableData: [
-                {
-                    date: '2016-05-02',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                    date: '2016-05-04',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1517 弄'
-                },
-                {
-                    date: '2016-05-01',
-                    name: '王小虎',
-                    address: '上海市普陀区金沙江路 1519 弄'
-                },
-            ],
-            loading: false,
-            params: {},
-            page: 1, //第几页
-            size: 10, //一页多少条
-            total: 50, //总条目数
-            subList: [],
-            array: [],
-            auth: false,
-            roleNameList: [
-                {
-                    userId: 1,
-                    name: "分管公司领导/部门负责人",
-                },
-                {
-                    userId: 2,
-                    name: "部门负责人",
-                },
-                {
-                    userId: 3,
-                    name: "部门分管线条领导/科室主任",
-                },
-            ],
-            isParrty: [
-                {
-                    is_party: "1",
-                    name: "是",
-                },
-                {
-                    is_party: "0",
-                    name: "否",
-                },
-            ],
-            dialogVisible: false,
-            titleNew: "",
-            form: {
-                title: "",
-                userId: "",
-                begindate: "",
-                startTime: "",
-                enddate: "",
-                endTime: "",
-                remark: "",
-                leaderName: "",
-                roleId: "",
-                roleColor: "",
-                id: "",
-                isParty: "否",
-                // roleName: '分管公司领导/部门负责人'
-                // roleName: [],
-                orgId: [2, 3],
-                // orgIds: "[2,3]",
-            },
-            rules: {
-                title: [{ required: true, message: "请输入会议主题", trigger: "blur" }],
-                userid: [
-                    { required: true, message: "请选择会议室使用人", trigger: "change" },
-                ],
-                begindate: [
-                    { required: true, message: "请选择开始日期", trigger: "change" },
-                ],
-                startTime: [
-                    { required: true, message: "请选择开始时间", trigger: "change" },
-                ],
-                enddate: [
-                    { required: true, message: "请选择结束日期", trigger: "change" },
-                ],
-                endTime: [
-                    { required: true, message: "请选择结束时间", trigger: "change" },
-                ],
-                remark: [
-                    { required: true, message: "请填写会议备注", trigger: "blur" },
-                ],
-                leaderName: [{ required: true, message: "发起科室", trigger: "blur" }],
-                isParty: [{ required: true, message: "是否是党会", trigger: "change" }],
-                // roleName:[{required: true, message: '参会角色', trigger: 'change'}],
-                orgId: [{ required: true, message: "参会角色", trigger: "change" }],
-                // orgIds: [{required: true, message: '参会角色', trigger: 'change'}]
-            },
-            // 时间选项
-            timeOptions: [
-                { time: "08:00" },
-                { time: "08:30" },
-                { time: "09:00" },
-                { time: "09:30" },
-                { time: "10:00" },
-                { time: "10:30" },
-                { time: "11:00" },
-                { time: "11:30" },
-                { time: "12:00" },
-                { time: "12:30" },
-                { time: "13:00" },
-                { time: "13:30" },
-                { time: "14:00" },
-                { time: "14:30" },
-                { time: "15:00" },
-                { time: "15:30" },
-                { time: "16:00" },
-                { time: "16:30" },
-                { time: "17:00" },
-                { time: "17:30" },
-                { time: "18:00" },
-            ],
-            // 备份
-            backupTimeOptions: [
-                { time: "08:00" },
-                { time: "08:30" },
-                { time: "09:00" },
-                { time: "09:30" },
-                { time: "10:00" },
-                { time: "10:30" },
-                { time: "11:00" },
-                { time: "11:30" },
-                { time: "12:00" },
-                { time: "12:30" },
-                { time: "13:00" },
-                { time: "13:30" },
-                { time: "14:00" },
-                { time: "14:30" },
-                { time: "15:00" },
-                { time: "15:30" },
-                { time: "16:00" },
-                { time: "16:30" },
-                { time: "17:00" },
-                { time: "17:30" },
-                { time: "18:00" },
-            ],
-            nowdata: '',
-        }
-    },
-    created() {
-        // 上面的日历
-        this.dateList(this.dateNum);
-        // console.log(this.dateRange);
-        // 下面的日历
-        this.initData();
-        this.getList();
-        this.queryRole();
-        this.getnowdata()
-    },
-    methods: {
-        getnowdata(val) {
-            let yy = new Date().getFullYear()
-            let mm = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
-            let dd = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
-            this.nowdata = yy + '-' + mm + '-' + dd
-        },
-        //重置数据
-        resetForm(formName) {
-            this.dialogVisible = false;
-            this.$refs[formName].resetFields();
-        },
-        // 获取会议信息
-        queryRole() {
-            this.$http({
-                url: "/market/calendarnet/queryRole",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { isFile: "0" },
-            }).then((res) => {
-                // console.log(res);
-                // console.log('res====', typeof res.data)
-                // console.log(res.data)
-                this.auth = res.data;
-                // console.log("res.data", res.data)
-            });
-        },
-        // 提交数据
-        submitForm(formName) {
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    this.form.begindate = `${this.form.begindate} ${this.form.startTime}`;
-                    this.form.enddate = `${this.form.enddate} ${this.form.endTime}`;
-                    // console.log(this.form, "数据");
-                    this.dialogVisible = false;
-                    if (this.form.id === "") {
-                        this.form === "";
-                    }
-                    if (new Date(this.form.enddate) < new Date(this.form.begindate)) {
-                        this.$message({
-                            message: "会议时间填写错误",
-                            type: "error",
-                        });
-                    } else {
-                        this.$http({
-                            url:
-                                this.form.id === ""
-                                    ? "/market/calendarnet/add"
-                                    : "/market/calendarnet/update",
-                            method: "post",
-                            headers: {
-                                "Content-Type": "application/json",
-                            },
-                            data: this.form,
-                        }).then((res) => {
-                            // console.log(res);
-                            this.loadinged = false;
-                            if (res.data.result === 1) {
-                                this.$message({
-                                    message: res.data.desc,
-                                    type: "error",
-                                });
-                            } else {
-                                this.$message({
-                                    message: "成功",
-                                    type: "success",
-                                });
-                                // location.reload();
-                                this.getList();
-                            }
-                        });
-                    }
-                } else {
-                    // console.log("error submit!!");
-                    return false;
-                }
-            });
-        },
-        // 日历日程点击事件
-        handleEventClick(e) {
-            this.titleNew = "会议修改";
-            this.dialogVisible = true;
-            let id = e.id;
-            let info = this.subList.filter((item) => {
-                return item.id == id;
-            });
-            this.$nextTick(() => {
-                this.form = _.cloneDeep(info[0]);
-                // 处理时间回显
-                this.getShowTime(this.form.begindate, this.form.enddate);
-                // this.gitPeople(this.form.roleName);
-                this.orgId = this.form.roleName;
-                // this.orgIds=this.form.roleName
-                // this.roleNameList.userId=info[0].roleName
-            });
-        },
-        getShowTime(beginDate, endDate) {
-            this.form.begindate = this.dealWithTime(beginDate);
-            this.form.startTime = this.getHoursMin(beginDate);
-            this.form.enddate = this.dealWithTime(endDate);
-            this.form.endTime = this.getHoursMin(endDate);
-            // console.log(this.form);
-            // this.$forceUpdate()
-            this.form = { ...this.form };
-        },
-        //新增会议
-        addnewr() {
-            this.form={}
-            this.form.orgId = [];
-            this.form.isParty = "";
-            this.titleNew = "会议新增";
-            if (!this.auth) {
-                return;
-            }
-            //开始时间
-            this.form.begindate = this.nowdata;
-            //结束时间
-            this.form.enddate = this.nowdata;
-
-            this.dialogVisible = true;
-        },
-        //关闭弹窗,重置表单
-        close() {
-            this.dialogVisible = false;
-            this.$refs["form"].resetFields();
-        },
-        // 获取会议信息
-        getList() {
-            this.$http({
-                url: "/market/calendarnet/queryList",
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { isFile: "0" },
-            }).then((res) => {
-                console.log("res", res);
-                if (res.data && res.data.length > 0) {
-                    this.array = res.data;
-                    // this.getReservationList(this.array.scheduleList0);
-                    this.getReservationList(this.array);
-                }
-            });
-        },
-        getReservationList(arrayData) {
-            let newArr = [];
-            let newAr2r = [];
-            this.subList = arrayData;
-            arrayData.forEach((item) => {
-                newArr.push({
-                    newBeginTime: item.begindate.split(" ")[1].substr(0, 5),
-                    newEndTime: item.enddate.split(" ")[1].substr(0, 5),
-                    start: this.dealWithTime(item.begindate),
-                    end: this.addDate(this.dealWithTime(item.enddate), 1),
-                    textColor: item.roleColor,
-                    id: item.id,
-                    title: `${this.getTitle(
-                        item.begindate,
-                        item.enddate,
-                        item.isParty
-                    )}   ${item.title}    ${"召集人:" + item.leaderName}`,
-                });
-            });
-            console.log(newArr);
-            console.log(this.nowdata);
-            newArr.map((item) => {
-                if (item.start == this.nowdata) {
-                    newAr2r.push(item)
-                }
-            })
-            this.tableData = newAr2r;
-        },
-        // 获取时分时间
-        getHoursMin(value) {
-            return value.substring(11, 16);
-        },
-        // 处理会议时间格式
-        dealWithTime(date) {
-            let newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(date)[0];
-            return newDate;
-        },
-        // 获取会议事件title
-        getTitle(date1, date2, isParty) {
-            let start =
-                isParty == "1"
-                    ? "★" + date1.substring(11, 16)
-                    : date1.substring(11, 16);
-            let end = date2.substring(11, 16);
-            return `${start}~${end}`;
-        },
-        // 日期加1天
-        addDate(date, days) {
-            var d = new Date(date);
-            d.setDate(d.getDate() + days);
-            var mon =
-                d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
-            let endD = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
-            return `${d.getFullYear()}-${mon}-${endD}`;
-        },
-        // 上面的日历
-
-        // 获取当前时间的周一
-        getMonday(date) {
-            var day = date.getDay();
-            var deltaDay;
-            if (day == 0) {
-                deltaDay = 6;
-            } else {
-                deltaDay = day - 1;
-            }
-            var monday = new Date(date.getTime() - deltaDay * 24 * 60 * 60 * 1000);
-            monday.setHours(0);
-            monday.setMinutes(0);
-            monday.setSeconds(0);
-            return monday; //返回选定时间的周一的0时0分0秒
-        },
-        getDateNew(time) {
-            console.log(time);
-            let times = new Date(time);
-            let year = times.getFullYear();
-            let month = times.getMonth() + 1 < 10 ? "0" + (times.getMonth() * 1 + 1) : times.getMonth() * 1 + 1;
-            let day = times.getDate() < 10 ? "0" + times.getDate() * 1 : times.getDate() * 1;
-            return year + "-" + month + "-" + day;
-        },
-        dateList(delta) {
-            //将时间对象转换为时间戳并加几天后转换为时间对象
-            var DateNews = this.getMonday(
-                new Date((new Date().getTime() / 1000 + 86400 * 7 * delta) * 1000)
-            );
-            let startDate = this.getDateNew(DateNews, delta);
-            this.endDate = this.getDateNew(
-                new Date((DateNews.getTime() / 1000 + 6 * 86400) * 1000)
-            );
-            this.dateRange = [startDate, this.endDate];
-        },
-        arrow(arrow) {
-            if (arrow == "left") {
-                this.dateNum--;
-                this.dateList(this.dateNum);
-            } else if (arrow == "right") {
-                this.dateNum++;
-                this.dateList(this.dateNum);
-            }
-        },
-
-        // 下面的日历
-
-        formatDate(year, month, day) {
-            const y = year
-            let m = month
-            if (m < 10) m = `0${m}`
-            let d = day
-            if (d < 10) d = `0${d}`
-            return `${y}-${m}-${d}`
-        },
-        initData(cur) {
-            let date = ''
-            if (cur) {
-                date = new Date(cur)
-            } else {
-                date = new Date()
-            }
-            this.currentDay = date.getDate()          // 今日日期 几号
-            this.currentYear = date.getFullYear()       // 当前年份
-            this.currentMonth = date.getMonth() + 1    // 当前月份
-            this.currentWeek = date.getDay() // 1...6,0   // 星期几
-            if (this.currentWeek === 0) {
-                this.currentWeek = 7
-            }
-            const str = this.formatDate(this.currentYear, this.currentMonth, this.currentDay) // 今日日期 年-月-日
-            this.days.length = 0
-            // 今天是周日,放在第一行第7个位置,前面6个 这里默认显示一周,如果需要显示一个月,则第二个循环为 i<= 35- this.currentWeek
-            /* eslint-disabled */
-            for (let i = this.currentWeek - 1; i >= 0; i -= 1) {
-                const d = new Date(str)
-                d.setDate(d.getDate() - i)
-                // console.log(y:" + d.getDate())
-                this.days.push(d)
-            }
-            for (let i = 1; i <= 7 - this.currentWeek; i += 1) {
-                const d = new Date(str)
-                d.setDate(d.getDate() + i)
-                this.days.push(d)
-            }
-        },
-        //  上个星期
-        weekPre() {
-            const d = this.days[0]    // 如果当期日期是7号或者小于7号
-            d.setDate(d.getDate() - 7)
-            this.initData(d)
-            let days = document.querySelector(".days");
-            for (var i = 0; i <= 6; i++) {
-                days.childNodes[i].childNodes[0].childNodes[0].className = ''
-            }
-        },
-        //  下个星期
-        weekNext() {
-            const d = this.days[6]    // 如果当期日期是7号或者小于7号
-            d.setDate(d.getDate() + 7)
-            this.initData(d)
-            let days = document.querySelector(".days");
-            for (var i = 0; i <= 6; i++) {
-                days.childNodes[i].childNodes[0].childNodes[0].className = ''
-            }
-        },
-        // 上一個月   传入当前年份和月份
-        pickPre(year, month) {
-            const d = new Date(this.formatDate(year, month, 1))
-            d.setDate(0)
-            this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
-        },
-        // 下一個月   传入当前年份和月份
-        pickNext(year, month) {
-            const d = new Date(this.formatDate(year, month, 1))
-            d.setDate(35)
-            this.initData(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
-        },
-        // 当前选择日期
-        pick(date, index) {
-            // console.log(date);
-            // console.log(index);
-            let days = document.querySelector(".days");
-            // console.log(days.childNodes[index].childNodes[0].childNodes);
-            // console.log(days.childNodes);
-            for (var i = 0; i <= 6; i++) {
-                days.childNodes[i].childNodes[0].childNodes[0].className = ''
-            }
-            if (days.childNodes[index].childNodes[0].childNodes[0].className == '') {
-                days.childNodes[index].childNodes[0].childNodes[0].className = 'active'
-            } else {
-                days.childNodes[index].childNodes[0].childNodes[0].className = ''
-            }
-            this.nowdata = this.formatDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-            this.getList()
-        },
-    },
-};
-</script>
-   
-<style lang="scss" scoped>
-::v-deep .el-table .el-table__cell {
-    padding: 8px 0;
-}
-
-::v-deep .el-table__header-wrapper {
-    display: none;
-}
-
-.rlitable {
-    display: flex;
-    flex-direction: column;
-    max-height: 161px;
-    overflow-y: auto;
-    padding-left: 20%;
-    height: 161px;
-    background-color: #d8eaf6;
-    border-radius: 10px;
-}
-
-.rlitable2 {
-    max-height: 161px;
-    overflow-y: auto;
-    height: 161px;
-    background-color: #d8eaf6;
-    border-radius: 10px;
-}
-
-ul {
-    padding: 0;
-}
-
-li {
-    list-style-type: none;
-}
-
-/* 上面的日历 */
-.calendar {
-    position: relative;
-    width: 100%;
-    background: #fff;
-    margin-top: 10px;
-    border-radius: 10px;
-    margin-left: 20px;
-}
-
-.el-calendar__header {
-    display: block;
-}
-
-.el-calendar-table .el-calendar-day {
-    height: auto;
-    text-align: center;
-}
-
-.el-calendar-table td.is-selected {
-    background-color: #24b18d;
-    color: #fff;
-}
-
-.el-calendar-table .el-calendar-day:hover {
-    background-color: #24b18d;
-    color: #fff;
-}
-
-.el-calendar-table {
-    border-bottom: 1px solid #e4e4e4;
-    padding-bottom: 15px;
-}
-
-.el-calendar-table .next {
-    color: rgb(143, 143, 143);
-}
-
-.el-calendar__title,
-.el-calendar__button-group {
-    text-align: center;
-}
-
-.arrow {
-    width: 100%;
-    max-height: 46px;
-    position: absolute;
-    top: 15px;
-    text-align: center;
-}
-
-.arrow i {
-    font-size: 20px;
-    cursor: pointer;
-}
-
-.arrow i:nth-child(1) {
-    margin-right: 10%;
-    text-align: left;
-}
-
-.arrow i:nth-child(2) {
-    margin-left: 10%;
-    text-align: right;
-}
-
-/* 下面的日历 */
-.date {
-    position: relative;
-    margin-top: 10px;
-    padding: 10px 20px;
-    border-radius: 10px;
-    background-color: #ffffff;
-}
-
-.arrow0 {
-    width: 100%;
-    max-height: 46px;
-    position: absolute;
-    top: 10px;
-    left: 0px;
-    text-align: center;
-}
-
-.arrow0 i {
-    font-size: 20px;
-    cursor: pointer;
-}
-
-.arrow0 i:nth-child(1) {
-    margin-right: 10%;
-    text-align: left;
-}
-
-.arrow0 i:nth-child(2) {
-    margin-left: 10%;
-    text-align: right;
-}
-
-.month {
-    text-align: center;
-}
-
-.weekdays {
-    display: flex;
-    margin: 10px 0px;
-}
-
-.weekdays li {
-    flex: 1;
-    text-align: center;
-}
-
-.days {
-    display: flex;
-}
-
-.days li {
-    flex: 1;
-    text-align: center;
-    cursor: pointer;
-}
-
-.days li span {
-    display: inline-block;
-    width: 22px;
-    height: 22px;
-    line-height: 22px;
-}
-
-.days li span:hover {
-    color: #fff;
-    background-color: #409EFF;
-    border-radius: 50%;
-}
-
-.active {
-    display: inline-block;
-    color: #fff;
-    border-radius: 50%;
-    background-color: #52d4fc !important;
-}
-
-.other-month {
-    color: #e4393c;
-}
-</style>