Browse Source

拉取大妈

zhuxinbo 4 years ago
parent
commit
1885915c19

+ 1 - 1
src/components/tools/HeaderNotice.vue

@@ -124,7 +124,7 @@
      // this.heartCheckFun();
     },
     destroyed: function () { // 离开页面生命周期函数
-      this.websocketclose();
+    //   this.websocketclose();
     },
     methods: {
       timerFun() {

+ 1 - 1
src/components/tools/UserMenu.vue

@@ -31,7 +31,7 @@
         <a-icon type="question-circle-o"></a-icon>
       </a>
     </span>
-    <header-notice class="action"/>
+    <!-- <header-notice class="action"/> -->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>

+ 14 - 5
src/main.js

@@ -4,15 +4,21 @@ import Storage from 'vue-ls'
 import router from './router'
 import store from './store/'
 
-import {VueAxios} from "@/utils/request"
+import {
+  VueAxios
+} from "@/utils/request"
 
 import Antd from 'ant-design-vue'
 import Viser from 'viser-vue'
-import 'ant-design-vue/dist/antd.less';  // or 'ant-design-vue/dist/antd.less'
+import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less'
 
 import '@/permission' // permission control
 import '@/utils/filter' // base filter
-import { getAction,postFormAction ,postAction} from "@/api/manage"
+import {
+  getAction,
+  postFormAction,
+  postAction
+} from "@/api/manage"
 import Print from 'vue-print-nb-jeecg'
 /*import '@babel/polyfill'*/
 import VueApexCharts from 'vue-apexcharts'
@@ -51,7 +57,10 @@ import '!style-loader!css-loader!less-loader!./theme/index.less'
 // import ElementUI from 'element-ui';
 // import 'element-ui/lib/theme-chalk/index.css';
 
-import { getDay,allWeeks } from '@/utils/getDay.js'
+import {
+  getDay,
+  allWeeks
+} from '@/utils/getDay.js'
 
 import * as WPS from './assets/jwps.es6'
 Vue.prototype.wps = WPS;
@@ -98,4 +107,4 @@ new Vue({
     store.commit('SET_MULTI_PAGE', Vue.ls.get(DEFAULT_MULTI_PAGE, true))
   },
   render: h => h(App)
-}).$mount('#app')
+}).$mount('#app')

+ 36 - 33
src/permission.js

@@ -4,12 +4,13 @@ import store from './store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import notification from 'ant-design-vue/es/notification'
-import { ACCESS_TOKEN,INDEX_MAIN_PAGE_PATH } from '@/store/mutation-types'
-import { generateIndexRouter } from "@/utils/util"
+import {ACCESS_TOKEN} from '@/store/mutation-types'
+import {generateIndexRouter} from "@/utils/util"
 
-NProgress.configure({ showSpinner: false }) // NProgress Configuration
+NProgress.configure({showSpinner: false}) // NProgress Configuration
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result','/user/alteration'] // no redirect whitelist
+
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/user/transfer-local','/errorPage','http://192.168.0.111:8088/jeecg-boot/sys/feishu/url','/user/FStransfer'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
@@ -17,40 +18,42 @@ router.beforeEach((to, from, next) => {
   if (Vue.ls.get(ACCESS_TOKEN)) {
     /* has token */
     if (to.path === '/user/login') {
-      next({ path: INDEX_MAIN_PAGE_PATH })
+      next({path: '/dashboard/workplace'})
       NProgress.done()
     } else {
       if (store.getters.permissionList.length === 0) {
         store.dispatch('GetPermissionList').then(res => {
-              const menuData = res.result.menu;
-              console.log(res.message)
-              if (menuData === null || menuData === "" || menuData === undefined) {
-                return;
-              }
-              let constRoutes = [];
-              constRoutes = generateIndexRouter(menuData);
-              // 添加主界面路由
-              store.dispatch('UpdateAppRouter',  { constRoutes }).then(() => {
-                // 根据roles权限生成可访问的路由表
-                // 动态添加可访问路由表
-                router.addRoutes(store.getters.addRouters)
-                const redirect = decodeURIComponent(from.query.redirect || to.path)
-                if (to.path === redirect) {
-                  // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-                  next({ ...to, replace: true })
-                } else {
-                  // 跳转到目的路由
-                  next({ path: redirect })
-                }
-              })
-            })
+          console.log(res,34567890)
+          const menuData = res.result.menu;
+          localStorage.setItem("roleCode",res.result.roleCode)
+          console.log(res.message)
+          if (menuData === null || menuData === "" || menuData === undefined) {
+            return;
+          }
+          let constRoutes = [];
+          constRoutes = generateIndexRouter(menuData);
+          // 添加主界面路由
+          store.dispatch('UpdateAppRouter', {constRoutes}).then(() => {
+            // 根据roles权限生成可访问的路由表
+            // 动态添加可访问路由表
+            router.addRoutes(store.getters.addRouters)
+            const redirect = decodeURIComponent(from.query.redirect || to.path)
+            if (to.path === redirect) {
+              // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+              next({...to, replace: true})
+            } else {
+              // 跳转到目的路由
+              next({path: redirect})
+            }
+          })
+        })
           .catch(() => {
-           /* notification.error({
-              message: '系统提示',
-              description: '请求用户信息失败,请重试!'
-            })*/
+            /* notification.error({
+               message: '系统提示',
+               description: '请求用户信息失败,请重试!'
+             })*/
             store.dispatch('Logout').then(() => {
-              next({ path: '/user/login', query: { redirect: to.fullPath } })
+              next({path: '/user/login', query: {redirect: to.fullPath}})
             })
           })
       } else {
@@ -62,7 +65,7 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单,直接进入
       next()
     } else {
-      next({ path: '/user/login', query: { redirect: to.fullPath } })
+      next({path: '/user/login', query: {redirect: to.fullPath}})
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }
   }

+ 7 - 6
src/views/modules/BatchCreate/toutiaoTime.vue

@@ -6,7 +6,8 @@
           <th rowspan="2" style="width:120px">日期/时间(时)</th>
         </tr>
         <tr>
-          <th class="unselectable" colspan="2" v-for="(num, index) in numData" :key="index" style="width:50px">{{ num }}</th>
+          <th class="unselectable" colspan="2" v-for="(num, index) in numData" :key="index" style="width:50px">{{ num }}
+          </th>
         </tr>
       </thead>
       <tbody>
@@ -327,10 +328,10 @@
   }
 
   * {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+    -webkit-touch-callout: none !important;
+    -webkit-user-select: none !important;
+    -moz-user-select: none !important;
+    -ms-user-select: none !important;
+    user-select: none !important;
   }
 </style>

