Commit afb8f9c8 authored by jingnan's avatar jingnan 👀

合并基座代码(新UI合并),节点f7992bd6

parent 469e032d
(window["webpackJsonp-dee-config"]=window["webpackJsonp-dee-config"]||[]).push([["chunk-2d0e4e32"],{"91ae":function(e,n,o){var t={"./":"c717","./components/LogOrgSelect":"0331","./components/LogOrgSelect/":"0331","./components/LogOrgSelect/config":"2006","./components/LogOrgSelect/config.js":"2006","./components/LogOrgSelect/index":"0331","./components/LogOrgSelect/index.vue":"0331","./components/cron":"a944","./components/cron/":"a944","./components/cron/index":"a944","./components/cron/index.vue":"a944","./components/demo":"22d2","./components/demo/":"22d2","./components/demo/index":"22d2","./components/demo/index.vue":"22d2","./components/dxJobStep":"cd69","./components/dxJobStep/":"cd69","./components/dxJobStep/index":"cd69","./components/dxJobStep/index.vue":"cd69","./components/editDxJobDefinition":"7226","./components/editDxJobDefinition/":"7226","./components/editDxJobDefinition/index":"7226","./components/editDxJobDefinition/index.vue":"7226","./components/stepAndLog":"ec85","./components/stepAndLog/":"ec85","./components/stepAndLog/index":"ec85","./components/stepAndLog/index.vue":"ec85","./components/stepTableName":"98ff","./components/stepTableName/":"98ff","./components/stepTableName/index":"98ff","./components/stepTableName/index.vue":"98ff","./index":"c717","./index.js":"c717","./signConfig":"cb57","./signConfig.js":"cb57"};function c(e){var n=s(e);return o(n)}function s(e){if(!o.o(t,e)){var n=new Error("Cannot find module '"+e+"'");throw n.code="MODULE_NOT_FOUND",n}return t[e]}c.keys=function(){return Object.keys(t)},c.resolve=s,e.exports=c,c.id="91ae"}}]);
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -39,7 +39,7 @@ export default {
deep: true,
handler: function(val) {
if (val && val.length) {
this.evenList = val
this.evenList = val.filter(r => r.show)
}
}
}
......
......@@ -15,7 +15,7 @@
:key="itemDataIndex"
class="list-drag-item"
>
<span>{{ element.title!=='标签项' && element.name ? element.name : element.title }}</span>
<span>{{ element.name ? element.name : (element.title || '标签项') }}</span>
<span>
<el-checkbox v-model="element.show" />&nbsp;&nbsp;
<i
......
......@@ -15,7 +15,7 @@
:key="itemDataIndex"
class="list-drag-item"
>
<span>{{ element.title!=='标签项' && element.name ? element.name : element.title }}</span>
<span>{{ element.name || '标签项' }}</span>
<span>
<el-checkbox v-model="element.show" />&nbsp;&nbsp;
<i
......
const containerComponents = [ // 容器组件
'DeeInjectionRuleTemp',
'DeeFilterArea',
'DeeFilterAreaFixed',
'ResultLayout'
]
......
......@@ -52,7 +52,7 @@
<span>{{ item.name }}</span>
</div>
</div>
<div class="personal-tab-box">
<!-- <div class="personal-tab-box">
<div class="personal-popover-operation">
<img :src="delObjectVisit" alt="" class="personal-popover-operation-item" @click="delObjectVisitData">
<img :src="toVisitTop" alt="" class="personal-popover-operation-item" style="padding-right:34px" @click="toTop">
......@@ -86,9 +86,9 @@
</el-scrollbar>
</el-tab-pane>
</el-tabs>
</div>
</div> -->
</div>
<div slot="reference" class="avatar-box" @click="findVisitData">
<div slot="reference" class="avatar-box">
<img v-if="userInfo" alt="" :src="userInfo.userAvatar" class="right-menu-item-img">
<span v-if="userInfo && userInfo.userName" class="nickname">({{ userInfo.userName }})</span>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment