Browse Source

Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

shibei_master
jiangyy 3 years ago
parent
commit
d669038450
  1. 1
      src/views/modules/importRecord/index.vue
  2. 4
      src/views/modules/warning/components/screen-table/index.vue

1
src/views/modules/importRecord/index.vue

@ -33,7 +33,6 @@
>下载结果说明</a >下载结果说明</a
> >
<span <span
style="color: #00a7a9; cursor: pointer"
v-else-if=" v-else-if="
scope.row.processStatus == 'finished_fail' && scope.row.processStatus == 'finished_fail' &&
!scope.row.resultDescFile !scope.row.resultDescFile

4
src/views/modules/warning/components/screen-table/index.vue

@ -325,13 +325,13 @@ export default {
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
box-sizing: border-box; box-sizing: border-box;
width: 215px; width: 500px;
height: auto; height: auto;
line-height: 20px; line-height: 20px;
border: 1px solid red; border: 1px solid red;
position: absolute; position: absolute;
right: -100%; right: -100%;
top: 150%; bottom: 150%;
background: #fff; background: #fff;
box-shadow: 0 0 10px 0 #2194fe; box-shadow: 0 0 10px 0 #2194fe;
border: 1px solid #42a4fe; border: 1px solid #42a4fe;

Loading…
Cancel
Save