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

修改目录结构

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