新主题

src/global/components/hc-report-modal/index.vue

@@ -1,8 +1,5 @@
 <template>
-    <el-dialog
-        v-model="isShow" :title="title" class="hc-modal-border" destroy-on-close draggable width="47rem"
-        append-to-body @closed="cancelReportClick"
-    >
+    <hc-new-dialog v-model="isShow" :title="title" widths="47rem" @close="cancelReportClick">
         <el-form ref="formRef" :model="formModel" :rules="formRules" label-width="auto" size="large">
             <el-form-item label="任务名称" prop="taskName">
                 <el-input v-model="formModel.taskName" disabled />
@@ -26,7 +23,7 @@
             <el-form-item label="任务流程" prop="fixedFlowId">
                 <el-select v-model="formModel.fixedFlowId" block @change="handleProcessValue">
                     <el-option
-                        v-for="item in processData" :key="item.id" 
+                        v-for="item in processData" :key="item.id"
                         :disabled="item.disabled" :value="item.id" :label="item.fixedFlowName"
                     >
                         <el-tooltip
@@ -69,7 +66,7 @@
                 </el-button>
             </div>
         </template>
-    </el-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>
@@ -143,7 +140,7 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
- 
+
 })
 
 const emit = defineEmits(['hide', 'finish', 'tagClose'])
@@ -268,7 +265,7 @@ const getProcessData = async (type, datas) => {
     } else if (type === 'wbs' || type === 'query') {
         flowJson['privatePKeyId'] = datas
     }
