Merge branch 'master' of http://adicom-hxx.natapp1.cc/CQ_ADI/airoptweb

src/views/home/querylist.vue

@@ -30,18 +30,18 @@
             <el-table-column prop="remark" label="描述" width="160"/>
             <el-table-column prop="creator" label="创建人" width="160"/>
             <el-table-column prop="createtime" label="创建时间">
-                <template #default="scope">
+                <!-- <template #default="scope">
                     {{ formatDate(scope.row.createtime) }}
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column prop="updatetime" label="更新时间">
-                <template #default="scope">
+                <!-- <template #default="scope">
                     {{ formatDate(scope.row.updatetime) }}
-                </template>
+                </template> -->
             </el-table-column>
             <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template #default="scope">
-                  <el-button size="small" type="text" icon="el-icon-delete" @click.stop="confirmDelete(scope.$index, scope.row)">删除</el-button>
+                  <el-button size="small" text icon="el-icon-delete" @click.stop="confirmDelete(scope.$index, scope.row)">删除</el-button>
                 </template>
               </el-table-column>
         </el-table>
@@ -49,8 +49,8 @@
             <el-pagination
                 v-model:current-page="gd.currentPage4"
                 v-model:page-size="gd.pageSize4"
-                small
                 background
+                size="small"
                 layout="prev, slot, pager, next"
                 :total="parseInt(gd.total)"
                 class="mt-4"

src/views/titlecomponent/ADflow.vue

@@ -57,7 +57,7 @@
               <div style="line-height: 15px">{{uploadStatus}}</div>
             </el-col>
             <!-- <el-col :span="2">
-              <el-button type="text" @click="fileDel" :icon="Delete" circle style="color: red; padding-bottom:25px;" />
+              <el-button text @click="fileDel" :icon="Delete" circle style="color: red; padding-bottom:25px;" />
             </el-col> -->
           </el-row>
         </el-form-item>