Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
23d2d0ab by weimo934
Options

Merge remote-tracking branch 'origin/3ddc' into 3ddc

2 parents 40ea133d 65f968de
Inline Side-by-side
Showing 3 changed files with 28 additions and 13 deletions
...@@ -255,9 +255,9 @@ ...@@ -255,9 +255,9 @@
255 margin-right: 6px; 255 margin-right: 6px;
256 } 256 }
257 .secondMenuItem-image.point-image { 257 .secondMenuItem-image.point-image {
258 width: 4px; 258 width: 22px;
259 height: 4px; 259 height:22px;
260 margin-right: 11px; 260 margin-right: 8px;
261 } 261 }
262 262
263 .el-submenu .el-submenu__title { 263 .el-submenu .el-submenu__title {
......
...@@ -307,7 +307,7 @@ function leftMenuFormat (data) { ...@@ -307,7 +307,7 @@ function leftMenuFormat (data) {
307 */ 307 */
308 function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) { 308 function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) {
309 //判断路由 2020年6月8日 18:31:37 vers 309 //判断路由 2020年6月8日 18:31:37 vers
310 /*if(navigator==='规划成果审查'){ 310 if(navigator==='规划成果审查'){
311 var activeIconUrlList = [ 311 var activeIconUrlList = [
312 'image/index/menus/reviewmanage/icon_dbsx_select.svg', 312 'image/index/menus/reviewmanage/icon_dbsx_select.svg',
313 'image/index/menus/reviewmanage/icon_ybsx_select.svg', 313 'image/index/menus/reviewmanage/icon_ybsx_select.svg',
...@@ -340,7 +340,7 @@ function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) { ...@@ -340,7 +340,7 @@ function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) {
340 data[i].iconActive = activeIconUrlList[j] 340 data[i].iconActive = activeIconUrlList[j]
341 } 341 }
342 } 342 }
343 }*/ 343 }
344 344
345 // 扁平数组数据转树形数据 345 // 扁平数组数据转树形数据
346 data = leftMenuFormat(data); 346 data = leftMenuFormat(data);
......
...@@ -94,6 +94,9 @@ ...@@ -94,6 +94,9 @@
94 border-radius: 2px; 94 border-radius: 2px;
95 outline: 0; 95 outline: 0;
96 } 96 }
97 [v-cloak]{
98 display: none;
99 }
97 </style> 100 </style>
98 </head> 101 </head>
99 <body> 102 <body>
...@@ -182,7 +185,7 @@ ...@@ -182,7 +185,7 @@
182 width="373" 185 width="373"
183 > 186 >
184 <template slot-scope="scope"> 187 <template slot-scope="scope">
185 <span>{{ 188 <span v-cloak>{{
186 scope.row.CREATETIME | dataFormat 189 scope.row.CREATETIME | dataFormat
187 }}</span> 190 }}</span>
188 </template> 191 </template>
...@@ -194,7 +197,7 @@ ...@@ -194,7 +197,7 @@
194 width="403" 197 width="403"
195 > 198 >
196 <template slot-scope="scope"> 199 <template slot-scope="scope">
197 <span>{{ 200 <span v-cloak>{{
198 scope.row.RECEIVETIME | dataFormat 201 scope.row.RECEIVETIME | dataFormat
199 }}</span> 202 }}</span>
200 </template> 203 </template>
...@@ -259,9 +262,11 @@ ...@@ -259,9 +262,11 @@
259 align="center" 262 align="center"
260 width="373" 263 width="373"
261 > 264 >
262 <span>{{ 265 <template slot-scope="scope">
266 <span v-cloak>{{
263 scope.row.CREATETIME | dataFormat 267 scope.row.CREATETIME | dataFormat
264 }}</span> 268 }}</span>
269 </template>
265 </el-table-column> 270 </el-table-column>
266 <el-table-column 271 <el-table-column
267 prop="RECEIVETIME" 272 prop="RECEIVETIME"
...@@ -269,9 +274,11 @@ ...@@ -269,9 +274,11 @@
269 align="center" 274 align="center"
270 width="403" 275 width="403"
271 > 276 >
272 <span>{{ 277 <template slot-scope="scope">
278 <span v-cloak>{{
273 scope.row.RECEIVETIME | dataFormat 279 scope.row.RECEIVETIME | dataFormat
274 }}</span> 280 }}</span>
281 </template>
275 </el-table-column> 282 </el-table-column>
276 </el-table> 283 </el-table>
277 <el-table 284 <el-table
...@@ -333,9 +340,11 @@ ...@@ -333,9 +340,11 @@
333 align="center" 340 align="center"
334 width="373" 341 width="373"
335 > 342 >
336 <span>{{ 343 <template slot-scope="scope">
344 <span v-cloak>{{
337 scope.row.CREATETIME | dataFormat 345 scope.row.CREATETIME | dataFormat
338 }}</span> 346 }}</span>
347 </template>
339 </el-table-column> 348 </el-table-column>
340 <el-table-column 349 <el-table-column
341 prop="RECEIVETIME" 350 prop="RECEIVETIME"
...@@ -343,9 +352,11 @@ ...@@ -343,9 +352,11 @@
343 align="center" 352 align="center"
344 width="403" 353 width="403"
345 > 354 >
346 <span>{{ 355 <template slot-scope="scope">
356 <span v-cloak>{{
347 scope.row.RECEIVETIME | dataFormat 357 scope.row.RECEIVETIME | dataFormat
348 }}</span> 358 }}</span>
359 </template>
349 </el-table-column> 360 </el-table-column>
350 </el-table> 361 </el-table>
351 <el-table 362 <el-table
...@@ -407,9 +418,11 @@ ...@@ -407,9 +418,11 @@
407 align="center" 418 align="center"
408 width="373" 419 width="373"
409 > 420 >
410 <span>{{ 421 <template slot-scope="scope">
422 <span v-cloak>{{
411 scope.row.CREATETIME | dataFormat 423 scope.row.CREATETIME | dataFormat
412 }}</span> 424 }}</span>
425 </template>
413 </el-table-column> 426 </el-table-column>
414 <el-table-column 427 <el-table-column
415 prop="RECEIVETIME" 428 prop="RECEIVETIME"
...@@ -417,9 +430,11 @@ ...@@ -417,9 +430,11 @@
417 align="center" 430 align="center"
418 width="403" 431 width="403"
419 > 432 >
420 <span>{{ 433 <template slot-scope="scope">
434 <span v-cloak>{{
421 scope.row.RECEIVETIME | dataFormat 435 scope.row.RECEIVETIME | dataFormat
422 }}</span> 436 }}</span>
437 </template>
423 </el-table-column> 438 </el-table-column>
424 </el-table> 439 </el-table>
425 <!-- 分页区域--> 440 <!-- 分页区域-->
......