ZaiZai 1 éve
szülő
commit
0664928d61

+ 1 - 4
src/views/data-fill/query.vue

@@ -159,10 +159,7 @@
                 </template>
                 <template #extra>
                     <template v-if="contractInfo?.contractType === 2 || contractInfo?.contractType === 3">
-                        <HcNewSwitch
-                            :datas="contractTypeTab" :keys="contractTypeTabKey"
-                            @change="contractTypeTabChange"
-                        />
+                        <HcNewSwitch :datas="contractTypeTab" :keys="contractTypeTabKey" size="default" @change="contractTypeTabChange" />
                     </template>
                 </template>
                 <HcTable

+ 2 - 5
src/views/data-fill/wbs.vue

@@ -148,13 +148,10 @@
                         <span>划分变更</span>
                     </el-button>
                 </HcTooltip>
-                <HcNewSwitch
-                    v-if="isDrawer" :datas="authBtnTabdata" :keys="authBtnTabKey" :round="false"
-                    size="default" @change="authBtnTabClick"
-                />
+                <HcNewSwitch v-if="isDrawer" :datas="authBtnTabdata" :keys="authBtnTabKey" :round="false" size="default" @change="authBtnTabClick" />
             </template>
             <template #extra>
-                <HcNewSwitch :datas="wbsTypeTab" :keys="wbsTypeTabKey" @change="wbsTypeTabChange" />
+                <HcNewSwitch :datas="wbsTypeTab" :keys="wbsTypeTabKey" size="default" @change="wbsTypeTabChange" />
             </template>
             <NodeTree
                 ref="NodeTreeRef"

+ 43 - 38
src/views/ledger/write.vue

@@ -1,36 +1,42 @@
 <template>
     <div class="hc-layout-box">
-        <div v-if="sbTableKey !== 'weather'" :style="'width:' + leftWidth + 'px;'" class="hc-layout-left-box">
+        <div v-if="sbTableKey !== 'weather'" :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <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>
-                    <WbsTree :autoExpandKeys="treeAutoExpandKeys" :contractId="contractId" :projectId="projectId"
-                             @nodeTap="nodeWbsElTreeClick"/>
+                    <WbsTree
+                        :auto-expand-keys="treeAutoExpandKeys" :contract-id="contractId" :project-id="projectId"
+                        @nodeTap="nodeWbsElTreeClick"
+                    />
                 </el-scrollbar>
             </div>
-            <!--左右拖动-->
-            <div class="horizontal-drag-line" @mousedown="onmousedown"/>
+            <!-- 左右拖动 -->
+            <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-layout-content-box ledger-write-box">
             <HcTabsSimple :cur="sbTableKey" :datas="sbTableData" @tabClick="sbTableClick">
                 <template #tab-internal>
-                    <HcInternal v-if="sbTableKey === 'internal'" :contractId="contractId" :projectId="projectId"
-                                :treeData="nodeDataInfo"/>
+                    <HcInternal
+                        v-if="sbTableKey === 'internal'" :contract-id="contractId" :project-id="projectId"
+                        :tree-data="nodeDataInfo"
+                    />
                 </template>
                 <template #tab-construction>
-                    <HcConstruction v-if="sbTableKey === 'construction'" :contractId="contractId" :projectId="projectId"
-                                    :treeData="nodeDataInfo"/>
+                    <HcConstruction
+                        v-if="sbTableKey === 'construction'" :contract-id="contractId" :project-id="projectId"
+                        :tree-data="nodeDataInfo"
+                    />
                 </template>
                 <template #tab-weather>
-                    <HcWeather v-if="sbTableKey === 'weather'" :contractId="contractId" :projectId="projectId"/>
+                    <HcWeather v-if="sbTableKey === 'weather'" :contract-id="contractId" :project-id="projectId" />
                 </template>
             </HcTabsSimple>
         </div>
@@ -38,31 +44,31 @@
 </template>
 
 <script setup>
-import {onMounted, ref, watch} from 'vue'
-import {useAppStore} from "~src/store";
-import {useRouter, useRoute} from 'vue-router'
-import WbsTree from "./components/WbsTree.vue"
-import HcInternal from "./components/internal.vue"
-import HcWeather from "./components/weather.vue"
-import HcConstruction from "./components/construction.vue"
-import {getStoreValue, setStoreValue} from '~src/utils/storage'
+import { onMounted, ref, watch } from 'vue'
+import { useAppStore } from '~src/store'
+import { useRoute, useRouter } from 'vue-router'
+import WbsTree from './components/WbsTree.vue'
+import HcInternal from './components/internal.vue'
+import HcWeather from './components/weather.vue'
+import HcConstruction from './components/construction.vue'
+import { getStoreValue, setStoreValue } from '~src/utils/storage'
 
 //变量
 const router = useRouter()
 const useRoutes = useRoute()
 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 isCollapse = ref(useAppState.getCollapse)
 
 //路由参数
