Forráskód Böngészése

新主题,先不要发版

ZaiZai 1 éve
szülő
commit
5a35bac225

+ 2 - 2
src/test/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard title="测试">
+        <hc-new-card title="测试">
             <div class="flex h-full">
                 <div class="w-96">
                     <template v-for="(item, index) in pdfData" :key="index">
@@ -13,7 +13,7 @@
                     <HcPdf v-if="pdfItem.pdf" :sign="logoName" :src="pdfItem.pdf" :dom="pdfItem.hcSignImageArr" :batch="true" @change="pdfChange" />
                 </div>
             </div>
-        </HcCard>
+        </hc-new-card>
     </div>
 </template>
 

+ 2 - 2
src/views/archives/appraisal.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard title="鉴定案卷保存价值">
+            <hc-new-card title="鉴定案卷保存价值">
                 <!-- <template #header>
                     <div class="hc-card-header-table-title">
                       鉴定案卷保存价值
@@ -87,7 +87,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
         <DestoryDialog :show="showdestorydialog" :length="tableCheckedKeys.length" :is-loading="isLoading" @upshow="upshow" @comfirmDestory="comfirmDestory" />
     </div>

+ 2 - 2
src/views/archives/meta-data.vue

@@ -20,7 +20,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div id="node-card-target" class="hc-page-content-box">
-            <HcCard title="已形成的案卷">
+            <hc-new-card title="已形成的案卷">
                 <!-- <template #header>
                     <div class="hc-card-header-table-title">
                       已形成的案卷
@@ -60,7 +60,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
         <!-- 元数据信息编辑 -->
         <MetaInfo :show="showMeteInfo" :file-id="fileId" @upshowModal="upshowModal" @getTableData="getTableData" />

+ 2 - 2
src/views/archives/rolling.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard title="已形成的案卷">
+            <hc-new-card title="已形成的案卷">
                 <!-- <template  #header>
                    <div class="hc-card-header-table-title">
                       已形成的案卷
@@ -58,7 +58,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
     </div>
 </template>

+ 2 - 2
src/views/archives/tuning.vue

@@ -24,7 +24,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <hc-new-card>
                 <template #header>
                     <div class="hc-card-header-table-title">
                         已形成的案卷
@@ -146,7 +146,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
         <!-- 跨目录移动 -->
         <HcDialog

+ 75 - 82
src/views/config/certified.vue

@@ -1,112 +1,110 @@
 <template>
     <div class="hc-page-layout-box">
-        <div class="hc-layout-left-box" :style="'width:' + leftWidth + 'px;'">
+        <div class="hc-layout-left-box" :style="`width:${leftWidth}px;`">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
-                    <HcIcon name="stack"/>
+                    <HcIcon name="stack" />
                 </div>
                 <div class="ml-2 project-name-box">
-                    <span class="text-xl text-cut project-alias">{{projectInfo['projectAlias']}}</span>
-                    <div class="text-xs text-cut project-name">{{projectInfo['name']}}</div>
+                    <span class="text-xl text-cut project-alias">{{ projectInfo.projectAlias }}</span>
+                    <div class="text-xs text-cut project-name">{{ projectInfo.name }}</div>
                 </div>
             </div>
             <div class="hc-tree-box">
-                    <el-scrollbar>
-                         <HcMenuSimple :datas="menuOptions" :keys="menuKey" @change="handleMenuValue"/>
-                    </el-scrollbar>
+                <el-scrollbar>
+                    <HcMenuSimple :datas="menuOptions" :keys="menuKey" @change="handleMenuValue" />
+                </el-scrollbar>
             </div>
-            <!--左右拖动-->
-            <div class="horizontal-drag-line" @mousedown="onmousedown"/>
+            <!-- 左右拖动 -->
+            <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-page-content-box">
-            <HcCard>
+            <hc-new-card>
                 <template #header>
-                  <div class="hc-card-header-table-title">
-                      证书信息
-                  </div>
+                    <div class="hc-card-header-table-title">
+                        证书信息
+                    </div>
                 </template>
-                 <template #extra>
+                <template #extra>
                     <HcTooltip keys="file_collection_btn_upload_scanned_files">
-                        <el-button type="primary" hc-btn >
-                            <HcIcon name="save"/>
+                        <el-button type="primary" hc-btn>
+                            <HcIcon name="save" />
                             <span>保存设置</span>
                         </el-button>
                     </HcTooltip>
                 </template>
-                 
-             <el-alert title="数字化扫描文件的二次安全认证管理,指定认证证书,方可进行认证。注意: 只有被指派的证书所有者才可以进行认证操作" type="error" :closable="false"  class="btn30" />
-                    <el-menu :default-active="projectKey" class="hc-project-menu" unique-opened>
-                        <el-sub-menu index="1">
-                            <template #title>
-                                <HcIcon name="folder-2" class="hc-menu-icon"/>
-                                <span>单位证书</span>
-                            </template>
-                            <!-- <el-menu-item v-for="items in item?.contractInfoList ?? []" :index="items?.id" @click="projectMenuValue(item,items)"  :key="items.id">
+
+                <el-alert title="数字化扫描文件的二次安全认证管理,指定认证证书,方可进行认证。注意: 只有被指派的证书所有者才可以进行认证操作" type="error" :closable="false" class="btn30" />
+                <el-menu :default-active="projectKey" class="hc-project-menu" unique-opened>
+                    <el-sub-menu index="1">
+                        <template #title>
+                            <HcIcon name="folder-2" class="hc-menu-icon" />
+                            <span>单位证书</span>
+                        </template>
+                        <!-- <el-menu-item v-for="items in item?.contractInfoList ?? []" :index="items?.id" @click="projectMenuValue(item,items)"  :key="items.id">
                                 <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === items?.id"/>
                                 <span>{{ items?.name }}</span>
                             </el-menu-item> -->
-                             <el-menu-item index="1-1">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === index"/>
-                                <span>建设单位证书</span>
-                            </el-menu-item>
-                             <el-menu-item index="1-2">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === index"/>
-                                <span>监理单位证书</span>
-                            </el-menu-item>
-                            <el-menu-item index="1-3">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === index"/>
-                                <span>施工单位证书</span>
-                            </el-menu-item>
-                        </el-sub-menu>
-                        <el-sub-menu index="2">
-                            <template #title>
-                                <HcIcon name="folder-2" class="hc-menu-icon"/>
-                                <span>安全环保部</span>
-                            </template>
-                             <el-menu-item index="2-1">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === index"/>
-                                <span>张三</span>
-                            </el-menu-item>
-                             <el-menu-item index="21-2">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === index"/>
-                                <span>李四</span>
-                            </el-menu-item>
-                            <el-menu-item index="2-3">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === index"/>
-                                <span>XX</span>
-                            </el-menu-item>
-                        </el-sub-menu>
-                    </el-menu>
-                    
-            </HcCard>
+                        <el-menu-item index="1-1">
+                            <HcIcon v-if="projectKey === index" name="star" class="hc-menu-icon" fill />
+                            <span>建设单位证书</span>
+                        </el-menu-item>
+                        <el-menu-item index="1-2">
+                            <HcIcon v-if="projectKey === index" name="star" class="hc-menu-icon" fill />
+                            <span>监理单位证书</span>
+                        </el-menu-item>
+                        <el-menu-item index="1-3">
+                            <HcIcon v-if="projectKey === index" name="star" class="hc-menu-icon" fill />
+                            <span>施工单位证书</span>
+                        </el-menu-item>
+                    </el-sub-menu>
+                    <el-sub-menu index="2">
+                        <template #title>
+                            <HcIcon name="folder-2" class="hc-menu-icon" />
+                            <span>安全环保部</span>
+                        </template>
+                        <el-menu-item index="2-1">
+                            <HcIcon v-if="projectKey === index" name="star" class="hc-menu-icon" fill />
+                            <span>张三</span>
+                        </el-menu-item>
+                        <el-menu-item index="21-2">
+                            <HcIcon v-if="projectKey === index" name="star" class="hc-menu-icon" fill />
+                            <span>李四</span>
+                        </el-menu-item>
+                        <el-menu-item index="2-3">
+                            <HcIcon v-if="projectKey === index" name="star" class="hc-menu-icon" fill />
+                            <span>XX</span>
+                        </el-menu-item>
+                    </el-sub-menu>
+                </el-menu>
+            </hc-new-card>
         </div>