+ 2 - 2
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -123,7 +123,7 @@
         :closable="pane.closable" class="shishishis">
         <a-form @submit="handleSubmit" :form="form" style="margin-top:20px" :hideRequiredMark="true">
           <a-form-item label="广告组名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input v-model="pane.tab" readonly></a-input>
+            <a-input v-model="pane.tab" readOnly></a-input>
           </a-form-item>
           <a-form-item label="素材类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-radio-group buttonStyle="solid" v-decorator="['creativeMaterialType', { initialValue: '1' }]">
@@ -482,7 +482,7 @@
 
 
                 {{ item.trackName }}
-                <a-input v-model="item.trackUrl" readonly style="margin:10px"></a-input>
+                <a-input v-model="item.trackUrl" readOnly style="margin:10px"></a-input>
               </a-list-item>
             </a-list>
           </a-card>

+ 5 - 5
src/views/modules/kuaishouapp/account/stepForm/stepModule/test.vue

@@ -299,10 +299,10 @@ export default {
   background: aqua;
 }
 * {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+  -webkit-touch-callout: none !important;
+  -webkit-user-select: none !important;
+  -moz-user-select: none !important;
+  -ms-user-select: none !important;
+  user-select: none !important;
 }
 </style>

+ 1 - 1
src/views/modules/material/excellentMaterial.vue

@@ -310,7 +310,7 @@
             </div>
             <div v-if="showUrlWater">
               <a-form-item label="水印素材链接" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
-                <a-input v-model="showUrlWater" type="text" readonly  />
+                <a-input v-model="showUrlWater" type="text" readOnly  />
               </a-form-item>
             </div>
             <a-form-item label="标签" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="detail.tag">

+ 1 - 1
src/views/modules/material/supplierMaterial.vue

@@ -474,7 +474,7 @@
             </div>
             <div>
               <a-form-item label="水印链接" v-if="watermarkUrl">
-                <a-input v-model="watermarkUrl" type="text" style="width:200%" readonly />
+                <a-input v-model="watermarkUrl" type="text" style="width:200%" readOnly />
               </a-form-item>
               <a-form-item label="生成水印" v-else>
                 <a-button type="primary" @click="createWater" :loading="creatLoading">生成</a-button>

+ 1 - 1
src/views/modules/material/videoMaterial.vue

@@ -1046,7 +1046,7 @@ a {
             </div>
             <div>
               <a-form-item label="水印素材链接" v-if="showUrlWater">
-                <a-input v-model="showUrlWater" type="text" readonly />
+                <a-input v-model="showUrlWater" type="text" readOnly />
               </a-form-item>
             </div>
             <div style="width:100%" class="downLoad">

+ 2 - 2
vue.config.js

@@ -57,7 +57,7 @@ module.exports = {
     proxy: {
       '/jeecg-boot': {
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
+        target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8088', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.0.230:8088', //请求本地 需要jeecg-boot后台项目  孙震
@@ -67,7 +67,7 @@ module.exports = {
         // target: 'https://trac.tjyourong.com.cn', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目 
         // target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目 
-        target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目 
+        // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目 
 
         ws: false,
         changeOrigin: true,