-const routerQuery = useRoutes?.query;
-const dataType = routerQuery?.type || 'weather';
+const routerQuery = useRoutes?.query
+const dataType = routerQuery?.type || 'weather'
 
 //监听
 watch(() => [
-    useAppState.getCollapse
+    useAppState.getCollapse,
 ], ([Collapse]) => {
     isCollapse.value = Collapse
 })
@@ -73,16 +79,16 @@ const treeAutoExpandKeys = ref([])
 //类型处理
 const sbTableKey = ref(dataType)
 const sbTableData = ref([
-    {icon: 'bar-chart-box', label: '内业台账', key: 'internal'},
-    {icon: 'tools', label: '施工台账', key: 'construction'},
-    {icon: 'sun-cloudy', label: '天气台账', key: 'weather'},
+    { icon: 'bar-chart-box', label: '内业台账', key: 'internal' },
+    { icon: 'tools', label: '施工台账', key: 'construction' },
+    { icon: 'sun-cloudy', label: '天气台账', key: 'weather' },
 ])
 
 const sbTableClick = (key) => {
     sbTableKey.value = key
     router.push({
         path: useRoutes.path,
-        query: {type: key}
+        query: { type: key },
     })
     getTypeData(key)
 }
@@ -101,25 +107,25 @@ const getTypeData = (key) => {
 
 //树被点击
 const nodeDataInfo = ref({})
-const nodeWbsElTreeClick = ({data, keys}) => {
+const nodeWbsElTreeClick = ({ data, keys }) => {
     nodeDataInfo.value = data
     setStoreValue('ledgerWriteTreeKeys', keys)
     treeAutoExpandKeys.value = keys || []
 }
 
 //左右拖动,改变树形结构宽度
-const leftWidth = ref(382);
+const leftWidth = ref(382)
 const onmousedown = () => {
     const leftNum = isCollapse.value ? 142 : 272
     document.onmousemove = (ve) => {
-        const diffVal = ve.clientX - leftNum;
+        const diffVal = ve.clientX - leftNum
         if (diffVal >= 310 && diffVal <= 900) {
-            leftWidth.value = diffVal;
+            leftWidth.value = diffVal
         }
     }
     document.onmouseup = () => {
-        document.onmousemove = null;
-        document.onmouseup = null;
+        document.onmousemove = null
+        document.onmouseup = null
     }
 }
 </script>
@@ -130,7 +136,6 @@ const onmousedown = () => {
 .hc-layout-box .hc-layout-left-box .hc-tree-box {
     height: calc(100% - 81px);
 }
-
 </style>
 
 <style lang="scss">

+ 2 - 3
src/views/other-file/image-form.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-layout-box">
-        <div v-if="dataType === 1" :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div v-if="dataType === 1" :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div v-if="isshowTree" class="hc-tree-box">

+ 2 - 3
src/views/other-file/image-view.vue

@@ -1,14 +1,13 @@
 <template>
     <div class="hc-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <template v-if="dataType === 1">
                 <div class="hc-project-box">
                     <div class="hc-project-icon-box">
                         <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="project-alias">{{ projectInfo.name }}</span>
                     </div>
                 </div>
                 <div v-if="dataType === 1" class="hc-tree-box">

+ 2 - 3
src/views/other-file/project-scanning.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

+ 1 - 4
src/views/other/components/ListItem.vue

@@ -251,10 +251,7 @@
     >
         <div>
             <div class="flex-1" style="padding-left:20px">
-                <HcNewSwitch
-                    :datas="tabTypeTab" :keys="tabTypeKey" :round="false" size="default"
-                    @change="tabTypeChange"
-                />
+                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" :round="false" size="default" @change="tabTypeChange" />
                 <el-select
                     v-model="testReportId" :loading="insertDataSelectoading" :placeholder="placeholderType"
                     class="ml-2 w-80"

+ 3 - 4
src/views/other/first-item.vue

@@ -1,13 +1,12 @@
 <template>
     <div id="first-item-node-layout-target" class="hc-layout-box">
-        <div v-show="!isFirstReportDrawer" :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div v-show="!isFirstReportDrawer" :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">
@@ -59,7 +58,7 @@
                     </HcTooltip>
                 </template>
                 <template #extra>
-                    <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                    <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
                 </template>
                 <template #search>
                     <div class="w-32">

+ 3 - 4
src/views/other/first-itemcopy.vue

@@ -1,13 +1,12 @@
 <template>
     <div id="first-item-node-layout-target" class="hc-layout-box">
-        <div v-show="!isFirstReportDrawer" :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div v-show="!isFirstReportDrawer" :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">
@@ -59,7 +58,7 @@
                     </HcTooltip>
                 </template>
                 <template #extra>
-                    <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                    <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
                 </template>
                 <template #search>
                     <div class="w-32">

+ 50 - 50
src/views/schedule/hc-data.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="hc-layout-box">
         <HcPageHeader v-if="contractInfo?.contractType === 2 || contractInfo?.contractType === 3">
-            <HcNewSwitch :datas="contractTypeTab" :keys="contractTypeTabKey" @change="contractTypeTabChange"/>
+            <HcNewSwitch :datas="contractTypeTab" :keys="contractTypeTabKey" size="default" @change="contractTypeTabChange" />
         </HcPageHeader>
         <div class="hc-round-chart">
             <el-row :gutter="30">
                 <el-col v-for="item in processMaterialList" :span="6">
                     <div class="hc-round-chart-card-box">
                         <div class="hc-card-content-box">
-                            <div class="card-title">{{ item['title'] }}</div>
+                            <div class="card-title">{{ item.title }}</div>
                             <div class="card-ratio-box">
-                                <div class="ratio-num">{{ item['ratio'] }}</div>
+                                <div class="ratio-num">{{ item.ratio }}</div>
                                 <div class="ratio-text">
                                     <div class="unit">%</div>
                                     <div class="text">完成率</div>
@@ -19,18 +19,18 @@
                             <div class="card-amount-box">
                                 <div class="amount-item">
                                     <div class="text">应填(份)</div>
-                                    <div class="num">{{ item['amount'] }}</div>
+                                    <div class="num">{{ item.amount }}</div>
                                 </div>
-                                <div class="amount-divider"/>
+                                <div class="amount-divider" />
                                 <div class="amount-item">
                                     <div class="text">已填(份)</div>
-                                    <div class="num">{{ item['successAmount'] }}</div>
+                                    <div class="num">{{ item.successAmount }}</div>
                                 </div>
                             </div>
                         </div>
                         <div class="hc-card-chart-box">
-                            <RoundChart :ratio="item.ratio"/>
-                            <div class="text-num">{{ item['ratio'] }}%</div>
+                            <RoundChart :ratio="item.ratio" />
+                            <div class="text-num">{{ item.ratio }}%</div>
                         </div>
                     </div>
                 </el-col>
@@ -45,7 +45,7 @@
                             <span class="hc-chart-text">(已审批{{ materialList }}份)</span>
                         </div>
                         <div class="hc-report-chart-box">
-                            <ReportChart :datas="processMaterialStatusList"/>
+                            <ReportChart :datas="processMaterialStatusList" />
                         </div>
                     </div>
                 </el-col>
@@ -55,7 +55,7 @@
                             <span class="title">声像媒体资料统计</span>
                             <el-button round size="large" @click="toTableClick">
                                 <span>WBS节点进度</span>
-                                <HcIcon name="arrow-right-s" style="margin-right: 0;" ui="ml-2"/>
+                                <HcIcon name="arrow-right-s" style="margin-right: 0;" ui="ml-2" />
                             </el-button>
                         </div>
                         <div class="hc-media-chart-box">
@@ -73,7 +73,7 @@
                                     <span class="num c2">{{ imageClassInfo.video }}</span>
                                 </div>
                             </div>
-                            <MediaChart :datas="contractImageClassificationList"/>
+                            <MediaChart :datas="contractImageClassificationList" />
                         </div>
                     </div>
                 </el-col>
@@ -83,21 +83,21 @@
 </template>
 
 <script setup>
-import {ref, onMounted} from 'vue'
-import {useRouter} from 'vue-router'
-import {useAppStore} from "~src/store";
-import RoundChart from "./components/echarts/RoundChart.vue"
-import ReportChart from "./components/echarts/ReportChart.vue"
-import MediaChart from "./components/echarts/MediaChart.vue"
-import {getArrValue} from "js-fast-way"
-import DataApi from "~api/schedule/data"
+import { onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useAppStore } from '~src/store'
+import RoundChart from './components/echarts/RoundChart.vue'
+import ReportChart from './components/echarts/ReportChart.vue'
+import MediaChart from './components/echarts/MediaChart.vue'
+import { getArrValue } from 'js-fast-way'
+import DataApi from '~api/schedule/data'
 
 //变量
 const router = useRouter()
 const useAppState = useAppStore()
-const projectId = ref(useAppState.getProjectId);
-const contractId = ref(useAppState.getContractId);
-const contractInfo = ref(useAppState.getContractInfo);
+const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.getContractId)
+const contractInfo = ref(useAppState.getContractInfo)
 const isCollapse = ref(useAppState.getCollapse)
 
 //渲染完成
@@ -111,11 +111,11 @@ onMounted(() => {
 //结构类型tab数据和相关处理
 const contractTypeTabKey = ref(2)
 const contractTypeTab = ref([
-    {key: '1', name: '施工数据'},
-    {key: '2', name: '监理数据'}
-]);
+    { key: '1', name: '施工数据' },
+    { key: '2', name: '监理数据' },
+])
 const contractTypeTabChange = (item) => {
-    contractTypeTabKey.value = item?.key;
+    contractTypeTabKey.value = item?.key
     queryMaterialProgress()
     queryMaterialProgressStatus()
     queryImageClassification()
@@ -123,7 +123,7 @@ const contractTypeTabChange = (item) => {
 
 //获取合同段类型
 const getContractTypeKey = () => {
-    const {contractType} = contractInfo.value;
+    const { contractType } = contractInfo.value
     if (contractType === 2 || contractType === 3) {
         return contractTypeTabKey.value ?? '1'
     } else {
@@ -136,18 +136,18 @@ const isProcessLoading = ref(false)
 const processMaterialList = ref([])
 const queryMaterialProgress = async () => {
     isProcessLoading.value = true
-    const classifyType = getContractTypeKey();
-    const {error, code, data} = await DataApi.queryMaterialProgress({
+    const classifyType = getContractTypeKey()
+    const { error, code, data } = await DataApi.queryMaterialProgress({
         projectId: projectId.value,
         contractId: contractId.value,
-        classifyType: classifyType
-    });
+        classifyType: classifyType,
+    })
     //处理数据
     isProcessLoading.value = false
     if (!error && code === 200) {
-        processMaterialList.value = getArrValue(data?.processMaterialList);
+        processMaterialList.value = getArrValue(data?.processMaterialList)
     } else {
-        processMaterialList.value = [];
+        processMaterialList.value = []
     }
 }
 
@@ -158,17 +158,17 @@ const isMaterialLoading = ref(false)
 const processMaterialStatusList = ref([])
 const queryMaterialProgressStatus = async () => {
     isMaterialLoading.value = true
-    const classifyType = getContractTypeKey();
-    const {error, code, data} = await DataApi.queryMaterialProgressStatus({
+    const classifyType = getContractTypeKey()
+    const { error, code, data } = await DataApi.queryMaterialProgressStatus({
         projectId: projectId.value,
         contractId: contractId.value,
-        classifyType: classifyType
-    });
+        classifyType: classifyType,
+    })
     //处理数据
     isMaterialLoading.value = false
     if (!error && code === 200) {
-        let num = 0;
-        const listData = getArrValue(data?.processMaterialStatusList);
+        let num = 0
+        const listData = getArrValue(data?.processMaterialStatusList)
         for (let i = 0; i < listData.length; i++) {
             const Amount = listData[i]?.approvalAmount || 0
             num += Amount
@@ -177,29 +177,29 @@ const queryMaterialProgressStatus = async () => {
         processMaterialStatusList.value = listData
     } else {
         materialList.value = 0
-        processMaterialStatusList.value = [];
+        processMaterialStatusList.value = []
     }
 }
 
 //声像媒体资料统计
 const isImageClassLoading = ref(false)
 const contractImageClassificationList = ref([])
-const imageClassInfo = ref({amount: 0, image: 0, video: 0})
+const imageClassInfo = ref({ amount: 0, image: 0, video: 0 })
 const queryImageClassification = async () => {
     isImageClassLoading.value = true
-    const classifyType = getContractTypeKey();
-    const {error, code, data} = await DataApi.queryImageClassification({
+    const classifyType = getContractTypeKey()
+    const { error, code, data } = await DataApi.queryImageClassification({
         projectId: projectId.value,
         contractId: contractId.value,
-        classifyType: classifyType
-    });
+        classifyType: classifyType,
+    })
     //处理数据
     isImageClassLoading.value = false
     if (!error && code === 200) {
-        const imageClassList = getArrValue(data?.contractImageClassificationList);
-        contractImageClassificationList.value = imageClassList;
+        const imageClassList = getArrValue(data?.contractImageClassificationList)
+        contractImageClassificationList.value = imageClassList
         //数据显示
-        let AxisData = {amount: 0, image: 0, video: 0};
+        let AxisData = { amount: 0, image: 0, video: 0 }
         for (let i = 0; i < imageClassList.length; i++) {
             AxisData.amount = imageClassList[i].amount
             AxisData.image = imageClassList[i].imageAmount
@@ -207,13 +207,13 @@ const queryImageClassification = async () => {
         }
         imageClassInfo.value = AxisData
     } else {
-        contractImageClassificationList.value = [];
+        contractImageClassificationList.value = []
     }
 }
 
 //查看WBS节点进度
 const toTableClick = () => {
-    router.push({path: '/schedule/table'})
+    router.push({ path: '/schedule/table' })
 }
 </script>
 

+ 2 - 3
src/views/schedule/write.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

+ 2 - 3
src/views/tentative/collect/monthly.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-search-box">

+ 2 - 3
src/views/tentative/collect/test.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

+ 3 - 4
src/views/tentative/detect/outside.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">
@@ -104,7 +103,7 @@
             widths="70rem" @close="addEditFormModalClose"
         >
             <template #extra>
-                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
             <el-form
                 v-if="tabTypeKey === 'tab1'" ref="addEditFormRef" :model="addEditFormModel"

+ 1 - 1
src/views/tentative/detect/test.vue

@@ -192,7 +192,7 @@
             @close="viewAttachmentModalClose"
         >
             <template #extra>
-                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
             <div v-loading="viewAttachmentLoading" class="hc-switch-tab-content">
                 <div class="h-full w-full flex">

+ 3 - 4
src/views/tentative/detect/third.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">
@@ -105,7 +104,7 @@
             widths="70rem" @close="addEditFormModalClose"
         >
             <template #extra>
-                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
             <el-form
                 v-if="tabTypeKey === 'tab1'" ref="addEditFormRef" :model="addEditFormModel"

+ 2 - 3
src/views/tentative/laboratory/print.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

+ 1 - 1
src/views/tentative/laboratory/user.vue

@@ -62,7 +62,7 @@
             @save="addEditFormClick"
         >
             <template #extra>
-                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
             <el-form
                 ref="addEditFormRef" :model="addEditFormModel" :rules="addEditFormRules" label-width="auto"

+ 1 - 4
src/views/tentative/material/approach.vue

@@ -222,10 +222,7 @@
             @close="viewAttachmentModalClose"
         >
             <template #extra>
-                <HcNewSwitch
-                    :datas="tabTypeTab" :disabled="tableRowPdfDisabled" :keys="tabTypeKey"
-                    @change="tabTypeChange"
-                />
+                <HcNewSwitch :datas="tabTypeTab" :disabled="tableRowPdfDisabled" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
             <div class="hc-switch-tab-content">
                 <div class="h-full w-full">

+ 2 - 3
src/views/tentative/material/sampling.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="hc-page-layout-box">
-        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box">
+        <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
             <div class="hc-project-box">
                 <div class="hc-project-icon-box">
                     <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="project-alias">{{ projectInfo.name }}</span>
                 </div>
             </div>
             <div class="hc-tree-box">

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

@@ -222,10 +222,10 @@
             <HcNewCard v-if="menuKey === 'recycle'" action-size="lg">
                 <template #header>
                     <div class="mr-5">{{ menuItem.label }}</div>
-                    <HcNewSwitch :datas="userTypeTab" :keys="userTypeKey" @change="userTypeChange" />
+                    <HcNewSwitch :datas="userTypeTab" :keys="userTypeKey" size="default" @change="userTypeChange" />
                 </template>
                 <template #extra>
-                    <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange" />
+                    <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
                 </template>
                 <HcTable
                     ref="recycleTableRef" :column="recycleTableColumn" :datas="recycleTableData" :loading="recycleTableLoading"