-
     </div>
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
-import {useAppStore} from "~src/store";
+import { onMounted, ref, watch } from 'vue'
+import { useAppStore } from '~src/store'
 
 //变量
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectInfo = ref(useAppState.getProjectInfo);
-const isCollapse = ref(useAppState.getCollapse);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectInfo = ref(useAppState.getProjectInfo)
+const isCollapse = ref(useAppState.getCollapse)
 //左侧菜单
 const menuKey = ref('basic')
 const menuItem = ref({})
 const menuOptions = ref([
-    {key: 'basic', label: '建设单位'},
-    {key: 'password', label: '监理单位'},
-    {key: 'project', label: '施工单位'}
-]); 
+    { key: 'basic', label: '建设单位' },
+    { key: 'password', label: '监理单位' },
+    { key: 'project', label: '施工单位' },
+])
 
 
 //监听
 watch(() => [
-    useAppState.getCollapse
+    useAppState.getCollapse,
 ], ([Collapse]) => {
     isCollapse.value = Collapse
 })
@@ -130,25 +128,23 @@ const handleMenuValue = (item) => {
 
 
 //左右拖动,改变树形结构宽度
-const leftWidth = ref(382);
+const leftWidth = ref(382)
 const onmousedown = () => {
     const leftNum = isCollapse.value ? 142 : 272
     document.onmousemove = (ve) => {
-        let diffVal = ve.clientX - leftNum;
-        if(diffVal >= 310 && diffVal <= 900) {
-            leftWidth.value = diffVal;
+        let diffVal = ve.clientX - leftNum
+        if (diffVal >= 310 && diffVal <= 900) {
+            leftWidth.value = diffVal
         }
     }
     document.onmouseup = () => {
-        document.onmousemove = null;
-        document.onmouseup = null;
+        document.onmousemove = null
+        document.onmouseup = null
     }
 }
 </script>
 
 <style lang="scss" scoped>
-
-
 .btn30{
     margin-bottom: 30px;
 }
@@ -156,7 +152,4 @@ const onmousedown = () => {
  font-size: 1.125rem;
 line-height: 1.75rem;
 }
-
-
-
 </style>

+ 2 - 2
src/views/config/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard class="hc-config-index" action-size="lg" scrollbar>
+    <hc-new-card class="hc-config-index" action-size="lg" scrollbar>
         <div class="text-lg font-medium mb-4">主题模式</div>
         <div class="hc-theme-box mb-8">
             <el-radio-group v-model="UserTheme" @change="ThemeTabsUpdate">
@@ -61,7 +61,7 @@
                 <div>如果没有保存配置,下次登录后,将恢复到上次保存的配置</div>
             </el-popover>
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 3 - 3
src/views/config/parameter.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="hc-page-layout-box">
         <div class="hc-page-content-box">
-            <HcCard>
+            <hc-new-card>
                 <template #header>
                     <div class="hc-card-header-table-title">
                         参数设置
@@ -50,14 +50,14 @@
                             <el-checkbox label="4">
                                 备考表
                             </el-checkbox>
-                        
+
                             <el-checkbox label="5">
                                 生成页码
                             </el-checkbox>
                         </el-checkbox-group>
                     </div>
                 </div>
-            </HcCard>
+            </hc-new-card>
         </div>
     </div>
 </template>

+ 2 - 2
src/views/custody/backup.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box hc-custody-backup">
-        <HcCard ui="hc-backup-bg-white">
+        <hc-new-card ui="hc-backup-bg-white">
             <template #header>
                 <div class="hc-card-header-project-alias">
                     {{ projectInfo?.name }}
@@ -169,7 +169,7 @@
                     </el-scrollbar>
                 </div>
             </div>
-        </HcCard>
+        </hc-new-card>
     </div>
 </template>
 

+ 2 - 2
src/views/custody/components/tab-expire.vue

@@ -1,10 +1,10 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <HcTable ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange" />
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/custody/components/tab-reform.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <template #extra>
             <HcNewSwitch :datas="tabData" :keys="tabKey" @change="tabChange" />
         </template>
@@ -14,7 +14,7 @@
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange" />
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/custody/components/tab-spite.vue

@@ -1,10 +1,10 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <HcTable ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" />
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange" />
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 4 - 4
src/views/home/index1.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard class="table-box">
+        <hc-new-card class="table-box">
             <HcTable
                 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
                 is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
@@ -9,8 +9,8 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
-        <HcCard class="detail-box">
+        </hc-new-card>
+        <hc-new-card class="detail-box">
             <el-row class="m30">
                 <el-col :span="4" class="font-color">
                     <i class="ri-layout-grid-fill icon" /> <span style="vertical-align: center;">重庆乌江白马航电枢纽工程</span>
@@ -58,7 +58,7 @@
                     <span>2022/02/2</span>
                 </el-col>
             </el-row>
-        </HcCard>
+        </hc-new-card>
     </div>
 </template>
 

+ 2 - 2
src/views/tasks/components/TableCard.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <template #header>
             <div class="w-32">
                 <el-select v-model="searchForm.typeValue" block clearable placeholder="任务类型" size="large">
@@ -106,7 +106,7 @@
                 </div>
             </div>
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/tasks/flow.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <hc-new-card :scrollbar="false" action-size="lg">
             <template #header>
                 <HcTooltip keys="tasks_flow_add">
                     <el-button hc-btn type="primary" @click="addFlowData">
@@ -28,7 +28,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </hc-new-card>
         <!-- 新增/编辑流程 弹框 -->
         <el-dialog
             v-model="showEditModal" :title="`${flowFormData.id ? '编辑' : '新增'}流程`" class="hc-modal-border"

+ 2 - 2
src/views/tasks/message-data.vue

@@ -6,7 +6,7 @@
             </el-scrollbar>
         </div>
         <div class="hc-layout-content-box">
-            <HcCard action-size="lg">
+            <hc-new-card action-size="lg">
                 <template #header>
                     <div class="w-32 ml-2">
                         <el-select v-model="searchForm.smsType" clearable placeholder="消息类型" size="large">
@@ -48,7 +48,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
         <!-- 日志内容 -->
         <el-dialog v-model="operationContentModal" class="hc-modal-border" title="消息内容" width="38rem">

+ 2 - 2
src/views/tasks/sign-admin.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard :scrollbar="false" action-size="lg">
+        <hc-new-card :scrollbar="false" action-size="lg">
             <template #header>
                 <div class="w-32">
                     <el-select v-model="searchForm.tasks" block clearable placeholder="电签任务人" size="large">
@@ -52,7 +52,7 @@
             <template #action>
                 <HcPages :pages="searchForm" @change="pageChange" />
             </template>
-        </HcCard>
+        </hc-new-card>
     </div>
 </template>
 

+ 2 - 2
src/views/transfer/components/table-classify.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <template #header>
             <HcNewSwitch :datas="tabData" :keys="tabKey" :round="false" @change="tabChange" />
         </template>
@@ -19,7 +19,7 @@
         <template #action>
             <HcPages :pages="searchForm" @change="pageChange" />
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/transfer/components/table-collect.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard scrollbar>
+    <hc-new-card scrollbar>
         <template #header>
             <HcNewSwitch :datas="tabData" :keys="tabKey" :round="false" @change="tabChange" />
         </template>
@@ -31,7 +31,7 @@
             </template>
             <HcTable ref="tableFileRef" :column="tableFileColumn" :datas="tableFileData" :loading="tableFileLoading" heights="auto" is-check @selection-change="tableeFileSelection" />
         </HcCardItem>
-    </HcCard>
+    </hc-new-card>
 
     <!-- 批量上报审批 -->
     <HcReportModal

+ 26 - 26
src/views/transfer/entry-sampling.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :class="isCard?'':'is-action'" class="hc-layout-left-box" style="width: 400px;">
+        <div :class="isCard ? '' : 'is-action'" class="hc-layout-left-box" style="width: 400px;">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
-                    <HcIcon name="book-read"/>
+                    <HcIcon name="book-read" />
                 </div>
                 <div class="ml-2 project-name-box">
                     <span class="text-xl text-cut project-alias">调卷抽检范围配置</span>
@@ -27,32 +27,32 @@
                 </div>
             </div>
             <div class="hc-type-choose-action">
-                <el-button :disabled="checkList.length<=0" hc-btn @click="emptyTypeClick">
-                    <HcIcon name="close"/>
+                <el-button :disabled="checkList.length <= 0" hc-btn @click="emptyTypeClick">
+                    <HcIcon name="close" />
                     <span>清空重置</span>
                 </el-button>
-                <el-button :disabled="checkList.length<=0" hc-btn type="primary" @click="confirmAllocationClick">
-                    <HcIcon name="check"/>
+                <el-button :disabled="checkList.length <= 0" hc-btn type="primary" @click="confirmAllocationClick">
+                    <HcIcon name="check" />
                     <span>确认分配</span>
                 </el-button>
             </div>
         </div>
         <div class="hc-page-content-box">
-            <div class="arrow-right-icon-box" v-if="isCard">
-                <HcIcon class="icon" name="arrow-right-circle"/>
+            <div v-if="isCard" class="arrow-right-icon-box">
+                <HcIcon class="icon" name="arrow-right-circle" />
             </div>
 
             <div v-if="isNull" class="hc-type-choose-null">
                 <div class="null-flex-view">
-                    <HcIcon class="icon" fill name="spam-2"/>
+                    <HcIcon class="icon" fill name="spam-2" />
                     <div class="mt-4">请在左侧勾选您验收侧重范围</div>
                 </div>
             </div>
 
-            <HcCard v-if="isCard" scrollbar>
+            <hc-new-card v-if="isCard" scrollbar>
                 <template #header>
                     <div class="title text-lg hc-card-header-title">
-                        <HcIcon name="book-2"/>
+                        <HcIcon name="book-2" />
                         <span class="ml-2">抽检目录范围</span>
                     </div>
                 </template>
@@ -60,45 +60,45 @@
                     <span class="text-orange text-sm">为您分配抽检范围,若有异动,可手动勾选想要验收的部分</span>
                 </template>
 
-                <HcTree/>
+                <HcTree />
 
                 <template #action>
                     <div class="hc-card-action-diy">
                         <el-button hc-btn @click="clearResetClick">
-                            <HcIcon name="refresh"/>
+                            <HcIcon name="refresh" />
                             <span>清空重置</span>
                         </el-button>
                         <el-button hc-btn type="primary" @click="ToInspection">
-                            <HcIcon name="check"/>
+                            <HcIcon name="check" />
                             <span>确认并进入抽检</span>
                         </el-button>
                     </div>
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
 
-        <HcLoading v-if="isLoading" num="76"></HcLoading>
+        <HcLoading v-if="isLoading" num="76" />
     </div>
 </template>
 
 <script setup>
-import {ref} from "vue";
-import {useAppStore} from "~src/store";
-import {useRouter} from "vue-router";
-import HcTree from "./components/entry-sampling/hc-tree.vue";
+import { ref } from 'vue'
+import { useAppStore } from '~src/store'
+import { useRouter } from 'vue-router'
+import HcTree from './components/entry-sampling/hc-tree.vue'
 
 //变量
 const router = useRouter()
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectInfo = ref(useAppState.getProjectInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectInfo = ref(useAppState.getProjectInfo)
 
 //角色组
 const checkList = ref([])
 const checkData = ref([
-    {name: '业主', key: '1'}, {name: '监理', key: '2'}, {name: '施工', key: '3'},
-    {name: '影像', key: '4'}, {name: '竣工图', key: '5'},
+    { name: '业主', key: '1' }, { name: '监理', key: '2' }, { name: '施工', key: '3' },
+    { name: '影像', key: '4' }, { name: '竣工图', key: '5' },
 ])
 
 //清空重置
@@ -124,7 +124,7 @@ const confirmAllocationClick = () => {
 //确认并进入抽检
 const ToInspection = () => {
     router.push({
-        name: 'transfer-preliminary-examination'
+        name: 'transfer-preliminary-examination',
     })
 }
 

+ 50 - 54
src/views/transfer/hand-over.vue

@@ -1,46 +1,46 @@
 <template>
     <div class="hc-page-box">
-        <HcCard>
+        <hc-new-card>
             <div class="hc-steps-view">
                 <el-steps :active="stepsKey" align-center>
-                    <el-step title="验收通过" @click="stepClick(0)"/>
-                    <el-step title="四性检测通过" @click="stepClick(1)"/>
-                    <el-step title="申请移交登记" @click="stepClick(2)"/>
-                    <el-step title="档案馆接收" @click="stepClick(3)"/>
+                    <el-step title="验收通过" @click="stepClick(0)" />
+                    <el-step title="四性检测通过" @click="stepClick(1)" />
+                    <el-step title="申请移交登记" @click="stepClick(2)" />
+                    <el-step title="档案馆接收" @click="stepClick(3)" />
                 </el-steps>
             </div>
 
-            <div class="hc-body-center-box" v-if="stepsKey === 0">
+            <div v-if="stepsKey === 0" class="hc-body-center-box">
                 <div class="hc-content-box">
                     <div class="text-gray mb-5">当前项目档案未通过验收,未达到移交条件</div>
                     <el-button type="primary" hc-btn @click="toTransferInitial">去申请验收</el-button>
                 </div>
             </div>
 
-            <div class="hc-body-center-box" v-if="stepsKey === 1">
+            <div v-if="stepsKey === 1" class="hc-body-center-box">
                 <div class="hc-content-box">
                     <div class="text-gray mb-5">当前项目档案未通过四性检测,未达到移交条件</div>
                     <el-button type="primary" hc-btn>重新检测</el-button>
                 </div>
             </div>
 
-            <div class="hc-body-center-box is-action" v-if="stepsKey === 2 && stepsKeys === 1 ">
+            <div v-if="stepsKey === 2 && stepsKeys === 1 " class="hc-body-center-box is-action">
                 <div class="hc-content-box form-apply">
                     <el-form ref="formApplyRef" :model="formApplyModel" :rules="formApplyRules" label-width="auto" size="large">
                         <el-form-item label="项目名称">
-                            <el-input v-model="formApplyModel.name" placeholder="请输入项目名称"/>
+                            <el-input v-model="formApplyModel.name" placeholder="请输入项目名称" />
                         </el-form-item>
                         <el-form-item label="档案形成时间">
-                            <el-date-picker v-model="formApplyModel.date" class="block" type="datetime" format="YYYY-MM-DD hh:mm:ss" value-format="YYYY-MM-DD hh:mm:ss"/>
+                            <el-date-picker v-model="formApplyModel.date" class="block" type="datetime" format="YYYY-MM-DD hh:mm:ss" value-format="YYYY-MM-DD hh:mm:ss" />
                         </el-form-item>
                         <el-form-item label="电子档案目录">
-                            <el-input v-model="formApplyModel.num" placeholder="请填写份数"/>
+                            <el-input v-model="formApplyModel.num" placeholder="请填写份数" />
                         </el-form-item>
                         <el-form-item label="档案移交时间">
-                            <el-date-picker v-model="formApplyModel.date1" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+                            <el-date-picker v-model="formApplyModel.date1" class="block" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
                         </el-form-item>
                         <el-form-item label="档案卷数">
-                            <el-input v-model="formApplyModel.num1" placeholder="请填写档案卷数"/>
+                            <el-input v-model="formApplyModel.num1" placeholder="请填写档案卷数" />
                         </el-form-item>
                     </el-form>
                 </div>
@@ -50,13 +50,13 @@
                 </div>
             </div>
 
-            <div class="hc-body-box is-action is-header" v-if="stepsKey === 2 && stepsKeys === 2">
+            <div v-if="stepsKey === 2 && stepsKeys === 2" class="hc-body-box is-action is-header">
                 <div class="hc-header-box">
                     <div class="header">
-                        <el-checkbox v-model="checked2" label="全部移交" class="size-xl"/>
+                        <el-checkbox v-model="checked2" label="全部移交" class="size-xl" />
                     </div>
                     <div class="extra">
-                        <HcNewSwitch :datas="tabData" :keys="tabKey" @change="tabChange" :round="false"/>
+                        <HcNewSwitch :datas="tabData" :keys="tabKey" :round="false" @change="tabChange" />
                     </div>
                 </div>
                 <div class="hc-content-box hc-table-content-box">
@@ -64,26 +64,26 @@
                         <div class="hc-table-header text-lg font-bold">建设单位归档资料(1200卷)</div>
                         <div class="hc-table-title text-lg font-bold">一、立项审批(238卷)</div>
                         <div class="hc-table-ref-box">
-                            <el-table ref="tableRef" hc :data="tableData" stripe row-key="id" :border="false" @selection-change="tableSelectionChange" style="width: 100%;">
-                                <el-table-column type="selection" width="50"/>
-                                <el-table-column type="index" prop="num" label="序号" width="80"/>
-                                <el-table-column prop="key1" label="档号" width="180"/>
-                                <el-table-column prop="key2" label="案卷题名"/>
-                                <el-table-column prop="key3" label="总页数" width="120"/>
-                                <el-table-column prop="key4" label="保管期限" width="120"/>
-                                <el-table-column prop="key5" label="备注"/>
+                            <el-table ref="tableRef" hc :data="tableData" stripe row-key="id" :border="false" style="width: 100%;" @selection-change="tableSelectionChange">
+                                <el-table-column type="selection" width="50" />
+                                <el-table-column type="index" prop="num" label="序号" width="80" />
+                                <el-table-column prop="key1" label="档号" width="180" />
+                                <el-table-column prop="key2" label="案卷题名" />
+                                <el-table-column prop="key3" label="总页数" width="120" />
+                                <el-table-column prop="key4" label="保管期限" width="120" />
+                                <el-table-column prop="key5" label="备注" />
                             </el-table>
                         </div>
                         <div class="hc-table-title text-lg font-bold">二、勘察设计文件(95卷)</div>
                         <div class="hc-table-ref-box">
-                            <el-table ref="tableRef" hc :data="tableData" stripe row-key="id" :border="false" @selection-change="tableSelectionChange" style="width: 100%;">
-                                <el-table-column type="selection" width="50"/>
-                                <el-table-column type="index" prop="num" label="序号" width="80"/>
-                                <el-table-column prop="key1" label="档号" width="180"/>
-                                <el-table-column prop="key2" label="案卷题名"/>
-                                <el-table-column prop="key3" label="总页数" width="120"/>
-                                <el-table-column prop="key4" label="保管期限" width="120"/>
-                                <el-table-column prop="key5" label="备注"/>
+                            <el-table ref="tableRef" hc :data="tableData" stripe row-key="id" :border="false" style="width: 100%;" @selection-change="tableSelectionChange">
+                                <el-table-column type="selection" width="50" />
+                                <el-table-column type="index" prop="num" label="序号" width="80" />
+                                <el-table-column prop="key1" label="档号" width="180" />
+                                <el-table-column prop="key2" label="案卷题名" />
+                                <el-table-column prop="key3" label="总页数" width="120" />
+                                <el-table-column prop="key4" label="保管期限" width="120" />
+                                <el-table-column prop="key5" label="备注" />
                             </el-table>
                         </div>
                     </el-scrollbar>
@@ -94,11 +94,11 @@
                 </div>
             </div>
 
-            <div class="hc-body-box is-action" v-if="stepsKey === 2 && stepsKeys === 3">
+            <div v-if="stepsKey === 2 && stepsKeys === 3" class="hc-body-box is-action">
                 <div class="hc-content-box">
                     <div class="is-xml-data flex">
                         <div class="flex-1 mr-6">
-                            <el-progress :text-inside="true" :stroke-width="20" :percentage="50" status="exception"/>
+                            <el-progress :text-inside="true" :stroke-width="20" :percentage="50" status="exception" />
                         </div>
                         <el-button type="primary" round>封装XML信息包</el-button>
                     </div>
@@ -110,26 +110,25 @@
                 </div>
             </div>
 
-            <div class="hc-body-center-box" v-if="stepsKey === 3">
+            <div v-if="stepsKey === 3" class="hc-body-center-box">
                 <div class="hc-content-box">
                     <div class="text-3xl">档案馆接收状态:  未接收</div>
                 </div>
             </div>
-
-        </HcCard>
+        </hc-new-card>
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useRouter} from "vue-router";
-import {useAppStore} from "~src/store";
+import { onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useAppStore } from '~src/store'
 
 //变量
 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(() => {
@@ -152,7 +151,7 @@ const stepsKeysClick = (val) => {
 //去申请验收
 const toTransferInitial = () => {
     router.push({
-        name: 'transfer-initial'
+        name: 'transfer-initial',
     })
 }
 
@@ -165,13 +164,13 @@ const checked2 = ref(false)
 //tab数据和相关处理
 const tabKey = ref('tab1')
 const tabData = ref([
-    {key:'tab1', name: '建设单位归档资料'},
-    {key:'tab2', name: '监理单位归档资料'},
-    {key:'tab3', name: '施工单位归档资料'},
-    {key:'tab4', name: '科研、新技术资料'},
-]);
+    { key:'tab1', name: '建设单位归档资料' },
+    { key:'tab2', name: '监理单位归档资料' },
+    { key:'tab3', name: '施工单位归档资料' },
+    { key:'tab4', name: '科研、新技术资料' },
+])
 const tabChange = (item) => {
-    tabKey.value = item?.key;
+    tabKey.value = item?.key
 }
 
 const tableData = ref([
@@ -198,19 +197,16 @@ const tableData = ref([
         key3: '293',
         key4: '永久',
         key5: '备注信息',
-    }
+    },
 ])
 
 //多选
 const tableSelectionChange = (rows) => {
     let tableRows = rows.filter((item) => {
-        return (item??'') !== '';
+        return (item ?? '') !== ''
     })
     console.log(tableRows)
 }
-
-
-
 </script>
 
 <style lang="scss" scoped>

+ 2 - 2
src/views/transfer/initial-expert.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="submit-report-layout-target" class="hc-page-box">
-        <HcCard scrollbar>
+        <hc-new-card scrollbar>
             <template #header>
                 <HcNewSwitch
                     :datas="tabData" :keys="tabKey" :round="false" style="margin-right: 24px"
@@ -54,7 +54,7 @@
                     heights="auto" is-new :index-style="{ width: 60 }"
                 />
             </HcCardItem>
-        </HcCard>
+        </hc-new-card>
 
         <!-- 历史报告 -->
         <HcDrawer

+ 2 - 2
src/views/transfer/inspects.vue

@@ -21,7 +21,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div v-show="!isCarrySpotChecksDrawer" class="hc-page-content-box">
-            <HcCard title="已形成的案卷">
+            <hc-new-card title="已形成的案卷">
                 <HcTable ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-new :index-style="{ width: 60 }" @row-click="tableRowClick">
                     <template #name="{ row }">
                         <div class="text-link" :class="row.isReviewed === 1 ? 'text-green' : 'text-blue'">
@@ -32,7 +32,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
 
         <!-- 展开抽查 -->

+ 2 - 2
src/views/transfer/leader-sampling.vue

@@ -19,7 +19,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div v-show="!isCarrySpotChecksDrawer" class="hc-page-content-box">
-            <HcCard>
+            <hc-new-card>
                 <template #header>
                     <span>您抽检验收的分组类别为:业主组,本次验收共</span>
                     <span class="text-orange mx-2">1232</span>
@@ -67,7 +67,7 @@
                         </template>
                     </HcTable>
                 </div>
-            </HcCard>
+            </hc-new-card>
         </div>
 
         <!-- 展开抽查 -->

+ 2 - 2
src/views/transfer/preliminary-examination.vue

@@ -22,7 +22,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div v-show="!isCarrySpotChecksDrawer" class="hc-page-content-box">
-            <HcCard>
+            <hc-new-card>
                 <template #header>
                     <HcIcon name="volume-up" />
                     <span class="ml-2">您本次验收抽检案卷共</span>
@@ -72,7 +72,7 @@
                 <template #action>
                     <HcPages :pages="searchForm" @change="pageChange" />
                 </template>
-            </HcCard>
+            </hc-new-card>
         </div>
 
         <!-- 展开抽查 -->

+ 58 - 50
src/views/transfer/submit-report.vue

@@ -1,19 +1,19 @@
 <template>
     <div id="submit-report-layout-target" class="hc-page-box">
-        <HcCard>
+        <hc-new-card>
             <template #header>
                 <el-button hc-btn @click="toBackClick">
-                    <HcIcon name="arrow-go-back"/>
+                    <HcIcon name="arrow-go-back" />
                     <span>返回</span>
                 </el-button>
             </template>
             <template #extra>
                 <el-button hc-btn @click="onSubmitReportClick">
-                    <HcIcon name="history"/>
+                    <HcIcon name="history" />
                     <span>验收报告</span>
                 </el-button>
                 <el-button hc-btn type="primary" @click="onReportModalShow">
-                    <HcIcon name="check"/>
+                    <HcIcon name="check" />
                     <span>确认提交结论</span>
                 </el-button>
             </template>
@@ -21,13 +21,12 @@
             <el-container class="hc-table-layout">
                 <el-aside id="hc_table_aside" class="hc-table-aside">
                     <HcCardItem title="抽检统计:">
-                        <TableStats :contractId="contractId" :projectId="projectId"/>
+                        <TableStats :contract-id="contractId" :project-id="projectId" />
                     </HcCardItem>
                 </el-aside>
                 <el-container id="hc_table_container" class="hc-table-container">
-
                     <HcCardItem id="hc_table_data" title="抽检意见汇总:">
-                        <TableOpinion :contractId="contractId" :projectId="projectId"/>
+                        <TableOpinion :contract-id="contractId" :project-id="projectId" />
                     </HcCardItem>
 
                     <HcCardItem id="hc_table_score" title="专家验收评分表:">
@@ -38,25 +37,28 @@
                         <template #extra>
                             <div class="w-40">
                                 <el-select v-model="searchFormScore.type" placeholder="参建方类型表">
-                                    <el-option label="业主建设单位" value="1"/>
-                                    <el-option label="监理单位" value="2"/>
-                                    <el-option label="施工单位" value="3"/>
+                                    <el-option label="业主建设单位" value="1" />
+                                    <el-option label="监理单位" value="2" />
+                                    <el-option label="施工单位" value="3" />
                                 </el-select>
                             </div>
                         </template>
-                        <TableScore :contractId="contractId" :projectId="projectId" :type="searchFormScore.type"/>
+                        <TableScore :contract-id="contractId" :project-id="projectId" :type="searchFormScore.type" />
                     </HcCardItem>
-
                 </el-container>
             </el-container>
-        </HcCard>
-
-        <!--确认提交结论-->
-        <HcDialog :cancelClose="false" :show="isReportModal" append-to-body cancelText="保存暂不提交"
-                  saveText="保存并提交报告" title="提交验收报告" widths="30rem"
-                  @cancel="onReportModalCancel" @close="onReportModalClose" @save="onReportModalSave">
-            <el-form ref="formReportRef" :model="formReportModel" :rules="formReportRules" label-position="top"
-                     label-width="auto" size="large">
+        </hc-new-card>
+
+        <!-- 确认提交结论 -->
+        <HcDialog
+            :cancel-close="false" :show="isReportModal" append-to-body cancel-text="保存暂不提交"
+            save-text="保存并提交报告" title="提交验收报告" widths="30rem"
+            @cancel="onReportModalCancel" @close="onReportModalClose" @save="onReportModalSave"
+        >
+            <el-form
+                ref="formReportRef" :model="formReportModel" :rules="formReportRules" label-position="top"
+                label-width="auto" size="large"
+            >
                 <el-form-item label="是否通过验收" prop="radio">
                     <div class="form-item-div bg-white">
                         <el-radio-group v-model="formReportModel.radio" size="large">
@@ -66,56 +68,62 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="项目概况">
-                    <el-input v-model="formReportModel.content" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入项目概况"
-                              type="textarea"/>
+                    <el-input
+                        v-model="formReportModel.content" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入项目概况"
+                        type="textarea"
+                    />
                 </el-form-item>
                 <el-form-item label="验收结论">
-                    <el-input v-model="formReportModel.conclusion" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入验收结论"
-                              type="textarea"/>
+                    <el-input
+                        v-model="formReportModel.conclusion" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入验收结论"
+                        type="textarea"
+                    />
                 </el-form-item>
             </el-form>
         </HcDialog>
 
-        <!--历史报告-->
-        <HcDrawer :show="isSubmitReportDrawer" to-id="submit-report-layout-target" uis="hc-submit-report-target"
-                  @close="onSubmitReportDrawerClose">
+        <!-- 历史报告 -->
+        <HcDrawer
+            :show="isSubmitReportDrawer" to-id="submit-report-layout-target" uis="hc-submit-report-target"
+            @close="onSubmitReportDrawerClose"
+        >
             <template #header>
                 <div class="hc-select-view w-52">
                     <el-select v-model="pdfDate" placeholder="选择日期">
-                        <el-option label="2022年12月24日" value="2022年12月24日"/>
-                        <el-option label="2022年12月25日" value="2022年12月25日"/>
-                        <el-option label="2022年12月26日" value="2022年12月26日"/>
-                        <el-option label="2022年12月27日" value="2022年12月27日"/>
+                        <el-option label="2022年12月24日" value="2022年12月24日" />
+                        <el-option label="2022年12月25日" value="2022年12月25日" />
+                        <el-option label="2022年12月26日" value="2022年12月26日" />
+                        <el-option label="2022年12月27日" value="2022年12月27日" />
                     </el-select>
                 </div>
                 <div class="hc-title-view">试验资料(含工地试验室资质证书、仪器标定证书等)</div>
                 <div class="hc-icon-view text-hover" @click="onSubmitReportDrawerClose">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                 </div>
             </template>
             <HcPdf
-                src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"/>
+                src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"
+            />
         </HcDrawer>
 
-        <!--短信认证-->
-        <HcSmsAuth :loading="SMSAuthLoading" :show="SMSAuthShow" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm"/>
-
+        <!-- 短信认证 -->
+        <HcSmsAuth :loading="SMSAuthLoading" :show="SMSAuthShow" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm" />
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import {useRouter} from "vue-router";
-import TableStats from "./components/submit-report/table-stats.vue"
-import TableOpinion from "./components/submit-report/table-opinion.vue"
-import TableScore from "./components/submit-report/table-score.vue"
+import { onMounted, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import { useRouter } from 'vue-router'
+import TableStats from './components/submit-report/table-stats.vue'
+import TableOpinion from './components/submit-report/table-opinion.vue'
+import TableScore from './components/submit-report/table-score.vue'
 
 //变量
 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(() => {
@@ -130,17 +138,17 @@ const setSplitRef = () => {
             sizes: [20, 80],
             snapOffset: 0,
             minSize: [300, 600],
-        });
+        })
         window.$split(['#hc_table_data', '#hc_table_score'], {
             direction: 'vertical',
             snapOffset: 0,
             minSize: 200,
-        });
+        })
     }, 800)
 }
 
 const searchFormScore = ref({
-    type: '', score: true
+    type: '', score: true,
 })
 
 
