提交 274bd541 编写于 作者: lyf's avatar lyf

修改目录结构

上级 71e7d2a7
流水线 #37852 已失败 于阶段
......@@ -6,14 +6,14 @@ $http.setDefaults({
});
// 设置http配置信息 loading、error、clear、encrypt、mockUserInfo
$http.setOptions({
loading () {
console.log('我重写了默认的loading');
}
});
// $http.setOptions({
// loading () {
// console.log('我重写了默认的loading');
// }
// });
// 新增前置钩子
$http.addBeforeHook(config => console.log('我是新增的前置钩子', config), 0);
// $http.addBeforeHook(config => console.log('我是新增的前置钩子', config), 0);
// 新增后置钩子
$http.addAfterHook(response => console.log('我是新增的后置钩子', response), 0);
// $http.addAfterHook(response => console.log('我是新增的后置钩子', response), 0);
import { router } from '@pica-cli/vue-cli-plugin-pica-cli-plugin/auto';
import { toggleSkeletonRouter } from 'mn-template/plugins/toggleSkeleton.js';
console.log(router);
// 问诊订单管理
const diagnosisList = r => require.ensure([], () => r(require('@/views/IM/diagnosis-admin/diagnosis-list.vue')), 'diagnosisList');
const diagnosisIm = r => require.ensure([], () => r(require('@/views/IM/diagnosis-admin/diagnosis-im.vue')), 'diagnosisIm');
......@@ -62,7 +61,6 @@ const routerConfig = [{
}
]
}];
console.log(router);
router.beforeEach(async(to, from, next) => {
toggleSkeletonRouter(to, from);
next();
......
......@@ -6,11 +6,9 @@ import getters from './getters';
import state from './state';
import mutations from './mutations/index';
import actions from './actions/index';
console.log('socket---', socket);
Vue.use(Vuex);
console.log('state---', state, common);
console.log('socket----', socket);
const store = new Vuex.Store({
export default new Vuex.Store({
state,
getters,
mutations,
......@@ -21,4 +19,3 @@ const store = new Vuex.Store({
},
});
export default store;
\ No newline at end of file
const common = {
namespaced:true,
state: {
_token: '',
isFromAssignTask: false,
......@@ -19,11 +20,11 @@ const common = {
changeToken({ commit }, tokenData) {
commit('CHANGE_TOKEN', tokenData);
},
changeTime({ commit }, time) {
changeTime({ commit }) {
commit('SET_TIME', tokenData);
},
}
};
console.log('common', common);
export default common;
// ES6 import
console.log('------start');
import store from '../';
console.log('store---', store);
import io from 'socket.io-client';
console.log('------start----', store);
const _VM = this;
const socketTimer = null;
const socket = {
export default {
namespaced: true,
state: {
socketClient: null,
},
actions: {
initSocket ({ commit }, payload) {
console.log('payload--', payload);
const socketClient = io.connect(payload.url, {
query: {
loginUserNum: `diagnose_list_socket_${payload.userId}`,
......@@ -136,4 +135,3 @@ const socket = {
},
};
export default socket;
\ No newline at end of file
......@@ -66,7 +66,7 @@
</div>
</div>
<div
v-if="allSize>0"
v-if="allSize > 0"
class="pagination-container"
>
<el-pagination
......@@ -88,58 +88,21 @@
import { mapState } from 'vuex';
import storejs from 'storejs';
import InquiryListComponent from '../../../components/common/inquirylist.vue';
import {
conditionUpdate
} from '@/api/workbench';
import { conditionUpdate } from '@/api/workbench';
export default {
components: {
InquiryListComponent,
},
computed: {
...mapState({
allSize: 'allSize',
currentDiagList: 'currentDiagList',
currentCalList: 'currentCalList',
soketQuest: 'soketQuest',
isSuperAdmin: 'isSuperAdmin',
}),
},
watch: {
isSuperAdmin(newdata, olddata) {
// console.log("ererer")
if (newdata !== olddata && newdata.userID) {
console.log('-isSuperAdminisSuperAdmin', newdata);
const s = storejs.get('soketQuest');
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
const p = {
dateTime: d,
operateUserId: id,
pageNo: s ? s.pageNo : 1,
pageSize: s ? s.pageSize : 6,
returnStatus: s ? s.returnStatus : 1,
};
this.searchParam = p;
this.tabPosition = s ? s.returnStatus : 1;
this.inquirySearch('clear');
}
},
},
data() {
const s = storejs.get('soketQuest');
const t = s ? s.returnStatus : 1;
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
const id = s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
return {
tabPosition: t,
tabPosition: '',
showChat: true,
totalRows: 0,
loading: false,
searchParam: {
dateTime: d,
dateTime: '',
checkvalue: '', // 模拟值后去
operateUserId: id,
operateUserId: '',
returnStatus: 1,
pageSize: 6,
pageNo: 1,
......@@ -174,8 +137,50 @@
],
};
},
created() {},
computed: {
...mapState({
allSize: 'allSize',
currentDiagList: 'currentDiagList',
currentCalList: 'currentCalList',
soketQuest: 'soketQuest',
isSuperAdmin: 'isSuperAdmin',
}),
},
watch: {
isSuperAdmin(newdata, olddata) {
console.log('newdata---', newdata);
if (newdata !== olddata && newdata.userID) {
console.log('-isSuperAdminisSuperAdmin', newdata);
const s = storejs.get('soketQuest');
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
const p = {
dateTime: d,
operateUserId: id,
pageNo: s ? s.pageNo : 1,
pageSize: s ? s.pageSize : 6,
returnStatus: s ? s.returnStatus : 1,
};
this.searchParam = p;
this.tabPosition = s ? s.returnStatus : 1;
this.inquirySearch('clear');
}
},
},
created() {
const s = storejs.get('soketQuest');
const t = s ? s.returnStatus : 1;
this.tabPosition = t;
const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
this.searchParam.dateTime = d;
const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
this.operateUserId = id;
},
mounted() {
console.log('this.isSuperAdmin', this.isSuperAdmin);
},
methods: {
tabChange(val) {
......@@ -398,11 +403,11 @@
background-color: #f9fafc;
}
// 屏幕适配
@media screen and (min-width: 1240px) and (max-width: 1441px){
.workbench-container{
.workbench-li-c{
.grid-c{
.workbench-li{
@media screen and (min-width: 1240px) and (max-width: 1441px) {
.workbench-container {
.workbench-li-c {
.grid-c {
.workbench-li {
//max-width: 572px;
}
}
......
......@@ -80,7 +80,6 @@
...mapGetters(['_token'])
},
created() {
console.log(111111111);
vm = this;
vm.getToken();
window._VM = vm;
......@@ -143,7 +142,6 @@
}
this.systemType = systemType;
this.showSlidebar = true;
console.log(res, 111);
vm.userName = res.data.userName;
vm.authList = authList;
}
......
......@@ -70,22 +70,20 @@
},
},
created() {
console.log(111111);
this.getNav();
console.log(111111);
},
methods: {
getNav() {
menuList({ systemType: this.systemType }).then((res) => {
if (res.code == '000000') {
const { vueMenuDtos, userId } = res.data;
console.log('---userId', res.data, userId);
const i = {
isSuper: false,
userID: userId,
};
const u = this.getSocketUrl(BUILD_ENV);
storejs.set('initSocketInfo', { url: u, userId: userId });
console.log('1111');
this.$store.dispatch('socket/initSocket', { url: u, userId: userId });
vueMenuDtos.map((item) => {
if (item.index.indexOf('administrators') > -1) {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册