Browse Source

commit

dev-remain
revive 4 years ago
parent
commit
aa1e87b5ab
4 changed files with 21 additions and 9 deletions
  1. +6
    -3
      dist/static/css/main.css
  2. +10
    -0
      public/static/css/main.css
  3. +2
    -2
      src/components/app-header/app-header.vue
  4. +3
    -4
      src/views/manage_system/template/index.vue

+ 6
- 3
dist/static/css/main.css View File

@@ -3354,9 +3354,11 @@ button:focus {
.admin_contentBox_bodyPain { .admin_contentBox_bodyPain {
margin: 10px; margin: 10px;
min-width: 600px;
min-width: 666px;
}
.el-form-item__error{
background-color: none;
} }
.el-table th { .el-table th {
height: 27px; height: 27px;
background-color: #EBEBF2; background-color: #EBEBF2;
@@ -8850,9 +8852,10 @@ h5.dulilabel{
display: inline-block; display: inline-block;
width: 28px; width: 28px;
height: 28px; height: 28px;
background-color: #ccc;
background-color: #ccc;
background: url(/static/img/icon_pic_01.png) no-repeat -180px 0px; background: url(/static/img/icon_pic_01.png) no-repeat -180px 0px;
} }
.selfupdate .webuploader-pick{ .selfupdate .webuploader-pick{
width: 120px width: 120px
} }


+ 10
- 0
public/static/css/main.css View File

@@ -8853,6 +8853,16 @@ h5.dulilabel{
background-color: #ccc; background-color: #ccc;
background: url(/static/img/icon_pic_01.png) no-repeat -180px 0px; background: url(/static/img/icon_pic_01.png) no-repeat -180px 0px;
} }
.el-icon-error::before{
content: "";
display: inline-block;
width: 28px;
height: 28px;
background-color: #ccc;
background: url(/static/img/严重警示.svg) no-repeat;
}
.selfupdate .webuploader-pick{ .selfupdate .webuploader-pick{
width: 120px width: 120px
} }


+ 2
- 2
src/components/app-header/app-header.vue View File

@@ -32,12 +32,12 @@
</div> </div>
<div class="app-header-content-right"> <div class="app-header-content-right">
<slot name="right"></slot> <slot name="right"></slot>
<span @click="toRecycle" v-if="showUserCenter">
<!-- <span @click="toRecycle" v-if="showUserCenter">
<i <i
class="Cicon icon font_family icon-icon_huishouzhan" class="Cicon icon font_family icon-icon_huishouzhan"
:class="{inRecycle:isInRecycle}" :class="{inRecycle:isInRecycle}"
/> />
</span>
</span> -->
<user-center v-if="showUserCenter" /> <user-center v-if="showUserCenter" />
</div> </div>
</div> </div>


+ 3
- 4
src/views/manage_system/template/index.vue View File

@@ -2144,10 +2144,10 @@ export default {
setTimeout(() => { setTimeout(() => {
this.$refs.tree.setCurrentKey(targetTemlate.id || 'default'); this.$refs.tree.setCurrentKey(targetTemlate.id || 'default');
}, 0); }, 0);
debugger;
//debugger;
} else { } else {
this.getTempNameAndData(listTemplateTree[0]); this.getTempNameAndData(listTemplateTree[0]);
debugger;
//debugger;
setTimeout(() => { setTimeout(() => {
this.$refs.tree.setCurrentKey('default'); this.$refs.tree.setCurrentKey('default');
}, 0); }, 0);
@@ -2641,7 +2641,6 @@ export default {
}, },
//确定导入模板操作 //确定导入模板操作
enterImport: function () { enterImport: function () {
debugger;
var firstIndustryID = ""; var firstIndustryID = "";
var detailIndustryID = ""; var detailIndustryID = "";
if ( if (
@@ -3184,7 +3183,7 @@ export default {
// } // }
// } // }
if (!value) return true; if (!value) return true;
debugger;
//debugger;
return data.label.indexOf(value) !== -1; return data.label.indexOf(value) !== -1;
}, },
/** /**


Loading…
Cancel
Save