逻辑优化

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. 17
      src/page/index/index.vue
  4. 2
      src/views/flow/follow.vue

@ -61,12 +61,12 @@
load() {
this.show();
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;
}
var list = [];
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]`);
}
}
@ -84,7 +84,7 @@
let time = 3;
const timeFunc = setInterval(() => {
time--;
if (time == 0) {
if (time === 0) {
this.hide();
clearInterval(timeFunc);
}

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

@ -2,7 +2,7 @@
<div class="avue-contail" :class="{'avue--collapse':isCollapse}">
<div class="avue-header">
<!-- 顶部导航栏 -->
<top ref="top" />
<top ref="top"/>
</div>
<div class="avue-layout">
<div class="avue-left">
@ -11,7 +11,7 @@
</div>
<div class="avue-main">
<!-- 顶部标签卡 -->
<tags />
<tags/>
<transition name="fade-scale">
<search class="avue-view" v-show="isSearch"></search>
</transition>
@ -47,7 +47,7 @@
sidebar
},
name: "index",
provide () {
provide() {
return {
index: this
};
@ -87,16 +87,15 @@
});
},
//
openMenu (item = {}) {
openMenu(item = {}) {
this.$store.dispatch("GetMenu", item.id).then(data => {
if (data.length !== 0) {
this.$router.$avueRouter.formatRoutes(data, true);
}
//
if (!this.validatenull(item)) {
//
/*if (!this.validatenull(item)) {
let itemActive = {},
childItemActive = 0;
//vue-router
if (item.path) {
itemActive = item;
} else {
@ -109,11 +108,11 @@
this.$store.commit('SET_MENU_ID', item);
this.$router.push({
path: this.$router.$avueRouter.getPath({
name: itemActive.label,
name: (itemActive.label || itemActive.name),
src: itemActive.path
}, itemActive.meta)
});
}
}*/
});
},

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

Loading…
Cancel
Save