合并

src/views/quality/qualityConstructionLog/index.vue

@@ -123,6 +123,8 @@ const data = reactive<PageData<QualityConstructionLogForm, QualityConstructionLo
     pageSize: 10,
     projectId: currentProject.value.goId,
     happenDate: undefined,
+    orderByColumn: 'createTime',
+    isAsc: 'desc',
     params: {}
   },
   rules: {

src/views/safety/documentSafetyMeeting/index.vue

@@ -35,10 +35,14 @@
               </div>
               <div v-if="toolStart">
                 <el-button type="warning" @click="onBatchAll">
-                  <el-icon><Tools /></el-icon>取消操作</el-button
+                  <el-icon>
+                    <Tools /> </el-icon
+                  >取消操作</el-button
                 >
                 <el-button type="danger" @click="onDeleteAll">
-                  <el-icon><Delete /></el-icon>删除</el-button
+                  <el-icon>
+                    <Delete /> </el-icon
+                  >删除</el-button
                 >
               </div>
             </div>
@@ -445,23 +449,28 @@ export default defineComponent({
     align-items: center;
     width: 100%;
     padding-right: 10px;
+
     .tool-All {
       display: flex;
       align-items: center;
+
       > div {
         display: flex;
         align-items: center;
       }
     }
+
     .batch {
       width: 24px;
     }
   }
+
   .file_detail {
     position: relative;
     width: 100%;
     height: 66vh;
     overflow: auto;
+
     .right_box {
       position: absolute;
       z-index: 999;
@@ -482,10 +491,12 @@ export default defineComponent({
         font-family: revert;
         border-radius: 5px;
       }
+
       > div:hover {
         background-color: rgb(0 0 0 / 80%);
       }
     }
+
     .file_style {
       // height: 100px;
       width: 90px;
@@ -497,21 +508,25 @@ export default defineComponent({
       animation: 0.5s ease;
       position: relative;
       margin-bottom: 10px;
+
       > div {
         width: 100%;
         // height: 70%;
         height: 80px;
+
         > img {
           width: 100%;
           height: 100%;
         }
       }
+
       .checkbox-box {
         position: absolute;
         top: -8px;
         left: 60px;
         z-index: 1000;
       }
+
       > span {
         font-size: 12px;
         width: 100%;
@@ -523,10 +538,12 @@ export default defineComponent({
         word-wrap: break-word;
       }
     }
+
     .file_style:hover {
       background-color: rgba(189, 189, 189, 0.322);
       border-radius: 5px;
     }
+
     .fileActive {
       display: block;
       top: 0;
@@ -540,9 +557,11 @@ export default defineComponent({
     }
   }
 }
+
 .colBlock {
   display: block;
 }
+
 .colNone {
   display: none;
 }

src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue

@@ -61,6 +61,14 @@
       <!-- <el-descriptions-item label-align="center" label="备注" :span="3">{{ safetyLogDetail?.remark }} </el-descriptions-item> -->
     </el-descriptions>
   </el-card>
+  <el-dialog width="80%" v-model="viewFileVisible" title="查看文件" append-to-body>
+    <iframe :src="fileUrl" frameborder="0" width="100%" height="800"></iframe>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="viewFileVisible = false" type="primary">关闭</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -87,6 +95,8 @@ const props = defineProps<Props>();
 const loading = ref<boolean>(false);
 const safetyLogDetail = ref<SafetyLogVO>();
 const fileList = ref<Array<OssVO>>([]);
+const viewFileVisible = ref<boolean>(false);
+const fileUrl = ref<string>('');
 const get = async () => {
   loading.value = true;
   const res = await getSafetyLog(props.safetyLogId);
@@ -99,7 +109,11 @@ const get = async () => {
   }
   loading.value = false;
 };
-
+const viewFile = (url: string) => {
+  fileUrl.value = url;
+  viewFileVisible.value = true;
+  return false;
+};
 onMounted(() => {
   get();
 });

src/views/safety/safetyLog/index.vue

@@ -20,7 +20,7 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyLog:add']">新1增 </el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyLog:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Upload" @click="handleAdd('file')" v-hasPermi="['safety:safetyLog:add']">上传附件 </el-button>
@@ -259,7 +259,8 @@ const data = reactive<PageData<SafetyLogForm, SafetyLogQuery>>({
     otherCondition: undefined,
     remark: undefined,
     creatorName: undefined,
-
+    orderByColumn: 'createTime',
+    isAsc: 'desc',
     params: {}
   },
   rules: {

src/views/tool/gen/index.vue

@@ -113,8 +113,8 @@
 </template>
 
 <script setup name="Gen" lang="ts">
-import {delTable, genCode, getDataNames, listTable, previewTable, synchDb} from '@/api/tool/gen';
-import {TableQuery, TableVO} from '@/api/tool/gen/types';
+import { delTable, genCode, getDataNames, listTable, previewTable, synchDb } from '@/api/tool/gen';
+import { TableQuery, TableVO } from '@/api/tool/gen/types';
 import router from '@/router';
 import ImportTable from './importTable.vue';