Merge branch 'master' into feature/groupQrCode

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebPackConfiguration">
-    <option name="mode" value="DISABLED" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/playlet.iml" filepath="$PROJECT_DIR$/.idea/playlet.iml" />
-    </modules>
-  </component>
-</project>

.idea/playlet.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/workspace.xml

@@ -3,11 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="c03feb23-5590-4b06-ae32-412ba98013a8" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/project/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/project/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/editCon.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/editCon.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/chatGroup/createMsgDetail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/chatGroup/createMsgDetail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/massMsgDetail/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/massMsgDetail/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/dataBoard/playletData.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -51,6 +47,14 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -184,6 +188,13 @@
       <workItem from="1660821168376" duration="1185000" />
       <workItem from="1661221770743" duration="624000" />
       <workItem from="1661227123734" duration="254000" />
+      <workItem from="1661251075407" duration="696000" />
+      <workItem from="1661251888095" duration="368000" />
+      <workItem from="1661305868159" duration="670000" />
+      <workItem from="1661336616687" duration="1261000" />
+      <workItem from="1661338111374" duration="432000" />
+      <workItem from="1661392701143" duration="873000" />
+      <workItem from="1661395150121" duration="2965000" />
     </task>
     <servers />
   </component>

index.html

@@ -7,4 +7,4 @@
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
-      })();</script><link href=./static/css/app.07b9c5c4c740b0678b287c33c66f764a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.93049b1f69bc3bfa20ba.js></script><script type=text/javascript src=./static/js/app.b91bea440b49d03c0283.js></script></body></html>
+      })();</script><link href=./static/css/app.c17c05b49e7416ebb9c1a09bcfa07a93.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fdb488ad0fe92d3aa39c.js></script><script type=text/javascript src=./static/js/app.83bab547037684cc1275.js></script></body></html>

project/src/assets/config/config.js

@@ -63,6 +63,7 @@ axios.interceptors.response.use(
       delAllCookie();//清除所以的cookie
       delAllLocal();
       router.push("/login");
+      this.$store.commit('setIsData', undefined)
       if (sessionStorage.getItem('reload') != '1') {
         location.reload();
       }

project/src/components/Index/header.vue

@@ -211,6 +211,7 @@ export default {
         this.$router.push({ path: '/login' })
       } else {
         this.$router.push({ path: '/login' })
+        this.$store.commit('setIsData', undefined)
         this.$cookie.delAllCookie()
         this.$localSelfStore.delAllLocal()
         sessionStorage.clear();

project/src/components/assembly/screen/channel.vue

@@ -2,7 +2,7 @@
   <div class="common-screen-item">
     <label class="common-screen-label" v-if="title && title != ''"
       :style="labelWidth ? 'width:auto;padding-left:30px' : ''">{{ title }}</label>
-    <div :style="width ? 'width:' + width : ''"
+    <!-- <div :style="width ? 'width:' + width : ''"
       :class="['common-screen-self-box', 'common-input-select', (valueCon && valueCon.val) && clearable ? 'common-input-select-hover' : '']">
       <div :class="['common-screen-self-con', (!valueCon || !valueCon.val) ? 'common-screen-self-placeholder' : '']">
         <div class="common-screen-self-con-div">
@@ -17,7 +17,20 @@
         <el-option v-for="item in options" :key="item.key" :label="item.val" :value="item.key">
         </el-option>
       </el-select>
-    </div>
+    </div> -->
+
+    <el-select
+      class="select-cls"
+      v-model="value"
+      :style="{width: width || '210px'}"
+      size="small"
+      :placeholder="placeholderVal || '请选择'"
+      :clearable="clearable"
+      filterable
+      @change="change"
+    >
+      <el-option v-for="item in options" :key="item.key" :label="item.val" :value="item.key" />
+    </el-select>
   </div>
 </template>
 <script>
@@ -296,4 +309,21 @@ export default {
   padding: 0 !important;
   text-align: center;
 }
+.select-cls {
+  /deep/ &.el-select .el-input.is-focus .el-input__inner,
+  /deep/ &.el-select .el-input__inner:focus {
+    border-color: #DCDFE6;
+  }
+  /deep/ .el-input__suffix {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border: 1px solid #DCDFE6;
+    right: 0;
+    width: 30px;
+    background-color: #F1F1F1;
+    .el-input__icon {
+      color: #909399;
+    }
+  }
+}
 </style>

project/src/main.js

@@ -62,6 +62,7 @@ router.beforeEach((to, from, next) => {
   if (to.meta.isLogin) {
     if (!Boolean(getCookie('isLogin'))) {
       next('/login')
+      this.$store.commit('setIsData', undefined)
     } else {
       next();
     }
@@ -70,6 +71,7 @@ router.beforeEach((to, from, next) => {
       //name不存在 解决未登录跳转到页面 而页面未注册的问题
       if (!Boolean(getCookie('isLogin'))) {
         next('/login')
+        this.$store.commit('setIsData', undefined)
       } else {
         next();
       }

project/src/router/allRouter.js

@@ -1,7 +1,10 @@
-const INDEX = () => import('@/components/Index/index.vue')
-const Home = () => import('@/components/Home.vue')
-const homeData = () => import('@/components/HomeData.vue')
+// import INDEX from '@/components/Index/index.vue'
+// import Home from '@/components/Home.vue'
+// import homeData from '@/components/HomeData.vue'
 
+const INDEX = () => import(/* webpackChunkName: 'INDEX' */'@/components/Index/index.vue')
+const Home = () => import(/* webpackChunkName: 'Home' */'@/components/Home.vue')
+const homeData = () => import(/* webpackChunkName: 'homeData' */'@/components/HomeData.vue')
 const customManage = () => import(/* webpackChunkName: 'customManage' */ '@/components/customManage/manage.vue')
 const employee_bulk_messaging_log = () => import(/* webpackChunkName: 'employee_bulk_messaging_log' */ '@/components/customOperate/employee_bulk_messaging_log.vue')
 const chatGroup = () => import(/* webpackChunkName: 'chatGroup' */ '@/components/customOperate/chatGroup/index.vue')