monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 34db9599cc9ff61847df854a32b91bde6566bc9e 2 parents 83a5572c d04ff1ec

Merge branch 'master-prod-500-lushangqing' into 'master-500-prod' 

【596】登录logo 支持配置-功能迁移



See merge request !677
Inline Side-by-side
Showing 5 changed files with 7 additions and 19 deletions
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 margin-left:6px; 29 margin-left:6px;
30 width:200px; 30 width:200px;
31 } 31 }
32 -.upload-demo-logoConfig{ 32 +.upload-demo{
33 margin-left:20px; 33 margin-left:20px;
34 width:93px; 34 width:93px;
35 } 35 }
@@ -143,12 +143,6 @@ const routes = [{ @@ -143,12 +143,6 @@ const routes = [{
143 name: 'logoConfig', 143 name: 'logoConfig',
144 component: () => myImport('views/logoConfig/index') 144 component: () => myImport('views/logoConfig/index')
145 }, 145 },
146 - //忙时配置  
147 - {  
148 - path: '/vue3/busyConfig',  
149 - name: 'busyConfig',  
150 - component: () => myImport('views/busyConfig/index')  
151 - },  
152 ]; 146 ];
153 147
154 // hash模式： createWebHashHistory 148 // hash模式： createWebHashHistory
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 </dev> 25 </dev>
26 </template> 26 </template>
27 <el-upload 27 <el-upload
28 - class="upload-demo-logoConfig" 28 + class="upload-demo"
29 :show-file-list="false" 29 :show-file-list="false"
30 :before-upload="beforeAvatarUpload" 30 :before-upload="beforeAvatarUpload"
31 :data="item.imageUrl" 31 :data="item.imageUrl"
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 </dev> 57 </dev>
58 </template> 58 </template>
59 <el-upload 59 <el-upload
60 - class="upload-demo-logoConfig" 60 + class="upload-demo"
61 :show-file-list="false" 61 :show-file-list="false"
62 :before-upload="beforeAvatarUpload" 62 :before-upload="beforeAvatarUpload"
63 :data="item.imageUrlBg" 63 :data="item.imageUrlBg"
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </dev> 88 </dev>
89 </template> 89 </template>
90 <el-upload 90 <el-upload
91 - class="upload-demo-logoConfig" 91 + class="upload-demo"
92 :show-file-list="false" 92 :show-file-list="false"
93 :before-upload="beforeAvatarUpload" 93 :before-upload="beforeAvatarUpload"
94 :data="item.imageUrlSkin" 94 :data="item.imageUrlSkin"
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 </dev> 119 </dev>
120 </template> 120 </template>
121 <el-upload 121 <el-upload
122 - class="upload-demo-logoConfig" 122 + class="upload-demo"
123 :show-file-list="false" 123 :show-file-list="false"
124 :before-upload="beforeAvatarUpload" 124 :before-upload="beforeAvatarUpload"
125 :data="item.imageUrlIndex" 125 :data="item.imageUrlIndex"
@@ -282,8 +282,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -282,8 +282,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
282 rowTail = '</div>'; 282 rowTail = '</div>';
283 } 283 }
284 if(v.ddicCode=="userLayout"){ 284 if(v.ddicCode=="userLayout"){
285 - var selectOption=' <option value="layout">简约布局</option>'+  
286 - ' <option value="layout-nx">经典布局</option>'; 285 + var selectOption=' <option value="layout">默认布局</option>'+
  286 + ' <option value="layout-nx">layout-nx</option>';
287 287
288 str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+ 288 str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
289 ' <option value="" style="display:none;"></option>'+ selectOption + 289 ' <option value="" style="display:none;"></option>'+ selectOption +
@@ -238,12 +238,6 @@ const routes = [{ @@ -238,12 +238,6 @@ const routes = [{
238 name: 'logoConfig', 238 name: 'logoConfig',
239 component: () => myImport('views/logoConfig/index') 239 component: () => myImport('views/logoConfig/index')
240 }, 240 },
241 - //忙时配置  
242 - {  
243 - path: '/vue3/busyConfig',  
244 - name: 'busyConfig',  
245 - component: () => myImport('views/busyConfig/index')  
246 - },  
247 ]; 241 ];
248 242
249 // hash模式： createWebHashHistory 243 // hash模式： createWebHashHistory