- 
+
     infoIds.value = arrToId(reportDatas.value)
     const { error, code, data } = await queryFixedFlow1({
         projectId: projectId.value,
@@ -278,7 +275,7 @@ const getProcessData = async (type, datas) => {
         tableOwner:tableOwner.value,
         infoIds:infoIds.value,
         ...flowJson,
-       
+
     })
     if (!error && code === 200) {
         const arr = getArrValue(data['records'])

src/global/components/hc-sms-auth/index.vue

@@ -1,8 +1,5 @@
 <template>
-    <el-dialog
-        v-model="showModal" class="hc-modal-border" destroy-on-close draggable title="短信认证" width="26rem"
-        @closed="cancelClick"
-    >
+    <hc-new-dialog v-model="showModal" title="短信认证" widths="26rem" @close="cancelClick">
         <el-form ref="reportFormRef" :model="reportModel" :rules="reportRules" label-width="auto" size="large">
             <el-form-item label="手机号码">
                 <el-input v-model="phoneVal" disabled placeholder="手机号码" />
@@ -26,7 +23,7 @@
                 </el-button>
             </div>
         </template>
-    </el-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

src/global/components/hc-tasks-user/index.vue

@@ -13,12 +13,7 @@
         </div>
 
         <!-- 选择任务人 -->
-        <el-dialog
-            v-model="showModal" class="hc-modal-border hc-modal-nop" destroy-on-close draggable
-            title="选择任务人"
-            width="62rem"
-            append-to-body
-        >
+        <hc-new-dialog v-model="showModal" title="选择任务人" widths="62rem">
             <div class="hc-tasks-user-modal-content-box">
                 <div class="tree-box">
                     <el-scrollbar>
@@ -88,13 +83,10 @@
                     </el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
 
         <!-- 调整顺序 -->
-        <el-dialog
-            v-model="sequenceModal" class="hc-modal-border" destroy-on-close draggable title="调整顺序" append-to-body
-            width="38rem"
-        >
+        <hc-new-dialog v-model="sequenceModal" title="调整顺序" widths="38rem">
             <el-alert :closable="false" title="可拖动排序，也可在后面点击图标，切换排序" type="warning" />
             <div class="sort-node-body-box list-group header">
                 <div class="list-group-item">
@@ -142,7 +134,7 @@
                     </el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/test/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <HcNewCard>
         <template #header>
             <el-button size="large" type="primary">
                 <HcIcon name="search-2" />
@@ -13,7 +13,7 @@
         <template #action>
             action
         </template>
-    </HcCard>
+    </HcNewCard>
 </template>
 
 <script setup>

src/views/data-fill/collapse-form/test-file.vue

@@ -42,7 +42,8 @@
             <div class="dialog-table">
                 <HcTable
                     v-if="fileModalradio == 1" ref="dialogTableRef1" :column="filedialogTableColumn"
-                    :datas="filedialogTableData" :loading="filedialogTableLoading" is-check border
+                    :datas="filedialogTableData" :loading="filedialogTableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
                     @selection-change="filedialogTableSelection1"
                 >
                     <template #reportNo="{ row }">
@@ -51,7 +52,8 @@
                 </HcTable>
                 <HcTable
                     v-if="fileModalradio == 2" ref="dialogTableRef2" :column="filedialogTableColumn1"
-                    :datas="filedialogTableData" :loading="filedialogTableLoading" is-check border
+                    :datas="filedialogTableData" :loading="filedialogTableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
                     @selection-change="filedialogTableSelection"
                 >
                     <template #reportNo="{ row }">
@@ -63,7 +65,8 @@
                 </HcTable>
                 <HcTable
                     v-if="fileModalradio == 3" ref="dialogTableRef" :column="filedialogTableColumn1"
-                    :datas="filedialogTableData" :loading="filedialogTableLoading" is-check border
+                    :datas="filedialogTableData" :loading="filedialogTableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
                     @selection-change="filedialogTableSelection"
                 >
                     <template #reportNo="{ row }">

src/views/data-fill/division.vue

@@ -30,7 +30,7 @@
                             :true-label="1" label="标记为隐蔽工程节点" size="large" @change="concealedChange"
                         />
                     </template>
-                    <HcTable :column="tableBasicColumn" :datas="tableBasicData" :is-index="false" border>
+                    <HcTable :column="tableBasicColumn" :datas="tableBasicData" :is-index="false" is-new>
                         <template #type="{ row }">
                             {{ getRowType(row.type) }}
                         </template>
@@ -48,7 +48,7 @@
                             <span>引用元素表</span>
                         </el-button>
                     </template>
-                    <HcTable :column="tableProjectColumn" :datas="tableProjectData" :is-index="false" border>
+                    <HcTable :column="tableProjectColumn" :datas="tableProjectData" :is-index="false" is-new>
                         <template #tableType="{ row }">
                             {{ getRowTableType(row.tableType) }}
                         </template>
@@ -366,10 +366,9 @@
                     </div>
                     <div class="dialog-table">
                         <HcTable
-                            ref="dialogTableRef" :column="dialogTableColumn" :datas="dialogTableData"
-                            :loading="dialogTableLoading" is-check border
-                            @select="dialogTableSelect"
-                            @select-all="dialogTableSelectAll"
+                            ref="dialogTableRef" :column="dialogTableColumn" :datas="dialogTableData" :loading="dialogTableLoading"
+                            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                            @select="dialogTableSelect" @select-all="dialogTableSelectAll"
                         />
                     </div>
                     <div class="dialog-pages">

src/views/data-fill/query.vue

@@ -167,7 +167,8 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    border :check-style="{ width: 29 }" :index-style="{ width: 60 }" is-check @selection-change="tableSelectionChange"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelectionChange"
                 >
                     <template #name="{ row }">
                         <span class="text-link" @click="tableRowName(row)">{{ row?.name }}</span>

src/views/data-fill/wbs.vue

@@ -140,7 +140,7 @@
                 </HcTabCard>
             </div>
         </div>
-        <HcCard v-if="wbsTypeTabKey === 'map'" id-ref="wbs-node-tree-card-target">
+        <HcNewCard v-if="wbsTypeTabKey === 'map'" id-ref="wbs-node-tree-card-target">
             <template #header>
                 <HcTooltip keys="wbs_views_division_btn">
                     <el-button class="mr-10" hc-btn type="primary" @click="divisionClick">
@@ -261,7 +261,7 @@
                     </el-button>
                 </template>
             </HcDrawer>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 上传文件 -->
         <HcUploadFile

src/views/gauge/bezier.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <HcNewCard :scrollbar="false" action-size="lg">
             <template #header>
                 <HcTooltip keys="gauge-bezier-add">
                     <el-button :disabled="searchForm.partId.length < 1" hc-btn type="primary" @click="addLineEleModal">
@@ -35,11 +35,8 @@
             </template>
             <template #extra>
                 <div class="w-60">
-                    <el-select
-                        v-model="searchForm.partId" block clearable placeholder="片段查询" size="large"
-                        @change="searchClick"
-                    >
-                        <el-option v-for="item in partData" :label="item.name" :value="item.id" />
+                    <el-select v-model="searchForm.partId" block clearable placeholder="片段查询" @change="searchClick">
+                        <el-option v-for="item in partData" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </div>
                 <HcTooltip keys="gauge-bezier-add-part">
@@ -54,35 +51,27 @@
                 </HcTooltip>
             </template>
 
-            <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading" border>
-                <template #name="{ row }">
-                    {{ row.valueStr }}~{{ row.valueEndStr }}
-                </template>
-                <template #type="{ row }">
-                    {{ getTypeName(row?.type) }}
-                </template>
+            <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
+                <template #name="{ row }">{{ row.valueStr }}~{{ row.valueEndStr }}</template>
+                <template #type="{ row }">{{ getTypeName(row?.type) }}</template>
                 <!-- <template #angle="{row}">
                     {{row['du']}}°{{row['fen']}}′{{row['miao']}}″
                 </template> -->
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">
-                        <el-button size="small" text type="primary" @click="handleTableEdit(row)">
-                            编辑
-                        </el-button>
+                        <el-button size="small" text type="primary" @click="handleTableEdit(row)">编辑</el-button>
                     </HcTooltip>
                     <HcTooltip keys="gauge-station-del">
-                        <el-button size="small" text type="danger" @click="handleTableDelete(row)">
-                            删除
-                        </el-button>
+                        <el-button size="small" text type="danger" @click="handleTableDelete(row)">删除</el-button>
                     </HcTooltip>
                 </template>
             </HcTable>
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
         <!-- 管理片段弹框 -->
-        <el-dialog v-model="showAdminPartModal" class="hc-modal-border" title="管理片段" width="47rem">
+        <hc-new-dialog v-model="showAdminPartModal" title="管理片段" widths="47rem">
             <div class="admin-part-data-table">
                 <el-scrollbar>
                     <div class="hc-table-ref-box">
@@ -90,45 +79,23 @@
                             <el-table-column label="片段名称" prop="name">
                                 <template #default="scope">
                                     <el-input v-if="scope.row.isEdit" v-model="scope.row.name" placeholder="片段名称" />
-                                    <div v-else>
-                                        {{ scope.row.name }}
-                                    </div>
+                                    <div v-else>{{ scope.row.name }}</div>
                                 </template>
                             </el-table-column>
                             <el-table-column label="桩号前缀" prop="prefix">
                                 <template #default="scope">
-                                    <el-input
-                                        v-if="scope.row.isEdit" v-model="scope.row.prefix"
-                                        placeholder="桩号前缀"
-                                    />
-                                    <div v-else>
-                                        {{ scope.row.prefix }}
-                                    </div>
+                                    <el-input v-if="scope.row.isEdit" v-model="scope.row.prefix" placeholder="桩号前缀" />
+                                    <div v-else>{{ scope.row.prefix }}</div>
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="操作" width="130">
                                 <template #default="scope">
-                                    <el-button
-                                        v-if="scope.row.isEdit" size="small" text type="primary"
-                                        @click="handleAdminPartSave(scope.row)"
-                                    >
-                                        保存
-                                    </el-button>
+                                    <el-button v-if="scope.row.isEdit" size="small" text type="primary" @click="handleAdminPartSave(scope.row)">保存</el-button>
                                     <HcTooltip v-else keys="gauge-station-edit">
-                                        <el-button
-                                            size="small" text type="primary"
-                                            @click="handleAdminPartEdit(scope.row)"
-                                        >
-                                            编辑
-                                        </el-button>
+                                        <el-button size="small" text type="primary" @click="handleAdminPartEdit(scope.row)">编辑</el-button>
                                     </HcTooltip>
                                     <HcTooltip keys="gauge-station-del">
-                                        <el-button
-                                            size="small" text type="danger"
-                                            @click="handleAdminPartDelete(scope.row, scope.$index)"
-                                        >
-                                            删除
-                                        </el-button>
+                                        <el-button size="small" text type="danger" @click="handleAdminPartDelete(scope.row, scope.$index)">删除</el-button>
                                     </HcTooltip>
                                 </template>
                             </el-table-column>
@@ -138,17 +105,13 @@
             </div>
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button size="large" @click="showAdminPartModal = false">
-                        取消
-                    </el-button>
-                    <el-button hc-btn type="primary" @click="AddAdminPart">
-                        新增
-                    </el-button>
+                    <el-button size="large" @click="showAdminPartModal = false">取消</el-button>
+                    <el-button hc-btn type="primary" @click="AddAdminPart">新增</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
         <!-- 新增片段弹框 -->
-        <el-dialog v-model="showAddPartModal" class="hc-modal-border" draggable title="新增片段" width="38rem">
+        <hc-new-dialog v-model="showAddPartModal" title="新增片段" widths="38rem">
             <el-form ref="partFormRef" :model="partForm" :rules="partRules" label-width="auto" size="large">
                 <el-form-item label="名称" prop="name">
                     <el-input v-model="partForm.name" placeholder="请输入名称" />
@@ -159,27 +122,17 @@
             </el-form>
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button size="large" @click="showAddPartModal = false">
-                        取消
-                    </el-button>
-                    <el-button :loading="savePartLoading" hc-btn type="primary" @click="savePartInfo">
-                        保存
-                    </el-button>
+                    <el-button size="large" @click="showAddPartModal = false">取消</el-button>
+                    <el-button :loading="savePartLoading" hc-btn type="primary" @click="savePartInfo">保存</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
         <!-- 添加/编辑线元弹框 -->
-        <el-dialog
-            v-model="showLineEleModal"
-            :title="(formLineEleValue.id === -1 || !formLineEleValue.id) ? '添加线元' : '编辑线元'" class="hc-modal-border"
-            draggable width="40rem"
-        >
+        <hc-new-dialog v-model="showLineEleModal" :title="(formLineEleValue.id === -1 || !formLineEleValue.id) ? '添加线元' : '编辑线元'" widths="40rem">
             <el-form :model="formLineEleValue" label-width="auto" size="large">
                 <el-form-item label="类型">
                     <el-radio-group v-model="formLineEleValue.type">
-                        <el-radio v-for="item in lineElementType" :label="item.value">
-                            {{ item.label }}
-                        </el-radio>
+                        <el-radio v-for="(item, index) in lineElementType" :key="index" :label="item.value">{{ item.label }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="开始里程">
@@ -199,12 +152,8 @@
                 </el-form-item>
                 <el-form-item v-if="formLineEleValue.type !== 0" label="转向">
                     <el-radio-group v-model="formLineEleValue.swing">
-                        <el-radio label="左转">
-                            左转
-                        </el-radio>
-                        <el-radio label="右转">
-                            右转
-                        </el-radio>
+                        <el-radio label="左转">左转</el-radio>
+                        <el-radio label="右转">右转</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="线长度">
@@ -213,23 +162,17 @@
                 <div class="flex">
                     <el-form-item class="flex-1" label="方位角">
                         <el-input v-model="formLineEleValue.du" placeholder="输入度">
-                            <template #suffix>
-                                度
-                            </template>
+                            <template #suffix>度</template>
                         </el-input>
                     </el-form-item>
                     <el-form-item class="flex-1 ml-4" no-label>
                         <el-input v-model="formLineEleValue.fen" placeholder="输入分">
-                            <template #suffix>
-                                分
-                            </template>
+                            <template #suffix>分</template>
                         </el-input>
                     </el-form-item>
                     <el-form-item class="flex-1 ml-4" no-label>
                         <el-input v-model="formLineEleValue.miao" placeholder="输入秒">
-                            <template #suffix>
-                                秒
-                            </template>
+                            <template #suffix>秒</template>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -245,23 +188,14 @@
             </el-form>
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button size="large" @click="showLineEleModal = false">
-                        取消
-                    </el-button>
-                    <el-button
-                        v-if="formLineEleValue.id === -1 || !formLineEleValue.id" size="large"
-                        @click="refreshable"
-                    >
-                        刷新
-                    </el-button>
-                    <el-button :loading="saveLoading" hc-btn type="primary" @click="saveLineEleClick">
-                        保存
-                    </el-button>
+                    <el-button size="large" @click="showLineEleModal = false">取消</el-button>
+                    <el-button v-if="formLineEleValue.id === -1 || !formLineEleValue.id" size="large" @click="refreshable">刷新</el-button>
+                    <el-button :loading="saveLoading" hc-btn type="primary" @click="saveLineEleClick">保存</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
         <!-- 里程转换坐标 -->
-        <el-dialog v-model="showToModal" class="hc-modal-border" draggable title="里程转换坐标" width="38rem">
+        <hc-new-dialog v-model="showToModal" title="里程转换坐标" widths="38rem">
             <el-form :model="formToValue" label-width="auto" size="large">
                 <el-form-item label="里程">
                     <el-input v-model="formToValue.value" placeholder="请输入名称" />
@@ -273,29 +207,21 @@
                     <el-input v-model="formToValue.jj" placeholder="请输入夹角" />
                 </el-form-item>
                 <el-form-item label="X">
-                    <div class="form-item-div">
-                        {{ formToValue.x }}
-                    </div>
+                    <div class="form-item-div">{{ formToValue.x }}</div>
                 </el-form-item>
                 <el-form-item label="Y">
-                    <div class="form-item-div">
-                        {{ formToValue.y }}
-                    </div>
+                    <div class="form-item-div">{{ formToValue.y }}</div>
                 </el-form-item>
             </el-form>
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button size="large" @click="showToModal = false">
-                        取消
-                    </el-button>
-                    <el-button hc-btn type="primary" @click="queryPsChange">
-                        转换
-                    </el-button>
+                    <el-button size="large" @click="showToModal = false">取消</el-button>
+                    <el-button hc-btn type="primary" @click="queryPsChange">转换</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
         <!-- 逐桩坐标弹框 -->
-        <el-dialog v-model="showPileModal" class="hc-modal-border" draggable title="逐桩坐标" width="62rem">
+        <hc-new-dialog v-model="showPileModal" title="逐桩坐标" widths="62rem">
             <el-form :model="formPileValue" inline label-position="top" label-width="auto" size="large">
                 <el-form-item label="开始桩号">
                     <el-input v-model="formPileValue.x" placeholder="开始桩号" />
@@ -310,9 +236,7 @@
                     <el-input v-model="formPileValue.b" placeholder="偏距" />
                 </el-form-item>
                 <el-form-item label=" ">
-                    <el-button :loading="generateLoading" attr-type="button" type="primary" @click="generateClick">
-                        生成
-                    </el-button>
+                    <el-button :loading="generateLoading" attr-type="button" type="primary" @click="generateClick">生成</el-button>
                 </el-form-item>
             </el-form>
             <div class="admin-part-data-table">
@@ -320,9 +244,7 @@
                     <div class="hc-table-ref-box">
                         <el-table :data="pileTable" hc border>
                             <el-table-column label="序号" prop="num" width="80">
-                                <template #default="scope">
-                                    {{ scope.$index + 1 }}
-                                </template>
+                                <template #default="scope">{{ scope.$index + 1 }}</template>
                             </el-table-column>
                             <el-table-column label="里程" prop="valueStr" />
                             <el-table-column label="偏距" prop="b" />
@@ -332,9 +254,9 @@
                     </div>
                 </el-scrollbar>
             </div>
-        </el-dialog>
+        </hc-new-dialog>
         <!-- 导入弹框 -->
-        <el-dialog v-model="showImportModal" class="hc-modal-border" title="导入线元" width="32rem">
+        <hc-new-dialog v-model="showImportModal" title="导入线元" widths="32rem">
             <div class="text-center">
                 <el-upload
                     ref="uploadRef" v-model:file-list="fileList" :accept="accept" :action="action"
@@ -343,33 +265,22 @@
                     :on-progress="handleUploadProgress" :on-success="handleUploadFinish"
                 >
                     <template #trigger>
-                        <el-button :loading="importLoading" type="primary">
-                            选择文件
-                        </el-button>
+                        <el-button :loading="importLoading" type="primary">选择文件</el-button>
                     </template>
                 </el-upload>
             </div>
             <template #footer>
                 <div class="lr-dialog-footer">
                     <div class="left">
-                        <el-button size="large" @click="tmportTmpClick">
-                            下载导入模板
-                        </el-button>
+                        <el-button size="large" @click="tmportTmpClick">下载导入模板</el-button>
                     </div>
                     <div class="right">
-                        <el-button size="large" @click="showImportModal = false">
-                            取消
-                        </el-button>
-                        <el-button
-                            :disabled="fileList.length <= 0" :loading="importLoading" hc-btn type="primary"
-                            @click="handleImportClick"
-                        >
-                            确认导入
-                        </el-button>
+                        <el-button size="large" @click="showImportModal = false">取消</el-button>
+                        <el-button :disabled="fileList.length <= 0" :loading="importLoading" hc-btn type="primary" @click="handleImportClick">确认导入</el-button>
                     </div>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/gauge/station.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <HcNewCard>
             <template #header>
                 <HcTooltip keys="gauge-station-add">
                     <el-button hc-btn type="primary" @click="AddRowClick">
@@ -21,23 +21,19 @@
                     </el-button>
                 </HcTooltip>
                 <div class="w-60 ml-6">
-                    <el-input
-                        v-model="searchForm.name" clearable placeholder="请输入测站点或关键字进行搜索"
-                        size="large" @keyup="keyUpEvent"
-                    />
+                    <el-input v-model="searchForm.name" clearable placeholder="请输入测站点或关键字进行搜索" @keyup="keyUpEvent" />
                 </div>
                 <div class="ml-2">
-                    <el-button size="large" type="primary" @click="searchClick">
+                    <el-button type="primary" @click="searchClick">
                         <HcIcon name="search-2" />
                         <span>搜索</span>
                     </el-button>
                 </div>
             </template>
             <template #extra>
-                <HcNewSwitch :datas="tabsTypeData" :keys="tabsTypeKey" @change="tabsTypeChange" />
+                <HcNewSwitch :datas="tabsTypeData" size="default" :keys="tabsTypeKey" @change="tabsTypeChange" />
             </template>
-
-            <HcTable v-if="tabsTypeKey === '0'" :column="levelTableColumn" :datas="levelTable" :loading="tableLoading" border>
+            <HcTable v-if="tabsTypeKey === '0'" :column="levelTableColumn" :datas="levelTable" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">
                         <el-button size="small" text type="primary" @click="handleLevelEdit(row)">编辑</el-button>
@@ -47,11 +43,7 @@
                     </HcTooltip>
                 </template>
             </HcTable>
-
-            <HcTable
-                v-if="tabsTypeKey === '1'" :column="traverseTableColumn" :datas="traverseTable"
-                :loading="tableLoading" border
-            >
+            <HcTable v-if="tabsTypeKey === '1'" :column="traverseTableColumn" :datas="traverseTable" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">
                         <el-button size="small" text type="primary" @click="handleTraverseEdit(row)">编辑</el-button>
@@ -61,18 +53,13 @@
                     </HcTooltip>
                 </template>
             </HcTable>
-
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
+
         <!-- 新增/编辑 弹框 -->
-        <el-dialog
-            v-model="showRowModal"
-            :title="`${formRowValue?.id ? '编辑' : '新增'}${tabsTypeKey === '1' ? '导线点' : '水准点'}`"
-            class="hc-modal-border"
-            width="47rem"
-        >
+        <hc-new-dialog v-model="showRowModal" :title="`${formRowValue?.id ? '编辑' : '新增'}${tabsTypeKey === '1' ? '导线点' : '水准点'}`" widths="47rem">
             <el-form ref="formRowRef" :model="formRowValue" :rules="rulesRow" label-width="auto" size="large">
                 <el-form-item label="点名称" prop="name">
                     <el-input v-model="formRowValue.name" placeholder="请输入点名称" />
@@ -88,18 +75,11 @@
                 </el-form-item>
                 <el-form-item label="等级">
                     <el-select v-model="formRowValue.level" block>
-                        <el-option
-                            v-for="item in personData" :label="item.label" :value="item.value"
-                            placeholder="请选择等级"
-                        />
+                        <el-option v-for="(item, index) in personData" :key="index" :label="item.label" :value="item.value" placeholder="请选择等级" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注">
-                    <el-input
-                        v-model="formRowValue.remark" :autosize="{ minRows: 3, maxRows: 5 }"
-                        placeholder="请输入文字说明"
-                        type="textarea"
-                    />
+                    <el-input v-model="formRowValue.remark" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入文字说明" type="textarea" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -108,13 +88,9 @@
                     <el-button :loading="saveFormLoading" hc-btn type="primary" @click="saveFormClick">提交</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
         <!-- 导入 弹框 -->
-        <el-dialog
-            v-model="showImportModal" :title="`导入${tabsTypeKey === '1' ? '导线点' : '水准点'}`"
-            class="hc-modal-border"
-            width="47rem"
-        >
+        <hc-new-dialog v-model="showImportModal" :title="`导入${tabsTypeKey === '1' ? '导线点' : '水准点'}`" widths="47rem">
             <div class="hc-import-modal-box">
                 <div class="tip-box">
                     <span>请先下载导入模板(</span>
@@ -163,14 +139,14 @@
                     </el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 
 <script setup>
 import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { useAppStore } from '~src/store/index'
+import { useAppStore } from '~src/store'
 import stationApi from '~api/gauge/station'
 import { getTokenHeader } from '~src/api/request/header'
 import { genFileId } from 'element-plus'

src/views/gauge/testdata.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <HcNewCard>
             <template #header>
                 <HcTooltip keys="gauge-testdata-add">
                     <el-button hc-btn type="primary" @click="AddRowClick">
@@ -9,7 +9,6 @@
                         <span>新增</span>
                     </el-button>
                 </HcTooltip>
-
                 <HcTooltip keys="gauge-testdata-import">
                     <el-button hc-btn @click="importModalClick">
                         <HcIcon name="upload-cloud" />
@@ -17,22 +16,19 @@
                     </el-button>
                 </HcTooltip>
                 <div class="w-60 ml-6">
-                    <el-input
-                        v-model="searchForm.searchValue" clearable :placeholder="placeTitle"
-                        size="large" @keyup="keyUpEvent"
-                    />
+                    <el-input v-model="searchForm.searchValue" clearable :placeholder="placeTitle" @keyup="keyUpEvent" />
                 </div>
                 <div class="ml-2">
-                    <el-button size="large" type="primary" @click="searchClick">
+                    <el-button type="primary" @click="searchClick">
                         <HcIcon name="search-2" />
                         <span>搜索</span>
                     </el-button>
                 </div>
             </template>
             <template #extra>
-                <HcNewSwitch :datas="tabsTypeData" :keys="tabsTypeKey" @change="tabsTypeChange" />
+                <HcNewSwitch :datas="tabsTypeData" :keys="tabsTypeKey" size="default" @change="tabsTypeChange" />
             </template>
-            <HcTable v-if="tabsTypeKey === '0'" :column="tableColumn" :datas="tableData" :laoding="tableLoading" border>
+            <HcTable v-if="tabsTypeKey === '0'" :column="tableColumn" :datas="tableData" :laoding="tableLoading" is-new :index-style="{ width: 60 }">
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-station-edit">
                         <el-button size="small" text type="primary" @click="handleLevelEdit(row)">编辑</el-button>
@@ -42,7 +38,7 @@
                     </HcTooltip>
                 </template>
             </HcTable>
-            <HcTable v-if="tabsTypeKey === '1'" :column="matchTableColumn" :datas="matchData" :laoding="matchtableLoading" border>
+            <HcTable v-if="tabsTypeKey === '1'" :column="matchTableColumn" :datas="matchData" :laoding="matchtableLoading" is-new :index-style="{ width: 60 }">
                 <template #action="{ row }">
                     <HcTooltip keys="gauge-testdata-edit">
                         <el-button size="small" text type="primary" @click="handmatchEdit(row)">编辑</el-button>
@@ -57,9 +53,8 @@
             </template>
 
             <!-- 新增/编辑 弹框 -->
-            <HcDialog
-                is-to-body
-                :show="testModal"
+            <hc-new-dialog
+                v-model="testModal"
                 :title="`${formRowValue?.id || matchformRowValue?.id ? '编辑' : '新增'}${tabsTypeKey === '0' ? '原材' : '配合比'}`"
                 widths="47rem"
                 :is-table="tabsTypeKey === '1'"
@@ -76,19 +71,13 @@
                         <el-input v-model="formRowValue.manufacturers" placeholder="请输入生产厂商" />
                     </el-form-item>
                     <el-form-item label="存放地点或料厂号" prop="storageSite">
-                        <el-input
-                            v-model="formRowValue.storageSite" placeholder="请输入存放地点或料厂号"
-                        />
+                        <el-input v-model="formRowValue.storageSite" placeholder="请输入存放地点或料厂号" />
                     </el-form-item>
                     <el-form-item label="试验批准文号" prop="batchNumber">
-                        <el-input
-                            v-model="formRowValue.batchNumber" placeholder="请输入试验批准文号"
-                        />
+                        <el-input v-model="formRowValue.batchNumber" placeholder="请输入试验批准文号" />
                     </el-form-item>
                     <el-form-item label="准备数量" prop="total">
-                        <el-input
-                            v-model="formRowValue.total" placeholder="请输入准备数量"
-                        />
+                        <el-input v-model="formRowValue.total" placeholder="请输入准备数量" />
                     </el-form-item>
                 </el-form>
                 <el-form v-if="tabsTypeKey === '1'" ref="matchformRowRef" :model="matchformRowValue" :rules="matchrulesRow" label-width="auto" size="large">
@@ -170,11 +159,10 @@
                         <el-button v-if="tabsTypeKey === '1'" :loading="saveFormLoading" hc-btn type="primary" @click="matchsaveFormClick">提交</el-button>
                     </div>
                 </template>
-            </HcDialog>
+            </hc-new-dialog>
 
             <!-- 导入 弹框 -->
-
-            <HcDialog is-to-body :show="importModal" :title="tabsTypeKey === '0' ? '导入原材' : '导入配合比'" @close="importModalClose">
+            <hc-new-dialog v-model="importModal" :title="tabsTypeKey === '0' ? '导入原材' : '导入配合比'" @close="importModalClose">
                 <div class="hc-import-modal-box">
                     <div class="tip-box">
                         <span>请先下载导入模板(</span>
@@ -216,17 +204,17 @@
                         </el-button>
                     </div>
                 </template>
-            </HcDialog>
-        </HcCard>
+            </hc-new-dialog>
+        </HcNewCard>
     </div>
 </template>
 
 <script setup>
-import { onMounted, ref, watch } from 'vue'
+import { onMounted, ref } from 'vue'
 import testApi from '~api/gauge/testdata'
-import { deepClone, downloadBlob, formValidate, getArrValue } from 'js-fast-way'
+import { deepClone, formValidate, getArrValue } from 'js-fast-way'
 import { delMessageV2 } from '~com/message/index.js'
-import { useAppStore } from '~src/store/index'
+import { useAppStore } from '~src/store'
 import { genFileId } from 'element-plus'
 import { getTokenHeader } from '~src/api/request/header'
 const useAppState = useAppStore()

src/views/home/config.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard action-size="lg" scrollbar>
+    <HcNewCard action-size="lg" scrollbar>
         <div class="text-lg font-medium mb-4">
             主题模式<span class="text-sm text-slate-400 font-light ml-4">深色模式还未适配，暂不推荐使用深色模式</span>
         </div>
@@ -96,13 +96,13 @@
                 </el-popover>
             </div>
         </div>
-   
+
         <div class="text-lg font-medium mb-4">首页模式</div>
         <el-radio-group v-model="IndexModel" class="ml-4" @change="changeIndexModel">
             <el-radio label="1" size="large">精简模式</el-radio>
             <el-radio label="2" size="large">数据模式</el-radio>
         </el-radio-group>
-  
+
         <template #action>
             <el-popover :width="180" placement="top" trigger="hover">
                 <template #reference>
@@ -123,7 +123,7 @@
                 <div>如果没有保存配置，下次登录后，将恢复到上次保存的配置</div>
             </el-popover>
         </template>
-    </HcCard>
+    </HcNewCard>
 </template>
 
 <script setup>

src/views/ledger/components/construction.vue

@@ -1,6 +1,6 @@
 <template>
-    <HcCard>
-        <HcTable :column="tableConstructionColumn" :datas="tableConstructionData" :loading="tableConstructionLoading" border>
+    <HcNewCard>
+        <HcTable :column="tableConstructionColumn" :datas="tableConstructionData" :loading="tableConstructionLoading" is-new :index-style="{ width: 60 }">
             <template #action="{ row }">
                 <HcTooltip keys="write_construction_edit">
                     <el-button plain size="small" type="primary" @click="tableConstructionEdit(row)">
@@ -13,27 +13,18 @@
         <template #action>
             <HcPages :pages="searchConstructionForm" @change="pageConstructionChange" />
         </template>
-    </HcCard>
+    </HcNewCard>
 
     <!-- 编辑施工台账 -->
-    <el-dialog v-model="showConstructionEditModal" class="hc-modal-border" title="编辑施工台账" width="38rem">
-        <el-form
-            ref="constructionFormRef" :model="constructionFormModel" :rules="constructionFormRules"
-            label-position="top" label-width="auto" size="large"
-        >
+    <hc-new-dialog v-model="showConstructionEditModal" title="编辑施工台账" widths="38rem">
+        <el-form ref="constructionFormRef" :model="constructionFormModel" :rules="constructionFormRules" label-position="top" label-width="auto" size="large">
             <div class="flex">
                 <el-form-item class="flex-1" label="施工起始日期" prop="siteStartTime">
-                    <el-date-picker
-                        v-model="constructionFormModel.siteStartTime" class="block" format="YYYY-MM-DD"
-                        placeholder="施工起始日期" type="date" value-format="YYYY-MM-DD"
-                    />
+                    <el-date-picker v-model="constructionFormModel.siteStartTime" class="block" format="YYYY-MM-DD" placeholder="施工起始日期" type="date" value-format="YYYY-MM-DD" />
                 </el-form-item>
                 <el-form-item class="mx-4" label=" ">至</el-form-item>
                 <el-form-item class="flex-1" label="施工停止日期" prop="siteEndTime">
-                    <el-date-picker
-                        v-model="constructionFormModel.siteEndTime" class="block" format="YYYY-MM-DD"
-                        placeholder="施工停止日期" type="date" value-format="YYYY-MM-DD"
-                    />
+                    <el-date-picker v-model="constructionFormModel.siteEndTime" class="block" format="YYYY-MM-DD" placeholder="施工停止日期" type="date" value-format="YYYY-MM-DD" />
                 </el-form-item>
             </div>
             <div class="flex">
@@ -74,7 +65,7 @@
                 </el-button>
             </div>
         </template>
-    </el-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

src/views/ledger/components/internal.vue

@@ -1,20 +1,14 @@
 <template>
-    <HcCard>
+    <HcNewCard>
         <template #header>
             <div class="w-32">
                 <el-select v-model="searchInternalForm.taskStatus" clearable placeholder="审批状态" size="large">
-                    <el-option
-                        v-for="item in InternalApproval" :key="item.value" :label="item.label"
-                        :value="item.value"
-                    />
+                    <el-option v-for="item in InternalApproval" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="w-32 ml-2">
                 <el-select v-model="searchInternalForm.isEvaluate" clearable placeholder="是否评定" size="large">
-                    <el-option
-                        v-for="item in InternalAssess" :key="item.value" :label="item.label"
-                        :value="item.value"
-                    />
+                    <el-option v-for="item in InternalAssess" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="w-32 ml-2">
@@ -24,10 +18,7 @@
             </div>
             <div class="w-32 ml-2">
                 <el-select v-model="searchInternalForm.isExperiment" clearable placeholder="关联试验" size="large">
-                    <el-option
-                        v-for="item in InternalAssociation" :key="item.value" :label="item.label"
-                        :value="item.value"
-                    />
+                    <el-option v-for="item in InternalAssociation" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
             <div class="w-60 ml-2">
@@ -45,10 +36,7 @@
         </template>
         <template #extra>
             <HcTooltip keys="write_industry_download">
-                <el-button
-                    :disabled="tableInternalKeys.length <= 0" :loading="downloadLoading" hc-btn type="primary"
-                    @click="batchDownload"
-                >
+                <el-button :disabled="tableInternalKeys.length <= 0" :loading="downloadLoading" hc-btn type="primary" @click="batchDownload">
                     <HcIcon name="download" />
                     <span>下载</span>
                 </el-button>
@@ -61,8 +49,9 @@
             </HcTooltip>
         </template>
         <HcTable
-            ref="tableInternalRef" :column="tableInternalColumn" :datas="tableInternalData" border
-            :loading="tableInternalLoading" is-check @selection-change="tableInternalSelection"
+            ref="tableInternalRef" :column="tableInternalColumn" :datas="tableInternalData" :loading="tableInternalLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableInternalSelection"
         >
             <template #taskStatus="{ row }">
                 <el-tag v-if="row.taskStatus === '已审批'" class="mx-1" effect="dark" type="success">已审批</el-tag>
@@ -73,7 +62,6 @@
                 <el-tag v-if="row.isEvaluate" class="mx-1" effect="dark" type="success">是</el-tag>
                 <el-tag v-else class="mx-1" effect="dark" type="info">否</el-tag>
             </template>
-
             <template #reportNumber="{ row }">
                 {{ row.reportNumber === '-1' || row.reportNumber === '0' ? '' : row.reportNumber }}
             </template>
@@ -85,7 +73,7 @@
         <template #action>
             <HcPages :pages="searchInternalForm" @change="pageInternalChange" />
         </template>
-    </HcCard>
+    </HcNewCard>
 </template>
 
 <script setup>

src/views/ledger/components/table-form.vue

@@ -163,8 +163,9 @@
                 </div>
                 <div class="user-box">
                     <HcTable
-                        ref="copyTimeTableRef" :column="copyTimeTableColumn" :datas="copyTimeTableData" border
-                        :loading="copyTimeTableLoading" is-check @selection-change="copyTimeTableSelection"
+                        ref="copyTimeTableRef" :column="copyTimeTableColumn" :datas="copyTimeTableData" :loading="copyTimeTableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="copyTimeTableSelection"
                     />
                 </div>
             </div>

src/views/ledger/components/table-list.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-table-list-content">
-        <HcCard>
+        <HcNewCard>
             <template #header>
                 <div class="w-64">
                     <HcDatePicker :dates="betweenTime" clearable size="large" @change="betweenTimeUpdate" />
@@ -56,8 +56,9 @@
                 </HcTooltip>
             </template>
             <HcTable
-                ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-check
-                border @selection-change="tableSelectionChange"
+                ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
+                is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                @selection-change="tableSelectionChange"
             >
                 <template #action="{ row }">
                     <HcTooltip keys="ledger_query_table_query">
@@ -76,7 +77,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 批量上报审批 -->
         <HcReportModal

src/views/ledger/components/weather.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <HcNewCard>
         <template #header>
             <div class="w-64">
                 <HcDatePicker :dates="weatherTime" clearable size="large" @change="weatherTimeUpdate" />
@@ -17,8 +17,9 @@
             </HcTooltip>
         </template>
         <HcTable
-            :column="tableWeatherColumn" :datas="tableWeatherData" :loading="tableWeatherLoading" is-check
-            border @selection-change="tableWeatherSelection"
+            :column="tableWeatherColumn" :datas="tableWeatherData" :loading="tableWeatherLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableWeatherSelection"
         >
             <template #tempLow="{ row }">{{ row.tempLow }} ~ {{ row.tempHigh }}</template>
             <template #action="{ row }">
@@ -33,10 +34,10 @@
         <template #action>
             <HcPages :pages="searchWeatherForm" @change="pageWeatherChange" />
         </template>
-    </HcCard>
+    </HcNewCard>
 
     <!-- 编辑天气台账 -->
-    <el-dialog v-model="showWeatherEditModal" class="hc-modal-border" title="编辑天气台账" width="38rem">
+    <hc-new-dialog v-model="showWeatherEditModal" title="编辑天气台账" widths="38rem">
         <el-form
             ref="weatherFormRef" :model="weatherFormModel" :rules="weatherFormRules" label-width="auto"
             size="large"
@@ -69,7 +70,7 @@
                 </el-button>
             </div>
         </template>
-    </el-dialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

src/views/ledger/query.vue

@@ -1,45 +1,47 @@
 <template>
     <div v-loading="boxLoading" class="hc-layout-box">
-        <HcCard v-if="menuDatas.length <= 0" ui="flex-1">
-            <HcStatus/>
-        </HcCard>
+        <HcNewCard v-if="menuDatas.length <= 0" ui="flex-1">
+            <HcStatus />
+        </HcNewCard>
         <template v-if="menuDatas.length > 0">
             <div class="hc-layout-left">
                 <el-scrollbar>
                     <el-menu :default-active="menuKey" class="hc-ledger-query-menu" unique-opened>
                         <el-sub-menu v-for="item in menuDatas" :key="item?.primaryKeyId" :index="item?.primaryKeyId">
                             <template #title>{{ item?.title }}</template>
-                            <el-menu-item :index="`${item?.primaryKeyId}-form`" @click="handleMenuValue('form',item)">
+                            <el-menu-item :index="`${item?.primaryKeyId}-form`" @click="handleMenuValue('form', item)">
                                 日志填报
                             </el-menu-item>
-                            <el-menu-item :index="`${item?.primaryKeyId}-table`" @click="handleMenuValue('table',item)">
+                            <el-menu-item :index="`${item?.primaryKeyId}-table`" @click="handleMenuValue('table', item)">
                                 日志列表查看
                             </el-menu-item>
                         </el-sub-menu>
                     </el-menu>
                 </el-scrollbar>
             </div>
-            <HcTableForm v-if="menuType === 'form'" :contractId="contractId" :items="menuItem"
-                         :projectId="projectId" :userName="userInfo['real_name']"/>
-            <HcTableList v-if="menuType === 'table'" :contractId="contractId" :items="menuItem" :projectId="projectId"/>
+            <HcTableForm
+                v-if="menuType === 'form'" :contract-id="contractId" :items="menuItem"
+                :project-id="projectId" :user-name="userInfo.real_name"
+            />
+            <HcTableList v-if="menuType === 'table'" :contract-id="contractId" :items="menuItem" :project-id="projectId" />
         </template>
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import queryApi from '~api/ledger/query';
-import HcTableForm from "./components/table-form.vue"
-import HcTableList from "./components/table-list.vue"
-import {getArrValue} from "js-fast-way"
+import { onMounted, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import queryApi from '~api/ledger/query'
+import HcTableForm from './components/table-form.vue'
+import HcTableList from './components/table-list.vue'
+import { getArrValue } from 'js-fast-way'
 //初始变量
 const useAppState = useAppStore()
 
 //全局变量
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const userInfo = ref(useAppState.getUserInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const userInfo = ref(useAppState.getUserInfo)
 
 //渲染完成
 onMounted(() => {
@@ -48,16 +50,16 @@ onMounted(() => {
 
 //日志类型变量
 const boxLoading = ref(false)
-const menuDatas = ref([]);
-const menuKey = ref('');
-const menuItem = ref({});
+const menuDatas = ref([])
+const menuKey = ref('')
+const menuItem = ref({})
 const menuType = ref('form')
 
 //获取当前合同段下的日志类型
 const queryLogList = async () => {
     boxLoading.value = true
-    const {error, code, data} = await queryApi.queryLogList({
-        contractId: contractId.value
+    const { error, code, data } = await queryApi.queryLogList({
+        contractId: contractId.value,
     })
     //判断状态
     boxLoading.value = false

src/views/other-file/image-data.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <HcNewCard :scrollbar="false" action-size="lg">
             <template #header>
                 <HcTooltip keys="image-data-sort">
                     <el-button hc-btn type="primary" @click="showSortModalClick">
@@ -40,9 +40,9 @@
                     </el-table>
                 </div>
             </el-scrollbar>
-        </HcCard>
+        </HcNewCard>
         <!-- 分类管理 弹框 -->
-        <el-dialog v-model="showSortModal" class="hc-modal-border" title="分类管理" width="62rem">
+        <hc-new-dialog v-model="showSortModal" title="分类管理" widths="62rem">
             <el-alert :closable="false" title="隐藏分类之后，在主页面不会显示该分类入口" type="warning" />
             <div class="modal-dialog">
                 <el-scrollbar>
@@ -77,7 +77,7 @@
                     </div>
                 </el-scrollbar>
             </div>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/other-file/image-form.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div v-loading="queryByLoading" class="hc-layout-content-box" element-loading-text="获取数据中...">
-            <HcCard
+            <HcNewCard
                 :scrollbar="false"
                 :title="`${treeItemInfo?.title ?? ''} 上传${fileType === 1 ? '视频' : fileType === 2 ? '图片' : ''}`"
                 action-size="lg"
@@ -120,7 +120,7 @@
                         </el-scrollbar>
                     </el-col>
                     <el-col :span="14">
-                        <HcTable v-if="dataType === 2" :column="tableColumn" :datas="tableData" border />
+                        <HcTable v-if="dataType === 2" :column="tableColumn" :datas="tableData" is-new :index-style="{ width: 60 }" />
                     </el-col>
                 </el-row>
                 <template #action>
@@ -143,7 +143,7 @@
                         <span>返回</span>
                     </el-button>
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
     </div>
 </template>

src/views/other-file/image-view.vue

@@ -32,7 +32,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-layout-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="image-data-add">
                         <el-button :disabled="!queryKey && dataType === 1" hc-btn type="primary" @click="addFormFile">
@@ -72,7 +72,8 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check border @selection-change="tableSelectionChange"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelectionChange"
                 >
                     <template #info="{ row }">
                         <div class="hc-table-col-item">
@@ -119,17 +120,17 @@
                         </div>
                     </div>
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
         <!-- 视频预览 弹框 -->
-        <el-dialog v-model="previewVideoModal" class="hc-modal-border" destroy-on-close title="预览" width="47rem">
+        <hc-new-dialog v-model="previewVideoModal" title="预览" widths="47rem">
             <video
                 v-if="previewVideoUrl" :src="previewVideoUrl" autoplay="autoplay" class="preview-video"
                 controls="controls"
             >
                 您的浏览器不支持 video
             </video>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/other-file/project-scanning.vue

@@ -19,7 +19,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-layout-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="project-scanning-upload">
                         <el-button :disabled="!nodeIds" hc-btn type="primary" @click="uploadModalClick">
@@ -102,7 +102,8 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check border @selection-change="tableSelectionChange"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelectionChange"
                 >
                     <template #fileName="{ row }">
                         <span class="text-link" @click="tablePreview(row)">{{ row?.fileName }}</span>
@@ -120,14 +121,14 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增编辑文件 -->
-        <el-dialog v-model="showUploadModal" class="hc-modal-border hc-modal-table" title="上传工程文件" width="80vw">
+        <hc-new-dialog v-model="showUploadModal" is-table title="上传工程文件" widths="80vw">
             <HcTable
                 :column="tableUploadColumn" :datas="tableUploadData" :loading="uploadSaveLoading"
-                ui="hc-form-table" border
+                ui="hc-form-table" is-new :index-style="{ width: 60 }"
             >
                 <template #fileNumber="{ row }">
                     <el-input
@@ -230,7 +231,7 @@
                     </div>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
 
         <!-- 批量上报审批 -->
         <HcReportModal
@@ -249,13 +250,10 @@
         />
 
         <!-- 批量认证 -->
-        <el-dialog
-            v-model="showCertificationModal" class="hc-modal-border hc-modal-table" title="批量认证"
-            width="80vw"
-        >
+        <hc-new-dialog v-model="showCertificationModal" is-table title="批量认证" widths="80vw">
             <div class="hc-card-body-flex">
                 <div class="flex-table">
-                    <HcTable :column="CertColumns" :datas="CertData" ui="hc-form-table" border @row-click="CertRowClick">
+                    <HcTable :column="CertColumns" :datas="CertData" ui="hc-form-table" is-new :index-style="{ width: 60 }" @row-click="CertRowClick">
                         <template #action="{ row, index }">
                             <el-button plain size="small" type="primary" @click.stop="CertRowClick2(row)">
                                 预览
@@ -285,7 +283,7 @@
                     </el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/other/components/ListItem.vue

@@ -231,7 +231,7 @@
                 <div class="dialog-table">
                     <HcTable
                         :column="CTDdialogTableColumn" :datas="CTDdialogTableData1"
-                        :loading="CTDdialogTableLoading" border
+                        :loading="CTDdialogTableLoading" is-new :index-style="{ width: 60 }"
                     >
                         <template #recordNo="{ row }">
                             <span class="text-link" @click="CTDtableRowName(row)">{{ row?.recordNo }}</span>
@@ -388,8 +388,9 @@
                 <div class="dialog-table">
                     <HcTable
                         v-if="fileModalradio == 1" ref="dialogTableRef1" :column="filedialogTableColumn"
-                        :datas="filedialogTableData" :loading="filedialogTableLoading" is-check
-                        border @selection-change="filedialogTableSelection1"
+                        :datas="filedialogTableData" :loading="filedialogTableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="filedialogTableSelection1"
                     >
                         <template #recordNo="{ row }">
                             <span :class="[row?.isSelectedStatus == 1 ? 'text-green' : '']">{{ row?.recordNo }}</span>
@@ -397,8 +398,9 @@
                     </HcTable>
                     <HcTable
                         v-if="fileModalradio == 2" ref="dialogTableRef2" :column="filedialogTableColumn1"
-                        :datas="filedialogTableData" :loading="filedialogTableLoading" is-check
-                        border @selection-change="filedialogTableSelection"
+                        :datas="filedialogTableData" :loading="filedialogTableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="filedialogTableSelection"
                     >
                         <template #reportNo="{ row }">
                             <span :class="[row?.isSelectedStatus === 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>
@@ -406,8 +408,9 @@
                     </HcTable>
                     <HcTable
                         v-if="fileModalradio == 3" ref="dialogTableRef" :column="filedialogTableColumn1"
-                        :datas="filedialogTableData" :loading="filedialogTableLoading" is-check
-                        border @selection-change="filedialogTableSelection"
+                        :datas="filedialogTableData" :loading="filedialogTableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="filedialogTableSelection"
                     >
                         <template #reportNo="{ row }">
                             <span :class="[row?.isSelectedStatus === 1 ? 'text-green' : '']">{{ row?.reportNo }}</span>

src/views/other/first-item.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div v-show="!isFirstReportDrawer" class="hc-layout-content-box first-item">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip v-if="tabTypeKey === 'mark'" keys="other-first-item-report">
                         <el-button
@@ -93,7 +93,8 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check border @selection-change="tableSelectionChange"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelectionChange"
                 >
                     <template #name="{ row }">
                         <span class="text-link" @click="tableRowName(row)">{{ row?.name }}</span>
@@ -132,7 +133,7 @@
                         </div>
                     </div>
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 上报首件 -->
@@ -158,7 +159,7 @@
                     <el-divider border-style="dashed" />
                     <div class="title">文件附件</div>
                     <div class="hc-table-node-file-box">
-                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false" border>
+                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false" is-new>
                             <template #action="{ row, index }">
                                 <el-button plain size="small" type="danger" @click="tableDelButton(index)">
                                     删除

src/views/other/first-itemcopy.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div v-show="!isFirstReportDrawer" class="hc-layout-content-box first-item">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip v-if="tabTypeKey === 'mark'" keys="other-first-item-report">
                         <el-button
@@ -93,7 +93,8 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check border @selection-change="tableSelectionChange"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelectionChange"
                 >
                     <template #name="{ row }">
                         <span class="text-link" @click="tableRowName(row)">{{ row?.name }}</span>
@@ -132,7 +133,7 @@
                         </div>
                     </div>
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 上报首件 -->
@@ -172,7 +173,7 @@
                     <el-divider border-style="dashed" />
                     <div class="title">文件附件</div>
                     <div class="hc-table-node-file-box">
-                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false" border>
+                        <HcTable :column="tableFileColumn" :datas="tableFileData" :is-index="false" is-new>
                             <template #action="{ row, index }">
                                 <el-button plain size="small" type="danger" @click="tableDelButton(index)">
                                     删除

src/views/other/order-service.vue

@@ -3,74 +3,90 @@
         <div class="order-service-content">
             <el-scrollbar ref="scrollbarRef">
                 <div v-loading="dataLoading" class="content-box" element-loading-text="获取数据中...">
-                    <div v-for="(item,index) in orderDataList" :key="item.id" class="comment-card-box">
+                    <div v-for="(item, index) in orderDataList" :key="item.id" class="comment-card-box">
                         <div class="user-avatar-box">
-                            <el-avatar :size="50" :src="item.avatar || avatarPng"/>
+                            <el-avatar :size="50" :src="item.avatar || avatarPng" />
                         </div>
                         <div class="card-content-box">
                             <div class="user-info-box">
-                                <div class="text-lg">{{ item['createUserName'] || '用户名异常' }}</div>
-                                <div class="text-gray">{{ item['createTime'] }}</div>
+                                <div class="text-lg">{{ item.createUserName || '用户名异常' }}</div>
+                                <div class="text-gray">{{ item.createTime }}</div>
                             </div>
-                            <div class="desc_para" v-html="item['opinionContent']"></div>
-                            <div v-if="item['returnFiles']?.length > 0" class="image_desc">
-                                <div v-for="(items,indexs) in item['returnFiles']" class="hc-image-box">
-                                    <HcImg :index="indexs" :src="items" :srcs="item['returnFiles']" class="hc-image"/>
+                            <div class="desc_para" v-html="item.opinionContent" />
+                            <div v-if="item.returnFiles?.length > 0" class="image_desc">
+                                <div v-for="(items, indexs) in item.returnFiles" class="hc-image-box">
+                                    <HcImg :index="indexs" :src="items" :srcs="item.returnFiles" class="hc-image" />
                                 </div>
                             </div>
                             <div class="foot-tools-box">
-                                <div :class="item['commentsNumber'] >= 1 ? 'active' : ''" class="icon-box"
-                                     @click="commentExpanded(item)">
-                                    <HcIcon :fill="item['commentsNumber'] >= 1" class="icon" name="question-answer"/>
-                                    <span v-if="item['commentsNumber'] >= 1"
-                                          class="badge">{{ item['commentsNumber'] }}</span>
+                                <div
+                                    :class="item.commentsNumber >= 1 ? 'active' : ''" class="icon-box"
+                                    @click="commentExpanded(item)"
+                                >
+                                    <HcIcon :fill="item.commentsNumber >= 1" class="icon" name="question-answer" />
+                                    <span
+                                        v-if="item.commentsNumber >= 1"
+                                        class="badge"
+                                    >{{ item.commentsNumber }}</span>
                                 </div>
-                                <div :class="item['currentUserGood'] ? 'active' : ''" :data-index="item['expandedName']"
-                                     class="icon-box" @click="likeClick(item)">
-                                    <i :class="item['currentUserGood'] ? 'hcicon-praise_fill ': 'hcicon-praise'"
-                                       class="hc-icon-i icon"></i>
-                                    <span v-if="item['goodNumber'] >= 1" class="badge">{{ item['goodNumber'] }}</span>
+                                <div
+                                    :class="item.currentUserGood ? 'active' : ''" :data-index="item.expandedName"
+                                    class="icon-box" @click="likeClick(item)"
+                                >
+                                    <i
+                                        :class="item.currentUserGood ? 'hcicon-praise_fill ' : 'hcicon-praise'"
+                                        class="hc-icon-i icon"
+                                    />
+                                    <span v-if="item.goodNumber >= 1" class="badge">{{ item.goodNumber }}</span>
                                 </div>
                             </div>
-                            <el-collapse v-model="item['expandedName']" accordion class="hc-collapse-box">
-                                <el-collapse-item :name="`commentList-${item['id']}`" title="">
+                            <el-collapse v-model="item.expandedName" accordion class="hc-collapse-box">
+                                <el-collapse-item :name="`commentList-${item.id}`" title="">
                                     <div class="collapse-comment-box">
                                         <div class="comment-reply-content-box">
-                                            <el-input v-model="item['replyContent']" autosize placeholder="我也说一句"
-                                                      type="textarea"/>
-                                            <el-button hc-btn type="primary" @click="saveCommentClick(item)">评论
+                                            <el-input
+                                                v-model="item.replyContent" autosize placeholder="我也说一句"
+                                                type="textarea"
+                                            />
+                                            <el-button hc-btn type="primary" @click="saveCommentClick(item)">
+                                                评论
                                             </el-button>
                                         </div>
-                                        <div v-for="items in item['expandedCommentList']" :key="items.id"
-                                             class="user-comment-info-box">
-                                            <el-avatar :size="50" :src="items.avatar || avatarPng"/>
+                                        <div
+                                            v-for="items in item.expandedCommentList" :key="items.id"
+                                            class="user-comment-info-box"
+                                        >
+                                            <el-avatar :size="50" :src="items.avatar || avatarPng" />
                                             <div class="user-comment-box">
                                                 <div class="user-info-box">
                                                     <span
-                                                        class="user-name">{{ items['userName'] || '用户名异常' }}</span>
-                                                    <span class="create-time">{{ items['createTime'] }}</span>
+                                                        class="user-name"
+                                                    >{{ items.userName || '用户名异常' }}</span>
+                                                    <span class="create-time">{{ items.createTime }}</span>
                                                 </div>
-                                                <div class="user-comment-content-box"
-                                                     v-html="items['replyContent']"></div>
+                                                <div
+                                                    class="user-comment-content-box"
+                                                    v-html="items.replyContent"
+                                                />
                                             </div>
                                         </div>
                                     </div>
                                 </el-collapse-item>
                             </el-collapse>
                         </div>
-                        <div v-if="parseInt(item['isSolve']) === 1" class="code-status-box">
-                            <img :src="Web515Png" alt="" class="widget"/>
+                        <div v-if="parseInt(item.isSolve) === 1" class="code-status-box">
+                            <img :src="Web515Png" alt="" class="widget">
                         </div>
                     </div>
                 </div>
             </el-scrollbar>
             <div class="page-top-btn" @click="scrollToTop">
-                <HcIcon class="icon" name="arrow-up"/>
+                <HcIcon class="icon" name="arrow-up" />
             </div>
         </div>
-        <!--我的工单服务-->
-        <div :style="'width:' + leftWidth + 'px;'" class="order-service-data">
-            <HcCard :scrollbar="false">
+        <!-- 我的工单服务 -->
+        <div :style="`width:${leftWidth}px;`" class="order-service-data">
+            <HcNewCard :scrollbar="false">
                 <template #header>
                     <el-badge :value="2" class="item-badge">
                         <div class="font-bold text-lg">我的工单服务进度</div>
@@ -79,35 +95,41 @@
                 <template #extra>
                     <el-tooltip content="发起新工单服务" effect="dark" placement="top">
                         <el-button class="hc-add-icon" hc-btn type="primary" @click="newOrderServiceClick">
-                            <HcIcon name="add" style="margin-right: 0"/>
+                            <HcIcon name="add" style="margin-right: 0" />
                         </el-button>
                     </el-tooltip>
                 </template>
                 <div class="mb-5">
-                    <el-select v-model="nameSelectKey" block placeholder="工单名称" size="large"
-                               @change="nameSelectUpdate">
-                        <el-option v-for="item in nameSelectData" :key="item.id" :label="item?.title"
-                                   :value="item?.id"/>
+                    <el-select
+                        v-model="nameSelectKey" block placeholder="工单名称" size="large"
+                        @change="nameSelectUpdate"
+                    >
+                        <el-option
+                            v-for="item in nameSelectData" :key="item.id" :label="item?.title"
+                            :value="item?.id"
+                        />
                     </el-select>
                 </div>
-                <div :class="isCurrentBol?'time-height':''" class="time-line-box">
+                <div :class="isCurrentBol ? 'time-height' : ''" class="time-line-box">
                     <el-scrollbar>
                         <el-timeline class="hc-time-line">
-                            <template v-for="(item,index) in orderFlowList" :key="index">
-                                <el-timeline-item :class="item['currentBol']?'success':item['current']?'primary':''"
-                                                  size="large">
+                            <template v-for="(item, index) in orderFlowList" :key="index">
+                                <el-timeline-item
+                                    :class="item.currentBol ? 'success' : item.current ? 'primary' : ''"
+                                    size="large"
+                                >
                                     <div class="timeline-item-icon">
-                                        <HcIcon v-if="item['currentBol']" class="check-icon" name="check"/>
+                                        <HcIcon v-if="item.currentBol" class="check-icon" name="check" />
                                         <span v-else>{{ index + 1 }}</span>
                                     </div>
-                                    <div class="reply-name">{{ item['replyName'] }}</div>
-                                    <div class="reply-content" v-html="item['replyContent']"></div>
+                                    <div class="reply-name">{{ item.replyName }}</div>
+                                    <div class="reply-content" v-html="item.replyContent" />
                                 </el-timeline-item>
                             </template>
                         </el-timeline>
                     </el-scrollbar>
                 </div>
-                <div :class="isCurrentBol?'show':''" class="evaluation-box">
+                <div :class="isCurrentBol ? 'show' : ''" class="evaluation-box">
                     <div class="text-lg font-bold">评价</div>
                     <div class="tip-box">
                         请对工单处理评价，若是未解决问题，可进行投诉，平台核实情况，将对相关客服人员绩效考核，并且重新为您自动发起工单解决问题
@@ -121,49 +143,60 @@
                     </div>
                     <div class="btn-box">
                         <el-button hc-btn type="primary" @click="disposeUserFeedback">
-                            <HcIcon name="check_circle"/>
+                            <HcIcon name="check_circle" />
                             <span>提交</span>
                         </el-button>
                     </div>
                 </div>
-            </HcCard>
-            <!--左右拖动-->
-            <div class="horizontal-drag-line" @mousedown="onmousedown"/>
+            </HcNewCard>
+            <!-- 左右拖动 -->
+            <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
-        <!--提交工单-->
-        <el-dialog v-model="showModal" :before-close="handleModalClose" class="hc-modal-border" title="发起新工单服务"
-                   width="720px">
+        <!-- 提交工单 -->
+        <el-dialog
+            v-model="showModal" :before-close="handleModalClose" class="hc-modal-border" title="发起新工单服务"
+            width="720px"
+        >
             <div class="title">请选择您需要反馈的问题类型</div>
             <div class="hc-type-tabs my-5">
                 <el-radio-group v-model="typeTabKey" size="large" @change="typeTabChange">
-                    <el-radio-button v-for="item in typeTab" :label="item?.dictValue">{{ item?.dictValue }}
+                    <el-radio-button v-for="item in typeTab" :label="item?.dictValue">
+                        {{ item?.dictValue }}
                     </el-radio-button>
                 </el-radio-group>
             </div>
             <div class="modal-checkbox-box">
                 <el-checkbox-group v-model="typeCheckBox[typeTabIndex]">
                     <div v-for="item in typeTab[typeTabIndex]?.children" :key="item.id" class="checkbox-item">
-                        <el-checkbox :label="item['dictValue']">{{ item['dictValue'] }}</el-checkbox>
+                        <el-checkbox :label="item.dictValue">{{ item.dictValue }}</el-checkbox>
                     </div>
                 </el-checkbox-group>
             </div>
             <div class="mt-5">
-                <el-input v-model="opinionContent" :rows="3" placeholder="请输入你宝贵的建议，我们将会跟踪解决"
-                          type="textarea"/>
+                <el-input
+                    v-model="opinionContent" :rows="3" placeholder="请输入你宝贵的建议，我们将会跟踪解决"
+                    type="textarea"
+                />
             </div>
             <div v-loading="spinShow" class="mt-3 upload-img">
                 <div class="w-full">
-                    <HcUploads :accept="uploadAccept" :fileList="uploadFileList" :limit="3" :size="30" :viewer="false"
-                               action="put-file"
-                               @change="uploadChange" @del="removeUpload" @preview="handlePreview"
-                               @progress="uploadsProgress"/>
+                    <HcUploads
+                        :accept="uploadAccept" :file-list="uploadFileList" :limit="3" :size="30" :viewer="false"
+                        action="put-file"
+                        @change="uploadChange" @del="removeUpload" @preview="handlePreview"
+                        @progress="uploadsProgress"
+                    />
                 </div>
-                <el-image-viewer v-if="showViewer" :initial-index="initialIndex" :url-list="previewFileList"
-                                 @close="previewModalClose"/>
+                <el-image-viewer
+                    v-if="showViewer" :initial-index="initialIndex" :url-list="previewFileList"
+                    @close="previewModalClose"
+                />
             </div>
             <div class="mt-3">
-                <el-alert :closable="false" title="请上传JPG、PNG格式的图片文件，最多上传 3 张图片，文件大小不超过30M"
-                          type="error"/>
+                <el-alert
+                    :closable="false" title="请上传JPG、PNG格式的图片文件，最多上传 3 张图片，文件大小不超过30M"
+                    type="error"
+                />
             </div>
             <template #footer>
                 <div class="dialog-footer">
@@ -173,11 +206,13 @@
             </template>
         </el-dialog>
 
-        <!--提示框-->
-        <el-dialog v-model="showTipModal" :before-close="handleTipModalClose" class="hc-modal-border" title="感谢"
-                   width="600px">
+        <!-- 提示框 -->
+        <el-dialog
+            v-model="showTipModal" :before-close="handleTipModalClose" class="hc-modal-border" title="感谢"
+            width="600px"
+        >
             <div class="tip-modal-icon-box">
-                <HcIcon fill name="emotion"/>
+                <HcIcon fill name="emotion" />
             </div>
             <div class="tip-modal-text-box">感谢您的仗义直言，大恩不言谢，有事联系我们，我们随时都在</div>
             <template #footer>
@@ -191,25 +226,25 @@
 </template>
 
 <script setup>
-import {nextTick, onMounted, ref, watch} from "vue";
-import {useAppStore} from "~src/store";
-import orderServe from '~api/other/orderServe';
-import avatarPng from '~src/assets/images/avatar.png';
-import Web515Png from '~src/assets/images/Web515.png';
-import {userConfigSave} from "~api/other";
-import {base64ToFile, getObjVal, getArrValue, getObjValue} from "js-fast-way"
-import ossApi from "~api/oss";
+import { nextTick, onMounted, ref, watch } from 'vue'
+import { useAppStore } from '~src/store'
+import orderServe from '~api/other/orderServe'
+import avatarPng from '~src/assets/images/avatar.png'
+import Web515Png from '~src/assets/images/Web515.png'
+import { userConfigSave } from '~api/other'
+import { base64ToFile, getArrValue, getObjVal, getObjValue } from 'js-fast-way'
+import ossApi from '~api/oss'
 
 //初始变量
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
 const isScreenShort = ref(useAppState.getScreenShort)
 //是否弹出工单感谢, 0不弹出，1弹出
 const opinionView = ref(useAppState.getOrderServiceTipModal)
 
 //搜索和分页数据
-const searchForm = ref({current: 1, size: 20})
+const searchForm = ref({ current: 1, size: 20 })
 const orderDataList = ref([])
 
 // 工单名称
@@ -218,11 +253,11 @@ const nameSelectData = ref([])
 
 //监听
 watch(() => [
-    useAppState.getScreenShort
+    useAppState.getScreenShort,
 ], ([ScreenShort]) => {
     isScreenShort.value = ScreenShort
     if (ScreenShort) {
-        let base64 = window.sessionStorage.getItem('screenShort-base64') || '';
+        let base64 = window.sessionStorage.getItem('screenShort-base64') || ''
         if (base64) uploadImgFile(base64)
     }
 })
@@ -230,7 +265,7 @@ watch(() => [
 nextTick(() => {
     //截图数据
     if (isScreenShort.value) {
-        let base64 = window.sessionStorage.getItem('screenShort-base64') || '';
+        let base64 = window.sessionStorage.getItem('screenShort-base64') || ''
         if (base64) uploadImgFile(base64)
     }
 })
@@ -245,7 +280,7 @@ onMounted(() => {
 const dataLoading = ref(false)
 const queryUserOpinionPage = async () => {
     dataLoading.value = true
-    const {error, code, data} = await orderServe.queryUserOpinionPage(searchForm.value)
+    const { error, code, data } = await orderServe.queryUserOpinionPage(searchForm.value)
     dataLoading.value = false
     if (!error && code === 200) {
         orderDataList.value = getArrValue(data['records'])
@@ -256,8 +291,8 @@ const queryUserOpinionPage = async () => {
 
 //获取工单服务下拉列表
 const queryCurrentUserOpinionList = async () => {
-    const {error, code, data} = await orderServe.queryCurrentUserOpinionList({
-        projectId: projectId.value
+    const { error, code, data } = await orderServe.queryCurrentUserOpinionList({
+        projectId: projectId.value,
     })
     if (!error && code === 200) {
         const res = getArrValue(data)
@@ -278,14 +313,14 @@ const queryCurrentUserOpinionList = async () => {
 const isCurrentBol = ref(false)
 const orderFlowList = ref([])
 const queryUserFlowOpinion = async () => {
-    let id = nameSelectKey.value || null;
-    const {error, code, data} = await orderServe.queryUserFlowOpinion({userOpinionId: id})
+    let id = nameSelectKey.value || null
+    const { error, code, data } = await orderServe.queryUserFlowOpinion({ userOpinionId: id })
     if (!error && code === 200) {
         const res = getArrValue(data)
         orderFlowList.value = res
         if (res.length > 0) {
-            const {currentBol, evaluation} = res[res.length - 1];
-            isCurrentBol.value = !!(currentBol && parseInt(evaluation) === -1);
+            const { currentBol, evaluation } = res[res.length - 1]
+            isCurrentBol.value = !!(currentBol && parseInt(evaluation) === -1)
         }
     } else {
         orderFlowList.value = []
@@ -312,8 +347,8 @@ const commentExpanded = (item) => {
 
 //获取评论列表
 const queryCommentsList = async (item) => {
-    const {error, code, data} = await orderServe.queryCommentsList({
-        userOpinionId: item.id
+    const { error, code, data } = await orderServe.queryCommentsList({
+        userOpinionId: item.id,
     })
     if (!error && code === 200) {
         item['expandedCommentList'] = getArrValue(data)
@@ -325,16 +360,16 @@ const queryCommentsList = async (item) => {
 //提交评论
 const saveCommentClick = async (item) => {
     if (!item['replyContent']) {
-        window.$message?.warning('请先填写评论内容');
+        window.$message?.warning('请先填写评论内容')
     } else {
-        const {error, code} = await orderServe.saveUserComments({
+        const { error, code } = await orderServe.saveUserComments({
             userOpinionId: item.id,
             replyContent: item['replyContent'],
             projectId: projectId.value,
             contractId: contractId.value,
         })
         if (!error && code === 200) {
-            window.$message?.success('评论成功');
+            window.$message?.success('评论成功')
             item['replyContent'] = ''
             queryCommentsList(item)
         }
@@ -344,17 +379,17 @@ const saveCommentClick = async (item) => {
 //点赞
 const likeClick = async (item) => {
     if (item['currentUserGood']) {
-        const {error, code} = await orderServe.cancelGood({
-            userOpinionId: item.id
+        const { error, code } = await orderServe.cancelGood({
+            userOpinionId: item.id,
         })
         if (!error && code === 200) {
             item['currentUserGood'] = false
             item['goodNumber']--
         }
     } else {
-        const {error, code} = await orderServe.addGoodNumber({
+        const { error, code } = await orderServe.addGoodNumber({
             userOpinionId: item.id,
-            good: 1
+            good: 1,
         })
         if (!error && code === 200) {
             item['currentUserGood'] = true
@@ -368,14 +403,14 @@ const showModal = ref(false)
 
 //类型tab数据
 const typeTabKey = ref(null)
-const typeTab = ref([]);
+const typeTab = ref([])
 
-const typeTabIndex = ref(-1);
-const typeCheckBox = ref([]);
+const typeTabIndex = ref(-1)
+const typeCheckBox = ref([])
 
 const typeTabChange = (val) => {
-    typeTabKey.value = val;
-    typeTabIndex.value = typeTab.value.findIndex(item => item.dictValue === val);
+    typeTabKey.value = val
+    typeTabIndex.value = typeTab.value.findIndex(item => item.dictValue === val)
 }
 
 //发起新工单服务
@@ -391,7 +426,7 @@ const handleModalClose = () => {
 
 //获取字典信息
 const queryDictBizList = async () => {
-    const {error, code, data} = await orderServe.queryDictBizList()
+    const { error, code, data } = await orderServe.queryDictBizList()
     if (!error && code === 200) {
         const res = getArrValue(data)
         typeTab.value = res
@@ -408,11 +443,11 @@ const queryDictBizList = async () => {
 const opinionContent = ref('')
 
 //上传
-const uploadAccept = "image/png,image/jpg,image/jpeg"
+const uploadAccept = 'image/png,image/jpg,image/jpeg'
 const uploadFileList = ref([])
 
 //上传的文件结果
-const uploadChange = ({fileList}) => {
+const uploadChange = ({ fileList }) => {
     uploadFileList.value = fileList
 }
 
@@ -426,7 +461,7 @@ const uploadsProgress = (val) => {
 const showViewer = ref(false)
 const initialIndex = ref(-1)
 const previewFileList = ref([])
-const handlePreview = ({index, fileArr}) => {
+const handlePreview = ({ index, fileArr }) => {
     previewFileList.value = fileArr
     initialIndex.value = index
     showViewer.value = true
@@ -439,10 +474,10 @@ const previewModalClose = () => {
 }
 
 //删除上传的文件
-const removeUpload = async ({link}) => {
-    const arrUrl = link.split(".com//");
+const removeUpload = async ({ link }) => {
+    const arrUrl = link.split('.com//')
     if (arrUrl.length > 0) {
-        await ossApi.removeFile({fileName: arrUrl[1]}, false)
+        await ossApi.removeFile({ fileName: arrUrl[1] }, false)
     }
 }
 
@@ -450,13 +485,13 @@ const removeUpload = async ({link}) => {
 //上传截图文件
 const spinShow = ref(false)
 const uploadImgFile = async (base64) => {
-    let fileOfBlob = base64ToFile(base64);
-    let formData = new FormData();
-    formData.append("file", fileOfBlob);
+    let fileOfBlob = base64ToFile(base64)
+    let formData = new FormData()
+    formData.append('file', fileOfBlob)
     //上传文件
     spinShow.value = true
     newOrderServiceClick()
-    const {error, code, data} = await ossApi.putFile(formData, false)
+    const { error, code, data } = await ossApi.putFile(formData, false)
     spinShow.value = false
     if (!error && code === 200) {
         let res = getObjValue(data)
@@ -464,42 +499,42 @@ const uploadImgFile = async (base64) => {
             uploadFileList.value.push({
                 url: res?.link,
                 name: res?.name,
-                response: {data: res}
+                response: { data: res },
             })
         }
-        window.sessionStorage.removeItem('screenShort-base64');
-        window.$message?.success('文件上传成功');
+        window.sessionStorage.removeItem('screenShort-base64')
+        window.$message?.success('文件上传成功')
         spinShow.value = false
     } else {
-        window.sessionStorage.removeItem('screenShort-base64');
-        window.$message?.warning('文件上传失败');
+        window.sessionStorage.removeItem('screenShort-base64')
+        window.$message?.warning('文件上传失败')
     }
 }
 
 //提交工单反馈
 const saveClick = async () => {
     //拼接问题类型
-    let problemType = typeTabKey.value, index = typeTabIndex.value, problemVal = '';
-    const checkBoxVal = typeCheckBox.value[index] || [];
+    let problemType = typeTabKey.value, index = typeTabIndex.value, problemVal = ''
+    const checkBoxVal = typeCheckBox.value[index] || []
     checkBoxVal.forEach(item => {
         problemVal += `-${item}`
     })
     let filesUrl = getUploadFileUrl()
     //判断数据
     if (!problemVal) {
-        window.$message?.warning('请先选择问题类型');
+        window.$message?.warning('请先选择问题类型')
     } else {
         //请求接口
-        const {error, code} = await orderServe.saveUserOpinion({
+        const { error, code } = await orderServe.saveUserOpinion({
             projectId: projectId.value,
             contractId: contractId.value,
             problemType: problemType + problemVal,
             opinionContent: opinionContent.value,
-            returnFiles: filesUrl
+            returnFiles: filesUrl,
         })
         if (!error && code === 200) {
-            window.$message?.success('提交成功');
-            showModal.value = false;
+            window.$message?.success('提交成功')
+            showModal.value = false
             //重置表单
             typeCheckBox.value[index] = []
             opinionContent.value = ''
@@ -508,14 +543,14 @@ const saveClick = async () => {
             //更新数据
             queryUserOpinionPage()
             queryCurrentUserOpinionList()
-            window?.location?.reload()  //刷新页面
+            window?.location?.reload() //刷新页面
         }
     }
 }
 
 //获取文件URL
 const getUploadFileUrl = () => {
-    let fileArr = [], fileList = uploadFileList.value ?? [];
+    let fileArr = [], fileList = uploadFileList.value ?? []
     fileList.forEach(item => {
         if (getObjVal(item?.response)) {
             fileArr.push(item?.response?.data?.link)
@@ -530,19 +565,19 @@ const getUploadFileUrl = () => {
 const showTipModal = ref(false)
 const evaluationKey = ref('1')
 const evaluationData = [
-    {value: "1", label: "满意"},
-    {value: "2", label: "不满意并再次提交解决"},
-    {value: "3", label: "不满意且投诉"}
+    { value: '1', label: '满意' },
+    { value: '2', label: '不满意并再次提交解决' },
+    { value: '3', label: '不满意且投诉' },
 ]
 const disposeUserFeedback = async () => {
     let oldEndFlow = orderFlowList.value[3]?.id || ''
-    const {error, code} = await orderServe.disposeUserFeedback({
+    const { error, code } = await orderServe.disposeUserFeedback({
         oldEndFlow: oldEndFlow,
         type: evaluationKey.value || '',
-        userOpinionId: nameSelectKey.value || ''
+        userOpinionId: nameSelectKey.value || '',
     })
     if (!error && code === 200) {
-        window.$message?.success('提交成功');
+        window.$message?.success('提交成功')
         showTipModal.value = parseInt(opinionView.value) === 1
         queryCurrentUserOpinionList()
     }
@@ -550,7 +585,7 @@ const disposeUserFeedback = async () => {
 
 //提示框
 const tipModalClick = async () => {
-    await userConfigSave({opinionView: 0})
+    await userConfigSave({ opinionView: 0 })
     showTipModal.value = false
     useAppState.setOrderServiceTipModal(0)
     opinionView.value = 0
@@ -567,18 +602,18 @@ const scrollToTop = () => {
 }
 
 //左右拖动，改变树形结构宽度
-const leftWidth = ref(500);
+const leftWidth = ref(500)
 const onmousedown = () => {
     const clientWidth = document.body.clientWidth
     document.onmousemove = (ve) => {
-        let diffVal = clientWidth - (ve.clientX + 24);
+        let diffVal = clientWidth - (ve.clientX + 24)
         if (diffVal >= 300 && diffVal <= 1000) {
-            leftWidth.value = diffVal;
+            leftWidth.value = diffVal
         }
     }
     document.onmouseup = () => {
-        document.onmousemove = null;
-        document.onmouseup = null;
+        document.onmousemove = null
+        document.onmouseup = null
     }
 }
 </script>

src/views/schedule/hc-table.vue

@@ -1,78 +1,116 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard>
+        <HcNewCard>
             <template #header>
                 <el-button hc-btn type="primary" @click="toBackClick">
-                    <HcIcon name="arrow-go-back"/>
+                    <HcIcon name="arrow-go-back" />
                     <span>返回上一级</span>
                 </el-button>
             </template>
-            <el-table v-loading="isLoading" :data="tableData" :load="loadData" border height="100%" lazy
-                      row-key="primaryKeyId">
-                <el-table-column label="节点名称" prop="title"></el-table-column>
+            <el-table
+                v-loading="isLoading" :data="tableData" :load="loadData" border height="100%" lazy
+                row-key="primaryKeyId"
+            >
+                <el-table-column label="节点名称" prop="title" />
                 <el-table-column align="center" label="施工台账">
-                    <el-table-column align="center" label="未开始" prop="standingBookNotAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="已完成" prop="standingBookEndAmount"
-                                     width="80"></el-table-column>
+                    <el-table-column
+                        align="center" label="未开始" prop="standingBookNotAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="已完成" prop="standingBookEndAmount"
+                        width="80"
+                    />
                 </el-table-column>
                 <el-table-column align="center" label="开工报告">
-                    <el-table-column align="center" label="未开始" prop="workStartNotSubmitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="未上报" prop="workStartNotTaskAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="待审批" prop="workStartAwaitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="已审批" prop="workStartApprovalAmount"
-                                     width="80"></el-table-column>
+                    <el-table-column
+                        align="center" label="未开始" prop="workStartNotSubmitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="未上报" prop="workStartNotTaskAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="待审批" prop="workStartAwaitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="已审批" prop="workStartApprovalAmount"
+                        width="80"
+                    />
                 </el-table-column>
                 <el-table-column align="center" label="工序资料">
-                    <el-table-column align="center" label="未开始" prop="processNotSubmitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="未上报" prop="processNotTaskAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="待审批" prop="processAwaitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="已审批" prop="processApprovalAmount"
-                                     width="80"></el-table-column>
+                    <el-table-column
+                        align="center" label="未开始" prop="processNotSubmitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="未上报" prop="processNotTaskAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="待审批" prop="processAwaitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="已审批" prop="processApprovalAmount"
+                        width="80"
+                    />
                 </el-table-column>
                 <el-table-column align="center" label="质量评定">
-                    <el-table-column align="center" label="未开始" prop="evaluationNotSubmitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="未上报" prop="evaluationNotTaskAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="待审批" prop="evaluationAwaitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="已审批" prop="evaluationApprovalAmount"
-                                     width="80"></el-table-column>
+                    <el-table-column
+                        align="center" label="未开始" prop="evaluationNotSubmitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="未上报" prop="evaluationNotTaskAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="待审批" prop="evaluationAwaitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="已审批" prop="evaluationApprovalAmount"
+                        width="80"
+                    />
                 </el-table-column>
                 <el-table-column align="center" label="中间交工">
-                    <el-table-column align="center" label="未开始" prop="completionNotSubmitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="未上报" prop="completionNotTaskAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="待审批" prop="completionAwaitAmount"
-                                     width="80"></el-table-column>
-                    <el-table-column align="center" label="已审批" prop="completionApprovalAmount"
-                                     width="80"></el-table-column>
+                    <el-table-column
+                        align="center" label="未开始" prop="completionNotSubmitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="未上报" prop="completionNotTaskAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="待审批" prop="completionAwaitAmount"
+                        width="80"
+                    />
+                    <el-table-column
+                        align="center" label="已审批" prop="completionApprovalAmount"
+                        width="80"
+                    />
                 </el-table-column>
             </el-table>
-        </HcCard>
+        </HcNewCard>
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useRouter} from 'vue-router'
-import {useAppStore} from "~src/store";
-import DataApi from "~api/schedule/data"
-import {getArrValue} from "js-fast-way"
+import { onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useAppStore } from '~src/store'
+import DataApi from '~api/schedule/data'
+import { getArrValue } from 'js-fast-way'
 
 //变量
 const router = useRouter()
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
 
 //渲染完成
 onMounted(() => {
@@ -86,26 +124,26 @@ const isLoading = ref(false)
 const tableData = ref([])
 const getTableData = async () => {
     isLoading.value = true
-    const {error, code, data} = await DataApi.queryContractTreeMaterialProgress({
+    const { error, code, data } = await DataApi.queryContractTreeMaterialProgress({
         projectId: projectId.value,
         contractId: contractId.value,
-        parentId: ''
-    });
+        parentId: '',
+    })
     isLoading.value = false
     if (!error && code === 200) {
-        tableData.value = getArrValue(data['treeMaterialProgressList']);
+        tableData.value = getArrValue(data['treeMaterialProgressList'])
     } else {
-        tableData.value = [];
+        tableData.value = []
     }
 }
 
 //懒加载数据
 const loadData = async (row, treeNode, resolve) => {
-    const {error, code, data} = await DataApi.queryContractTreeMaterialProgress({
+    const { error, code, data } = await DataApi.queryContractTreeMaterialProgress({
         projectId: projectId.value,
         contractId: row.contractId || contractId.value,
-        parentId: row.id
-    });
+        parentId: row.id,
+    })
     if (!error && code === 200) {
         resolve(getArrValue(data['treeMaterialProgressList']))
     } else {
@@ -116,7 +154,7 @@ const loadData = async (row, treeNode, resolve) => {
 //返回上级
 const toBackClick = () => {
     router.push({
-        path: '/schedule/data'
+        path: '/schedule/data',
     })
 }
 </script>

src/views/tasks/components/TableCard.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <HcNewCard>
         <template #header>
             <div class="w-32">
                 <el-select v-model="searchForm.typeValue" block clearable placeholder="任务类型" size="large">
@@ -58,8 +58,9 @@
             </HcTooltip>
         </template>
         <HcTable
-            ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-check
-            border @selection-change="tableSelectionChange"
+            ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
+            is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+            @selection-change="tableSelectionChange"
         >
             <template #taskName="{ row }">
                 <span class="text-link" @click="rowTaskName(row)">{{ row?.taskName }}</span>
@@ -97,7 +98,7 @@
                 </div>
             </div>
         </template>
-    </HcCard>
+    </HcNewCard>
 </template>
 
 <script setup>

src/views/tasks/flow.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <HcNewCard :scrollbar="false" action-size="lg">
             <template #header>
                 <HcTooltip keys="tasks_flow_add">
                     <el-button hc-btn type="primary" @click="addFlowData">
@@ -15,7 +15,7 @@
                     title="同一合同段内，只需要设置重复岗位的流程即可，其他任务岗位，系统将自动推送，无需创建更多任务流" type="error"
                 />
             </template>
-            <HcTable :column="tableListColumn" :datas="tableListData" :loading="tableLoading" border>
+            <HcTable :column="tableListColumn" :datas="tableListData" :loading="tableLoading" is-new :index-style="{ width: 60 }">
                 <template #action="{ row }">
                     <HcTooltip keys="tasks_flow_edit">
                         <el-button plain size="small" type="primary" @click="handleTableEdit(row)">编辑</el-button>
@@ -28,12 +28,9 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
         <!-- 新增/编辑流程 弹框 -->
-        <el-dialog
-            v-model="showEditModal" :title="`${flowFormData.id ? '编辑' : '新增'}流程`" class="hc-modal-border"
-            width="47rem"
-        >
+        <hc-new-dialog v-model="showEditModal" :title="`${flowFormData.id ? '编辑' : '新增'}流程`" widths="47rem">
             <el-form ref="formFlowRef" :model="flowFormData" :rules="formFlowRules" label-width="auto" size="large">
                 <el-form-item label="流程名称" prop="fixedFlowName">
                     <el-input v-model="flowFormData.fixedFlowName" placeholder="请输入流程名称" />
@@ -51,7 +48,7 @@
                     <el-button :loading="sevaLoading" hc-btn type="primary" @click="saveFormClick">保存</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tasks/hc-data.vue

@@ -31,10 +31,7 @@
         </HcTabsSimple>
 
         <!-- 任务审核 -->
-        <el-dialog
-            v-model="showTaskReviewModal" class="hc-modal-border hc-modal-table" destroy-on-close draggable
-            width="80vw"
-        >
+        <hc-new-dialog v-model="showTaskReviewModal" is-table width="80vw">
             <template #header="{ titleId, titleClass }">
                 <div class="hc-card-header flex items-center">
                     <div :id="titleId" :class="titleClass">任务审核 【已开启电签】</div>
@@ -55,10 +52,10 @@
                 </div>
                 <div :class="sbTableKey === 'key1' ? '' : 'vh'" class="flex-table">
                     <div v-if="taskReviewType === '1'" class="data-table taskReviewData">
-                        <HcTable :column="taskReviewColumns" :datas="taskReviewData" border @row-click="rowTaskReviewClick" />
+                        <HcTable :column="taskReviewColumns" :datas="taskReviewData" is-new :index-style="{ width: 60 }" @row-click="rowTaskReviewClick" />
                     </div>
                     <div v-if="taskReviewType === '2'" class="data-table checkedRowsRef">
-                        <HcTable :column="checkedRowsColumns" :datas="checkedRowsRef" border @row-click="rowTaskReviewClick" />
+                        <HcTable :column="checkedRowsColumns" :datas="checkedRowsRef" is-new :index-style="{ width: 60 }" @row-click="rowTaskReviewClick" />
                     </div>
                     <div v-if="sbTableKey === 'key1'" class="radio-group-box">
                         <span class="label">审批操作：</span>
@@ -84,14 +81,10 @@
                     </el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
 
         <!-- 设置重签规则 -->
-        <el-dialog
-            v-model="showSetSignRulesModal" class="hc-modal-border" destroy-on-close draggable
-            title="设置重签规则"
-            width="38rem"
-        >
+        <hc-new-dialog v-model="showSetSignRulesModal" title="设置重签规则" widths="38rem">
             <div class="text-orange mb-10">
                 <span
                     class="mr-4"
@@ -114,7 +107,7 @@
                     <el-button hc-btn type="primary">保存</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </hc-new-dialog>
 
         <!-- 短信认证 -->
         <HcSmsAuth :loading="SMSAuthLoading" :show="SMSAuthShow" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm" />

src/views/tasks/message-data.vue

@@ -6,7 +6,7 @@
             </el-scrollbar>
         </div>
         <div class="hc-layout-content-box">
-            <HcCard action-size="lg">
+            <HcNewCard action-size="lg">
                 <template #header>
                     <div class="w-32 ml-2">
                         <el-select v-model="searchForm.smsType" clearable placeholder="消息类型" size="large">
@@ -38,7 +38,8 @@
                 </template>
                 <HcTable
                     ref="tableListRef" :column="tableListColumn" :datas="tableListData" :loading="tableLoading"
-                    is-check border @selection-change="tableSelectionChange"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 >
                     <template #content="{ row }">
                         <div class="text-link text-cut" @click="tableContent(row)">{{ row.content }}</div>
@@ -47,12 +48,12 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
         <!-- 日志内容 -->
-        <el-dialog v-model="operationContentModal" class="hc-modal-border" title="消息内容" width="38rem">
+        <hc-new-dialog v-model="operationContentModal" title="消息内容" widths="38rem">
             {{ operationContent }}
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tasks/sign-admin.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <HcNewCard :scrollbar="false" action-size="lg">
             <template #header>
                 <div class="w-64">
                     <el-input
@@ -51,8 +51,9 @@
                 </HcTooltip>
             </template>
             <HcTable
-                ref="tableListRef" :column="tableListColumn" :datas="tableData" :loading="tableLoading" is-check
-                border @selection-change="tableSelectionChange"
+                ref="tableListRef" :column="tableListColumn" :datas="tableData" :loading="tableLoading"
+                is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                @selection-change="tableSelection"
             >
                 <template #taskName="{ row }">
                     <span class="text-link" @click="rowTaskName(row)">{{ row?.taskName }}</span>
@@ -80,7 +81,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
     </div>
 </template>
 

src/views/tentative/collect/monthly.vue

@@ -41,7 +41,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <HcNewCard>
                 <template #header>
                     <div class="w-40">
                         <el-select v-model="searchForm.type" clearable placeholder="请选择材料类别" size="large">
@@ -113,7 +113,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 编辑备注 -->

src/views/tentative/collect/test.vue

@@ -19,7 +19,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="tentative_collect_test_del">
                         <el-button hc-btn color="#e03997" @click="delModalClick">
@@ -76,13 +76,14 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 />
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
     </div>
 </template>

src/views/tentative/detect/components/ListItem.vue

@@ -157,8 +157,9 @@
             <div class="dialog-table-box">
                 <div class="dialog-table">
                     <HcTable
-                        ref="vesselTableRef" :column="vesselTableColumn" :datas="vesselTableData" border
-                        :loading="vesselTableLoading" is-check @selection-change="vesselTableSelection"
+                        ref="vesselTableRef" :column="vesselTableColumn" :datas="vesselTableData" :loading="vesselTableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="vesselTableSelection"
                     />
                 </div>
                 <div class="dialog-pages">
@@ -186,8 +187,9 @@
             <div class="dialog-table-box">
                 <div class="dialog-table">
                     <HcTable
-                        ref="deviceTableRef" :column="deviceTableColumn" :datas="deviceTableData" border
-                        :loading="deviceTableLoading" is-check @selection-change="deviceTableSelection"
+                        ref="deviceTableRef" :column="deviceTableColumn" :datas="deviceTableData" :loading="deviceTableLoading"
+                        is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                        @selection-change="deviceTableSelection"
                     />
                 </div>
                 <div class="dialog-pages">

src/views/tentative/detect/outside.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="tentative_detect_third_add">
                         <el-button :disabled="!thirdTreeKeys" hc-btn type="primary" @click="addFormModalClick">
@@ -84,8 +84,9 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 >
                     <template #status="{ row }">
                         <span>{{ row.status === 1 ? '合格' : row.status === 0 ? '不合格' : '' }}</span>
@@ -94,7 +95,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 -->
@@ -309,7 +310,7 @@
                 </div>
                 <div class="hc-links-sample-table-box">
                     <HcTable
-                        :column="linksSampleTableColumn" :datas="linksSampleTableData" border
+                        :column="linksSampleTableColumn" :datas="linksSampleTableData" is-new
                         :is-index="false" :loading="linksSampleTableLoading"
                     >
                         <template #action="{ row }">

src/views/tentative/detect/test-form-bak.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard action-ui="text-center">
+        <HcNewCard action-ui="text-center">
             <template #header>
                 <el-button :type="authBtnTabKey === '1' ? 'primary' : ''" hc-btn :disabled="router.currentRoute.value.query?.id && router.currentRoute.value.query?.id.length > 0 || nodeIdvalue.length > 0 || newId.length > 0" @click="authBtnTabClick('1')">
                     <HcIcon name="folder-user" />
@@ -120,7 +120,7 @@
                     <span>返回</span>
                 </el-button>
             </template>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 关联工程用途及部位 -->
         <HcDialog
@@ -200,7 +200,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableRawRef" :column="linksRawTableColumn" :datas="linksRawTableData"
-                        :is-index="false" :loading="linksRawTableLoading" is-check border
+                        :is-index="false" :loading="linksRawTableLoading" is-new is-check :check-style="{ width: 29 }"
                         @selection-change="linksRawTableSelection"
                     />
                 </div>
@@ -225,7 +225,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableSampleRef" :column="linksSampleTableColumn" :datas="linksSampleTableData"
-                        :is-index="false" :loading="linksSampleTableLoading" is-check border
+                        :is-index="false" :loading="linksSampleTableLoading" is-new is-check :check-style="{ width: 29 }"
                         @selection-change="linksSampleTableSelection"
                     />
                 </div>

src/views/tentative/detect/test-form.vue

@@ -163,7 +163,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableRawRef" :column="linksRawTableColumn" :datas="linksRawTableData"
-                        :is-index="false" :loading="linksRawTableLoading" is-check border
+                        :is-index="false" :loading="linksRawTableLoading" is-new is-check :check-style="{ width: 29 }"
                         @selection-change="linksRawTableSelection"
                     />
                 </div>
@@ -188,7 +188,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         ref="tableSampleRef" :column="linksSampleTableColumn" :datas="linksSampleTableData"
-                        :is-index="false" :loading="linksSampleTableLoading" is-check border
+                        :is-index="false" :loading="linksSampleTableLoading" is-new is-check :check-style="{ width: 29 }"
                         @selection-change="linksSampleTableSelection"
                     />
                 </div>
@@ -508,8 +508,8 @@ const changeorinsdate = async (pKeyId, isBussShow, id) => {
             item.isBussShow = isBussShows
         }
     })
-   
-    
+
+
 }
 //复制本表改变原始数据
 const chageorinData = async () => {
@@ -1221,7 +1221,7 @@ const tableFormSaveClick = async () => {
                         isaddType = false
                     }
                 //   await getTableDataAll()
-  
+
                   const ActiveKey = getStoreValue('ActiveKey')
                   const names = ActiveKey ? ActiveKey.split('-') : []
                   let pid = names[2]
@@ -1487,7 +1487,7 @@ const searchNodeAllTable1 = async (newaddId) => {
   console.log('重新获取表单列表')
 
   const { error, code, data } = await dataApi.searchNodeTables({
-           
+
             projectId: projectId.value,
             contractId: contractId.value,
             primaryKeyId: nodeId,
@@ -1502,8 +1502,8 @@ const searchNodeAllTable1 = async (newaddId) => {
         } else {
             newlistdata.value = []
         }
-        
-      
+
+
 }
 </script>
 

src/views/tentative/detect/test.vue

@@ -135,8 +135,8 @@
                 </template>
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
-                    border :check-style="{ width: 29, fixed: 'left' }" :index-style="{ width: 60, fixed: 'left' }"
-                    is-check @selection-change="tableSelection"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 >
                     <template #recordNo="{ row }">
                         <span class="text-link" @click="tableRowEdit(row, '1')">{{ row?.recordNo }}</span>
@@ -226,7 +226,7 @@
         >
             <HcTable
                 :column="samplingTableColumn" :datas="samplingTableData" :is-index="false"
-                :loading="samplingTableLoading" border
+                :loading="samplingTableLoading" is-new
             />
         </HcDialog>
         <!-- 批量上报审批 -->

src/views/tentative/detect/third.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="tentative_detect_third_add">
                         <el-button :disabled="!thirdTreeKeys" hc-btn type="primary" @click="addFormModalClick">
@@ -84,8 +84,9 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 >
                     <template #status="{ row }">
                         <!-- <span>{{arrKeyValue(categoryData, 'dictKey', 'dictValue', row.detectionCategory)}}</span> -->
@@ -95,7 +96,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 -->
@@ -310,7 +311,7 @@
                 <div class="hc-links-sample-table-box">
                     <HcTable
                         :column="linksSampleTableColumn" :datas="linksSampleTableData"
-                        :is-index="false" :loading="linksSampleTableLoading" border
+                        :is-index="false" :loading="linksSampleTableLoading" is-new
                     >
                         <template #action="{ row }">
                             <el-button v-if="addEditFormModel.sampleId === row.id" plain size="small" type="primary">

src/views/tentative/device/approach.vue

@@ -23,7 +23,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <HcNewCard>
                 <template #header>
                     <HcTooltip keys="tentative_device_approach_add">
                         <el-button hc-btn type="primary" @click="addFormModalClick">
@@ -92,8 +92,9 @@
                     </div>
                 </template>
                 <HcTable
-                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                    border @selection-change="tableSelection"
+                    ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                    is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                    @selection-change="tableSelection"
                 >
                     <template #status="{ row }">
                         {{ row.status === 1 ? '启用中' : '已停用' }}
@@ -105,7 +106,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 节点 -->

src/views/tentative/device/employ.vue

@@ -13,7 +13,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <HcNewCard>
                 <template #header>
                     <HcTooltip keys="tentative_device_employ_add">
                         <el-button hc-btn type="primary" @click="addFormModalClick">
@@ -73,7 +73,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 -->

src/views/tentative/device/overhaul.vue

@@ -13,7 +13,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <HcNewCard>
                 <template #header>
                     <HcTooltip keys="tentative_device_overhaul_add">
                         <el-button hc-btn type="primary" @click="addFormModalClick">
@@ -35,7 +35,7 @@
                     </HcTooltip>
                     <HcTooltip keys="tentative_device_overhaul_printer">
                         <el-button
-                            :disabled="tableCheckedKeys.length <= 0" :loading="printerLoading" hc-btn color="#567722" 
+                            :disabled="tableCheckedKeys.length <= 0" :loading="printerLoading" hc-btn color="#567722"
                             @click="printerClick"
                         >
                             <HcIcon name="printer" />
@@ -73,7 +73,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 -->

src/views/tentative/laboratory/print.vue

@@ -27,7 +27,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="tentative_laboratory_print_print">
                         <el-button :loading="printLoading" hc-btn color="#567722" @click="batchPrint()">
@@ -49,7 +49,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
     </div>
 </template>

src/views/tentative/laboratory/user.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard>
+        <HcNewCard>
             <template #header>
                 <div class="w-72">
                     <el-input
@@ -52,7 +52,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 新增/编辑 -->
         <HcDialog

src/views/tentative/material/approach.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard>
+        <HcNewCard>
             <template #header>
                 <HcTooltip keys="tentative_material_approach_add">
                     <el-button hc-btn type="primary" @click="addFormModalClick">
@@ -94,7 +94,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 新增/编辑 -->
         <HcDialog

src/views/tentative/material/sampling.vue

@@ -26,7 +26,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" action-size="lg">
                 <template #header>
                     <HcTooltip keys="tentative_material_sampling_add">
                         <el-button :disabled="!primaryKeyId" hc-btn type="primary" @click="addFormModalClick">
@@ -101,7 +101,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 -->

src/views/tentative/parameter/compactness.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard>
+        <HcNewCard>
             <template #header>
                 <HcTooltip keys="tentative_parameter_compactness_add">
                     <el-button hc-btn type="primary" @click="addFormModalClick">
@@ -28,7 +28,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 新增/编辑 -->
         <HcDialog

src/views/tentative/parameter/container.vue

@@ -21,7 +21,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <HcNewCard>
                 <template #header>
                     <div class="w-72">
                         <el-input
@@ -75,7 +75,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 节点 -->

src/views/tentative/parameter/density.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard>
+        <HcNewCard>
             <template #header>
                 <HcTooltip keys="tentative_parameter_density_add">
                     <el-button hc-btn type="primary" @click="addFormModalClick">
@@ -22,13 +22,14 @@
                 </HcTooltip>
             </template>
             <HcTable
-                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
-                border @selection-change="tableSelection"
+                ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
+                is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
+                @selection-change="tableSelection"
             />
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </HcNewCard>
 
         <!-- 新增/编辑 -->
         <HcDialog

src/views/tentative/parameter/sieve.vue

@@ -21,7 +21,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <HcNewCard>
                 <!-- <template #header>
                     <div class="w-72">
                         <el-input v-model="searchForm.queryValue" placeholder="请输入容器编号查询" clearable @keyup="keyUpEvent" size="large"/>
@@ -60,7 +60,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 新增/编辑 节点 -->

src/views/user/index.vue

@@ -23,7 +23,7 @@
             </div>
         </div>
         <div class="hc-layout-content-box">
-            <HcCard
+            <HcNewCard
                 v-if="menuKey !== 'log' && menuKey !== 'recycle'" :title="menuItem.label" :ui="basicHight ? 'basic-hight' : ''"
                 scrollbar
             >
@@ -131,7 +131,7 @@
                         </el-sub-menu>
                     </el-menu>
                 </template>
-            </HcCard>
+            </HcNewCard>
             <div v-if="basicFormEdit" class="hc-card-foot-box">
                 <el-button :loading="saveUserLoading" hc-btn type="primary" @click="saveUserInfoClick">
                     <HcIcon name="save" />
@@ -142,7 +142,7 @@
                     <span>取消</span>
                 </el-button>
             </div>
-            <HcCard v-if="menuKey === 'log'" :title="menuItem.label">
+            <HcNewCard v-if="menuKey === 'log'" :title="menuItem.label">
                 <template #search>
                     <div class="flex items-center">
                         <div class="w-32">
@@ -218,8 +218,8 @@
                 <template #action>
                     <HcPages :pages="searchLogForm" @change="pageLogChange" />
                 </template>
-            </HcCard>
-            <HcCard v-if="menuKey === 'recycle'" action-size="lg">
+            </HcNewCard>
+            <HcNewCard v-if="menuKey === 'recycle'" action-size="lg">
                 <template #header>
                     <div class="mr-5">{{ menuItem.label }}</div>
                     <HcNewSwitch :datas="userTypeTab" :keys="userTypeKey" @change="userTypeChange" />
@@ -243,14 +243,14 @@
                         <HcPages :pages="searchRecycleForm" @change="pageRecycleChange" />
                     </div>
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 日志内容 -->
-        <el-dialog v-model="operationContentModal" class="hc-modal-border" title="日志内容" width="38rem">
+        <hc-new-dialog v-model="operationContentModal" title="日志内容" widths="38rem">
             <!-- {{ operationContent }} -->
             <div v-html="saveData" />
-        </el-dialog>
+        </hc-new-dialog>
     </div>
 </template>