@@ -148,14 +156,14 @@ const searchFormScore = ref({
 const isReportModal = ref(false)
 const formReportRef = ref(null)
 const formReportModel = ref({
-    radio: 1, content: '', conclusion: ''
+    radio: 1, content: '', conclusion: '',
 })
 const formReportRules = {}
 
 //显示提交验收报告弹窗
 const onReportModalShow = () => {
     formReportModel.value = {
-        radio: 1, content: '', conclusion: ''
+        radio: 1, content: '', conclusion: '',
     }
     isReportModal.value = true
 }
@@ -203,7 +211,7 @@ const onSubmitReportDrawerClose = () => {
 //返回
 const toBackClick = () => {
     router.push({
-        name: 'transfer-initial-expert'
+        name: 'transfer-initial-expert',
     })
 }
 </script>

+ 31 - 30
src/views/transfer/write-report.vue

@@ -1,67 +1,69 @@
 <template>
-    <div class="hc-page-box write-report" id="submit-report-layout-target">
-        <HcCard>
+    <div id="submit-report-layout-target" class="hc-page-box write-report">
+        <hc-new-card>
             <template #header>
                 <div class="hc-conclusion-header-box">
                     <div class="hc-conclusion-icon-box">
-                        <HcIcon name="file-ppt-2" fill/>
+                        <HcIcon name="file-ppt-2" fill />
                     </div>
                     <div class="ml-2 conclusion-name-box">
                         <span class="text-xl text-cut conclusion-alias">编写结论、提交报告</span>
-                        <div class="text-xs text-cut conclusion-name">{{projectInfo['name']}}</div>
+                        <div class="text-xs text-cut conclusion-name">{{ projectInfo.name }}</div>
                     </div>
                 </div>
             </template>
             <template #extra>
-                <el-button hc-btn type="primary" @click="onSubmitReportClick" v-if="state === 2">查看验收意见</el-button>
-                <el-button hc-btn type="primary" v-if="state === 2">撤回提交</el-button>
-                <el-button hc-btn type="primary" @click="submissionClick" v-if="state === 1">确认提交</el-button>
+                <el-button v-if="state === 2" hc-btn type="primary" @click="onSubmitReportClick">查看验收意见</el-button>
+                <el-button v-if="state === 2" hc-btn type="primary">撤回提交</el-button>
+                <el-button v-if="state === 1" hc-btn type="primary" @click="submissionClick">确认提交</el-button>
                 <el-button hc-btn type="primary">暂存草稿</el-button>
                 <el-button hc-btn @click="previousStep">上一步</el-button>
                 <el-button hc-btn @click="toBackClick">返回主页</el-button>
             </template>
 
-            <HcOnlineOffice :src="docxUrl" title="测试的文档.docx"/>
-        </HcCard>
+            <HcOnlineOffice :src="docxUrl" title="测试的文档.docx" />
+        </hc-new-card>
 
-        <!--短信认证-->
-        <HcSmsAuth :loading="SMSAuthLoading" :show="SMSAuthShow" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm"/>
+        <!-- 短信认证 -->
+        <HcSmsAuth :loading="SMSAuthLoading" :show="SMSAuthShow" @cancel="SMSAuthCancel" @confirm="SMSAuthConfirm" />
 
-        <!--历史报告-->
-        <HcDrawer :show="isSubmitReportDrawer" to-id="submit-report-layout-target" uis="hc-submit-report-target"
-                  @close="onSubmitReportDrawerClose">
+        <!-- 历史报告 -->
+        <HcDrawer
+            :show="isSubmitReportDrawer" to-id="submit-report-layout-target" uis="hc-submit-report-target"
+            @close="onSubmitReportDrawerClose"
+        >
             <template #header>
                 <div class="hc-select-view w-52">
                     <el-select v-model="pdfDate" placeholder="选择日期">
-                        <el-option label="2022年12月24日" value="2022年12月24日"/>
-                        <el-option label="2022年12月25日" value="2022年12月25日"/>
-                        <el-option label="2022年12月26日" value="2022年12月26日"/>
-                        <el-option label="2022年12月27日" value="2022年12月27日"/>
+                        <el-option label="2022年12月24日" value="2022年12月24日" />
+                        <el-option label="2022年12月25日" value="2022年12月25日" />
+                        <el-option label="2022年12月26日" value="2022年12月26日" />
+                        <el-option label="2022年12月27日" value="2022年12月27日" />
                     </el-select>
                 </div>
                 <div class="hc-title-view">试验资料(含工地试验室资质证书、仪器标定证书等)</div>
                 <div class="hc-icon-view text-hover" @click="onSubmitReportDrawerClose">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                 </div>
             </template>
             <HcPdf
-                src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"/>
+                src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"
+            />
         </HcDrawer>
-
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import {useRouter} from "vue-router";
+import { onMounted, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import { useRouter } from 'vue-router'
 
 //变量
 const router = useRouter()
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectInfo = ref(useAppState.getProjectInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectInfo = ref(useAppState.getProjectInfo)
 
 //渲染完成
 onMounted(() => {
@@ -70,7 +72,7 @@ onMounted(() => {
     }, 1000)
 })
 
-const state = ref(1);
+const state = ref(1)
 const docxUrl = ref('')
 //const docxUrl = ref('https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20230317/e2bdc6581e397b810b46ac7cd71b111b.docx')
 
@@ -98,7 +100,7 @@ const previousStep = () => {
 //返回主页
 const toBackClick = () => {
     router.push({
-        name: 'transfer-initial-expert'
+        name: 'transfer-initial-expert',
     })
 }
 
@@ -113,7 +115,6 @@ const pdfDate = ref(null)
 const onSubmitReportDrawerClose = () => {
     isSubmitReportDrawer.value = false
 }
-
 </script>
 
 <style lang="scss" scoped>

+ 34 - 34
src/views/transfer/writing-conclusion.vue

@@ -1,21 +1,21 @@
 <template>
     <div id="submit-report-layout-target" class="hc-page-box conclusion">
-        <HcCard>
+        <hc-new-card>
             <template #header>
                 <div class="hc-conclusion-header-box">
                     <div class="hc-conclusion-icon-box">
-                        <HcIcon name="file-ppt-2" fill/>
+                        <HcIcon name="file-ppt-2" fill />
                     </div>
                     <div class="ml-2 conclusion-name-box">
                         <span class="text-xl text-cut conclusion-alias">编写结论、提交报告</span>
-                        <div class="text-xs text-cut conclusion-name">{{projectInfo['name']}}</div>
+                        <div class="text-xs text-cut conclusion-name">{{ projectInfo.name }}</div>
                     </div>
                 </div>
             </template>
             <template #extra>
                 <el-button hc-btn type="primary" @click="writeReportClick">下一步、编写报告</el-button>
                 <el-button hc-btn @click="toBackClick">
-                    <HcIcon name="arrow-go-back"/>
+                    <HcIcon name="arrow-go-back" />
                     <span>返回主页</span>
                 </el-button>
             </template>
@@ -26,7 +26,7 @@
                         <template #extra>
                             <span class="text-red">预警提示:抽检率未达到验收要求,目前至抽检了4.5%</span>
                         </template>
-                        <TableStats :contractId="contractId" :projectId="projectId"/>
+                        <TableStats :contract-id="contractId" :project-id="projectId" />
                     </HcCardItem>
                     <HcCardItem id="hc_table_score" title="专家验收评分表:">
                         <template #header>
@@ -36,62 +36,62 @@
                         <template #extra>
                             <div class="w-40">
                                 <el-select v-model="searchFormScore.type" placeholder="参建方类型表">
-                                    <el-option label="业主建设单位" value="1"/>
-                                    <el-option label="监理单位" value="2"/>
-                                    <el-option label="施工单位" value="3"/>
+                                    <el-option label="业主建设单位" value="1" />
+                                    <el-option label="监理单位" value="2" />
+                                    <el-option label="施工单位" value="3" />
                                 </el-select>
                             </div>
                         </template>
-                        <TableScore :contractId="contractId" :projectId="projectId" :type="searchFormScore.type"/>
+                        <TableScore :contract-id="contractId" :project-id="projectId" :type="searchFormScore.type" />
                     </HcCardItem>
                 </el-container>
                 <el-aside id="hc_table_aside" class="hc-table-aside">
                     <HcCardItem title="抽检意见记录汇总:">
-                        <TableOpinion :contractId="contractId" :projectId="projectId" @opinionTap="tableOpinionTap"/>
+                        <TableOpinion :contract-id="contractId" :project-id="projectId" @opinionTap="tableOpinionTap" />
                     </HcCardItem>
                 </el-aside>
             </el-container>
-        </HcCard>
+        </hc-new-card>
 
-        <!--抽检记录详情-->
-        <HcDialog :show="isOpinionModal" title="抽检记录详情" widths="60%" @close="onOpinionModalClose" isTable :footer="false">
+        <!-- 抽检记录详情 -->
+        <HcDialog :show="isOpinionModal" title="抽检记录详情" widths="60%" is-table :footer="false" @close="onOpinionModalClose">
             <div class="hc-table-opinion-text">
                 <div class="title">案卷题名:安康至来凤国家高速公路奉节至巫山....</div>
                 <div class="opinion-text">
                     <div class="text-1">抽检意见:</div>
-                    <div class="text-2" v-if="!opinionTextEdit">{{opinionText}}</div>
-                    <div class="text-2 input" v-if="opinionTextEdit">
-                        <el-input style="flex: 1;" :rows="3" v-model="opinionText" placeholder="请输入抽检意见" type="textarea" resize="none"/>
+                    <div v-if="!opinionTextEdit" class="text-2">{{ opinionText }}</div>
+                    <div v-if="opinionTextEdit" class="text-2 input">
+                        <el-input v-model="opinionText" style="flex: 1;" :rows="3" placeholder="请输入抽检意见" type="textarea" resize="none" />
                         <el-button class="ml-4" hc-btn type="primary" @click="opinionTextEditHihe">保存</el-button>
                     </div>
-                    <div class="text-blue text-hover icon-1" v-if="!opinionTextEdit" @click="opinionTextEditShow">
-                        <HcIcon name="edit-2"/>
+                    <div v-if="!opinionTextEdit" class="text-blue text-hover icon-1" @click="opinionTextEditShow">
+                        <HcIcon name="edit-2" />
                     </div>
                 </div>
             </div>
             <div class="hc-table-opinion-pdf">
                 <HcPdf
-                    src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"/>
+                    src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"
+                />
             </div>
         </HcDialog>
-
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import {useRouter} from "vue-router";
-import TableStats from "./components/conclusion/table-stats.vue"
-import TableOpinion from "./components/conclusion/table-opinion.vue"
-import TableScore from "./components/conclusion/table-score.vue"
+import { onMounted, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import { useRouter } from 'vue-router'
+import TableStats from './components/conclusion/table-stats.vue'
+import TableOpinion from './components/conclusion/table-opinion.vue'
+import TableScore from './components/conclusion/table-score.vue'
 
 //变量
 const router = useRouter()
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectInfo = ref(useAppState.getProjectInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectInfo = ref(useAppState.getProjectInfo)
 
 //渲染完成
 onMounted(() => {
@@ -106,17 +106,17 @@ const setSplitRef = () => {
             sizes: [80, 20],
             snapOffset: 0,
             minSize: [400, 600],
-        });
+        })
         window.$split(['#hc_table_data', '#hc_table_score'], {
             direction: 'vertical',
             snapOffset: 0,
             minSize: 200,
-        });
+        })
     }, 800)
 }
 
 const searchFormScore = ref({
-    type: '', score: true
+    type: '', score: true,
 })
 
 
@@ -144,14 +144,14 @@ const opinionTextEditHihe = () => {
 //编写报告
 const writeReportClick = () => {
     router.push({
-        name: 'transfer-write-report'
+        name: 'transfer-write-report',
     })
 }
 
 //返回
 const toBackClick = () => {
     router.push({
-        name: 'transfer-initial-expert'
+        name: 'transfer-initial-expert',
     })
 }
 </script>

+ 69 - 69
src/views/user/index.vue

@@ -2,65 +2,65 @@
     <div class="hc-layout-box hc-user-index">
         <div class="hc-layout-left-box">
             <div class="user-avatar-box">
-                <div class="user-avatar" v-loading="avatarLoading">
-                    <img :src="userInfo['avatar'] || avatarPng" alt=""/>
+                <div v-loading="avatarLoading" class="user-avatar">
+                    <img :src="userInfo.avatar || avatarPng" alt="">
                     <div class="user-avatar-upload">
                         <el-upload class="upload-dom" :action="action" :accept="accept" :headers="getTokenHeader()" :data="upData" :show-file-list="false" :on-success="uploadFinish" :on-error="uploadError" :before-upload="beforeUpload">
-                            <HcIcon name="camera" fill/>
+                            <HcIcon name="camera" fill />
                         </el-upload>
                     </div>
                 </div>
-                <div class="user-name truncate">{{ userInfo['real_name'] || '游客' }}</div>
+                <div class="user-name truncate">{{ userInfo.real_name || '游客' }}</div>
             </div>
             <div class="user-menu-box">
                 <el-scrollbar>
-                    <HcMenuSimple :datas="menuOptions" :keys="menuKey" @change="handleMenuValue"/>
+                    <HcMenuSimple :datas="menuOptions" :keys="menuKey" @change="handleMenuValue" />
                 </el-scrollbar>
             </div>
         </div>
         <div class="hc-layout-content-box">
-            <HcCard scrollbar :title="menuItem.label" :ui="basicHight?'basic-hight':''" v-if="menuKey !== 'log' && menuKey !== 'recycle'">
+            <hc-new-card v-if="menuKey !== 'log' && menuKey !== 'recycle'" scrollbar :title="menuItem.label" :ui="basicHight ? 'basic-hight' : ''">
                 <template #extra>
-                    <span class="text-link" v-if="menuKey === 'basic' && !basicFormEdit" @click="basicFormEditClick">编辑</span>
-                    <span class="text-link" v-if="menuKey === 'project'" @click="setDefaultProjectClick">设置默认项目</span>
+                    <span v-if="menuKey === 'basic' && !basicFormEdit" class="text-link" @click="basicFormEditClick">编辑</span>
+                    <span v-if="menuKey === 'project'" class="text-link" @click="setDefaultProjectClick">设置默认项目</span>
                 </template>
                 <template v-if="menuKey === 'basic'">
                     <el-form ref="formUserRef" :model="formUserModel" :rules="formUserRules" size="large" label-position="top">
                         <el-row :gutter="20">
                             <el-col :span="12">
                                 <el-form-item label="用户名称">
-                                    <el-input v-model="formUserModel.real_name" disabled/>
+                                    <el-input v-model="formUserModel.real_name" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="登录账号">
-                                    <el-input v-model="formUserModel.account" placeholder="" disabled/>
+                                    <el-input v-model="formUserModel.account" placeholder="" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="身份证号">
-                                    <el-input v-model="formUserModel.idNumber" placeholder="" disabled/>
+                                    <el-input v-model="formUserModel.idNumber" placeholder="" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="绑定手机" :prop="basicFormEdit?'phone':''">
-                                    <el-input v-model="formUserModel.phone" placeholder="请输入绑定手机" :disabled="!basicHight"/>
+                                <el-form-item label="绑定手机" :prop="basicFormEdit ? 'phone' : ''">
+                                    <el-input v-model="formUserModel.phone" placeholder="请输入绑定手机" :disabled="!basicHight" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="所属角色">
-                                    <el-input v-model="formUserModel.roleName" placeholder="" disabled/>
+                                    <el-input v-model="formUserModel.roleName" placeholder="" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="所属部门">
-                                    <el-input v-model="formUserModel.deptId" placeholder="" disabled/>
+                                    <el-input v-model="formUserModel.deptId" placeholder="" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="CA签字体">
-                                    <el-image style="height: 60px" :src="formUserModel?.signatureUrl" :preview-src-list="[formUserModel?.signatureUrl]" :initial-index="0" fit="cover" v-if="formUserModel?.signatureUrl"/>
-                                    <span class="text-zinc-400" v-else>无CA签字体</span>
+                                    <el-image v-if="formUserModel?.signatureUrl" style="height: 60px" :src="formUserModel?.signatureUrl" :preview-src-list="[formUserModel?.signatureUrl]" :initial-index="0" fit="cover" />
+                                    <span v-else class="text-zinc-400">无CA签字体</span>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -69,13 +69,13 @@
                 <template v-if="menuKey === 'password'">
                     <el-form ref="formUserPassRef" :model="formUserPassModel" :rules="formUserPassRules" size="large" label-position="top" style="max-width: 400px; margin: auto;">
                         <el-form-item label="原始密码" prop="oldPassword">
-                            <el-input type="password" v-model="formUserPassModel.oldPassword" placeholder="请输入原始密码" show-password/>
+                            <el-input v-model="formUserPassModel.oldPassword" type="password" placeholder="请输入原始密码" show-password />
                         </el-form-item>
                         <el-form-item label="新的密码" prop="newPassword">
-                            <el-input type="password" v-model="formUserPassModel.newPassword" placeholder="请输入新的密码" show-password/>
+                            <el-input v-model="formUserPassModel.newPassword" type="password" placeholder="请输入新的密码" show-password />
                         </el-form-item>
                         <el-form-item label="确认新密码" prop="newPassword1">
-                            <el-input type="password" v-model="formUserPassModel.newPassword1" placeholder="请输入确认新密码" show-password/>
+                            <el-input v-model="formUserPassModel.newPassword1" type="password" placeholder="请输入确认新密码" show-password />
                         </el-form-item>
                     </el-form>
                 </template>
@@ -83,24 +83,24 @@
                     <el-menu :default-active="projectKey" class="hc-project-menu" unique-opened>
                         <el-sub-menu v-for="item in projectContractArr" :index="item.id">
                             <template #title>
-                                <HcIcon name="folder-2" class="hc-menu-icon"/>
+                                <HcIcon name="folder-2" class="hc-menu-icon" />
                                 <span>{{ item?.name }}</span>
                             </template>
-                            <el-menu-item v-for="items in item?.contractInfoList ?? []" :index="items?.id" @click="projectMenuValue(item,items)">
-                                <HcIcon name="star" class="hc-menu-icon" fill v-if="projectKey === items?.id"/>
+                            <el-menu-item v-for="items in item?.contractInfoList ?? []" :index="items?.id" @click="projectMenuValue(item, items)">
+                                <HcIcon v-if="projectKey === items?.id" name="star" class="hc-menu-icon" fill />
                                 <span>{{ items?.name }}</span>
                             </el-menu-item>
                         </el-sub-menu>
                     </el-menu>
                 </template>
-            </HcCard>
-            <div class="hc-card-foot-box" v-if="basicFormEdit">
+            </hc-new-card>
+            <div v-if="basicFormEdit" class="hc-card-foot-box">
                 <el-button type="primary" hc-btn :loading="saveUserLoading" @click="saveUserInfoClick">
-                    <HcIcon name="save"/>
+                    <HcIcon name="save" />
                     <span>保存</span>
                 </el-button>
                 <el-button hc-btn @click="cancelUserClick">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                     <span>取消</span>
                 </el-button>
             </div>
@@ -109,25 +109,25 @@
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import userApi from "~api/userInfo/index"
-import {useRouter} from 'vue-router'
-import avatarPng from '~src/assets/images/avatar.png';
-import {getTokenHeader} from '~src/api/request/header';
-import {arrIndex, formValidate, isPhone} from "js-fast-way"
-import {HcIsButton} from "~src/plugins/IsButtons";
-import md5 from 'js-md5';
+import { onMounted, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import userApi from '~api/userInfo/index'
+import { useRouter } from 'vue-router'
+import avatarPng from '~src/assets/images/avatar.png'
+import { getTokenHeader } from '~src/api/request/header'
+import { arrIndex, formValidate, isPhone } from 'js-fast-way'
+import { HcIsButton } from '~src/plugins/IsButtons'
+import md5 from 'js-md5'
 
 //初始变量
 const router = useRouter()
 const useAppState = useAppStore()
 
 //全局变量信息
-const userInfo = ref(useAppState.getUserInfo);
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const projectContractArr = ref(useAppState.getProjectContract);
+const userInfo = ref(useAppState.getUserInfo)
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const projectContractArr = ref(useAppState.getProjectContract)
 
 //渲染完成
 onMounted(() => {
@@ -136,8 +136,8 @@ onMounted(() => {
 })
 
 //上传组件参数
-const action = '/api/blade-resource/oss/endpoint/put-file';
-const accept = 'image/png,image/jpg,image/jpeg';
+const action = '/api/blade-resource/oss/endpoint/put-file'
+const accept = 'image/png,image/jpg,image/jpeg'
 const upData = ref({})
 
 //上传前
@@ -149,10 +149,10 @@ const beforeUpload = () => {
 
 //上传完成
 const uploadFinish = async (res) => {
-    const link = res?.data?.link ?? '';
-    const user_id = userInfo.value?.user_id ?? '';
+    const link = res?.data?.link ?? ''
+    const user_id = userInfo.value?.user_id ?? ''
     if (link) {
-        const { error, code } = await userApi.updateUserInfo({avatar: link, id: user_id})
+        const { error, code } = await userApi.updateUserInfo({ avatar: link, id: user_id })
         if (!error && code === 200) {
             avatarLoading.value = false
             userInfo.value.avatar = link
@@ -175,18 +175,18 @@ const uploadError = () => {
 //左侧菜单
 const menuKey = ref('basic')
 const menuItem = ref({})
-const menuOptions = ref([]);
+const menuOptions = ref([])
 
 const setElTreeMenu = () => {
-    let newArr = [];
+    let newArr = []
     if (HcIsButton('user_menu_basic')) {
-        newArr.push({key: 'basic', label: '基础信息', icon: 'user-3'})
+        newArr.push({ key: 'basic', label: '基础信息', icon: 'user-3' })
     }
     if (HcIsButton('user_menu_password')) {
-        newArr.push({key: 'password', label: '密码设置', icon: 'lock-unlock'})
+        newArr.push({ key: 'password', label: '密码设置', icon: 'lock-unlock' })
     }
     if (HcIsButton('user_menu_project')) {
-        newArr.push({key: 'project', label: '参建项目', icon: 'folder-2'})
+        newArr.push({ key: 'project', label: '参建项目', icon: 'folder-2' })
     }
     menuOptions.value = newArr
     menuObjItem()
@@ -240,7 +240,7 @@ const formUserRules = {
                 callback()
             }
         },
-        trigger: "blur"
+        trigger: 'blur',
     },
 }
 //获取用户信息
@@ -289,7 +289,7 @@ const saveUserInfoData = async () => {
         saveUserLoading.value = true
         const { error, code } = await userApi.updateUserInfo({
             phone: phone,
-            id: user_id
+            id: user_id,
         })
         if (!error && code === 200) {
             saveUserLoading.value = false
@@ -304,52 +304,52 @@ const saveUserInfoData = async () => {
 
 //密码设置表单
 const formUserPassRef = ref(null)
-const formUserPassModel = ref({oldPassword: '', newPassword: '', newPassword1: ''})
+const formUserPassModel = ref({ oldPassword: '', newPassword: '', newPassword1: '' })
 const formUserPassRules = {
     oldPassword: {
         required: true,
-        trigger: "blur",
-        message: "请输入原始密码"
+        trigger: 'blur',
+        message: '请输入原始密码',
     },
     newPassword: {
         required: true,
         validator(rule, value, callback) {
-            const pass = formUserPassModel.value.newPassword1;
+            const pass = formUserPassModel.value.newPassword1
             if (!value) {
-                callback(new Error("请输入新的密码"))
+                callback(new Error('请输入新的密码'))
             } else if (pass && value !== pass) {
-                callback(new Error("新的密码和确认新密码不一致"))
+                callback(new Error('新的密码和确认新密码不一致'))
             }
             callback()
         },
-        trigger: "blur"
+        trigger: 'blur',
     },
     newPassword1: {
         required: true,
         validator(rule, value, callback) {
-            const pass = formUserPassModel.value.newPassword;
+            const pass = formUserPassModel.value.newPassword
             if (!value) {
-                callback(new Error("请输入确认新密码"))
+                callback(new Error('请输入确认新密码'))
             } else if (pass && value !== pass) {
-                callback(new Error("新的密码和确认新密码不一致"))
+                callback(new Error('新的密码和确认新密码不一致'))
             }
             callback()
         },
-        trigger: "blur"
-    }
+        trigger: 'blur',
+    },
 }
 
 //更新密码
 const saveUpdatePassword = async () => {
     const res = await formValidate(formUserPassRef.value)
     if (res) {
-        const form = formUserPassModel.value;
+        const form = formUserPassModel.value
         saveUserLoading.value = true
         const { error, code } = await userApi.updatePassword({
             oldPassword: md5(form?.oldPassword),
             newPassword: md5(form?.newPassword),
             newPassword1: md5(form?.newPassword1),
-            plaintextPassword: form?.newPassword
+            plaintextPassword: form?.newPassword,
         })
         if (!error && code === 200) {
             saveUserLoading.value = false
@@ -357,7 +357,7 @@ const saveUpdatePassword = async () => {
             formUserPassModel.value = {
                 oldPassword: '',
                 newPassword: '',
-                newPassword1: ''
+                newPassword1: '',
             }
         } else {
             saveUserLoading.value = false
@@ -377,7 +377,7 @@ const getDefaultProject = async () => {
 //项目被选择
 const menuProjectId = ref('')
 const menuContractId = ref('')
-const projectMenuValue = (item,items) => {
+const projectMenuValue = (item, items) => {
     menuProjectId.value = item?.id
     menuContractId.value = items?.id
     projectKey.value = items?.id
@@ -389,7 +389,7 @@ const setDefaultProjectClick = async () => {
     if (pid && cid) {
         const { error, code } = await userApi.setDefaultProject({
             projectId: pid,
-            contractId: cid
+            contractId: cid,
         })
         if (!error && code === 200) {
             window?.$message?.success('设置成功')

+ 2 - 2
src/views/user/project.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="hc-page-box">
-        <HcCard class="hc-card-table-box" :class="isTableInfo ? 'info' : ''">
+        <hc-new-card class="hc-card-table-box" :class="isTableInfo ? 'info' : ''">
             <HcCardItem class="hc-card-table-data">
                 <HcTable
                     ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
@@ -57,7 +57,7 @@
                     </div>
                 </div>
             </HcCardItem>
-        </HcCard>
+        </hc-new-card>
     </div>
 </template>
 

+ 4 - 4
src/views/using/components/table-classify.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <div>
             <el-button v-if="!searchboxshow" type="primary" style="float:right" @click="oprensearchbox">
                 <HcIcon name="archive-drawer" />
@@ -19,7 +19,7 @@
         <!-- <HcTable ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"  class="tablebox" /> -->
         <HcTable1 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableSelection" @row-click="tableRowClick">
             <template #table-expand-header>
-                <HcCard>
+                <hc-new-card>
                     <template #header>
                         <div class="rowbox">
                             <h3>卷内文件</h3>
@@ -31,7 +31,7 @@
                         is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
                         @selection-change="tableSelection" @row-click="tableRowClick"
                     />
-                </HcCard>
+                </hc-new-card>
             </template>
         </HcTable1>
 
@@ -48,7 +48,7 @@
                 <HcPages :pages="searchForm" @change="pageChange" />
             </div>
         </template>
-    </HcCard>
+    </hc-new-card>
 </template>
 
 <script setup>

+ 2 - 2
src/views/using/components/table-collect.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard>
+    <hc-new-card>
         <template #header>
             <div class="title text-lg font-bold">
                 <span>建设单位归档资料</span>
@@ -41,7 +41,7 @@
                 <HcPages :pages="searchFormFile" @change="pageFileChange" />
             </template>
         </HcCardItem>
-    </HcCard>
+    </hc-new-card>
 
     <!-- 批量上报审批 -->
     <HcReportModal