逻辑优化

pull/59/head
smallchill 6 years ago
parent 5e11ea86e0
commit ecbadb5cce
  1. 6
      src/components/iframe/main.vue
  2. 2
      src/const/user/info.js
  3. 9
      src/page/index/index.vue
  4. 2
      src/views/flow/follow.vue

@ -61,12 +61,12 @@
load() { load() {
this.show(); this.show();
var flag = true; //URL var flag = true; //URL
if (this.$route.query.src.indexOf("?") == -1) { if (this.$route.query.src !== undefined && this.$route.query.src.indexOf("?") === -1) {
flag = false; flag = false;
} }
var list = []; var list = [];
for (var key in this.$route.query) { for (var key in this.$route.query) {
if (key != "src" && key != "name" && key != "i18n") { if (key !== "src" && key !== "name" && key !== "i18n") {
list.push(`${key}= this.$route.query[key]`); list.push(`${key}= this.$route.query[key]`);
} }
} }
@ -84,7 +84,7 @@
let time = 3; let time = 3;
const timeFunc = setInterval(() => { const timeFunc = setInterval(() => {
time--; time--;
if (time == 0) { if (time === 0) {
this.hide(); this.hide();
clearInterval(timeFunc); clearInterval(timeFunc);
} }

@ -13,7 +13,7 @@ export default {
url: 'link', url: 'link',
}, },
canvasOption: { canvasOption: {
text: 'bladex', text: '',
ratio: 0.1 ratio: 0.1
}, },
action: '/api/blade-resource/oss/endpoint/put-file', action: '/api/blade-resource/oss/endpoint/put-file',

@ -92,11 +92,10 @@
if (data.length !== 0) { if (data.length !== 0) {
this.$router.$avueRouter.formatRoutes(data, true); this.$router.$avueRouter.formatRoutes(data, true);
} }
// //
if (!this.validatenull(item)) { /*if (!this.validatenull(item)) {
let itemActive = {}, let itemActive = {},
childItemActive = 0; childItemActive = 0;
//vue-router
if (item.path) { if (item.path) {
itemActive = item; itemActive = item;
} else { } else {
@ -109,11 +108,11 @@
this.$store.commit('SET_MENU_ID', item); this.$store.commit('SET_MENU_ID', item);
this.$router.push({ this.$router.push({
path: this.$router.$avueRouter.getPath({ path: this.$router.$avueRouter.getPath({
name: itemActive.label, name: (itemActive.label || itemActive.name),
src: itemActive.path src: itemActive.path
}, itemActive.meta) }, itemActive.meta)
}); });
} }*/
}); });
}, },

@ -88,7 +88,7 @@
search: true, search: true,
}, },
{ {
label: "流程实例id", label: "实例id",
prop: "processInstanceId", prop: "processInstanceId",
search: true, search: true,
width: 320, width: 320,

Loading…
Cancel
Save