linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web

Browse Source
pull/1/head
黄伟杰 2 months ago
parent e49c478b8f 1f85c45a1c
commit b3c22ec032
20 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File

6
src/components/DictTag/src/DictTag.vue
Unescape Escape View File

@ -4,7 +4,8 @@ import { isHexColor } from '@/utils/color'
import { ElTag } from 'element-plus'
import { DictDataType, getDictOptions } from '@/utils/dict'
import { isArray, isBoolean, isNumber, isString } from '@/utils/is'
import {useLocaleStoreWithOut} from "@/store/modules/locale";
const localeStore = useLocaleStoreWithOut()
export default defineComponent({
name: 'DictTag',
props: {
@ -68,6 +69,7 @@ export default defineComponent({
if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') {
dict.colorType = ''
}
const label = localeStore.getCurrentLocale?.lang === 'en' ? (dict.labelEn || dict.label) : dict.label
return (
// 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
<ElTag
@ -76,7 +78,7 @@ export default defineComponent({
color={dict?.cssClass && isHexColor(dict?.cssClass) ? dict?.cssClass : ''}
disableTransitions={true}
>
{dict?.label}
{label}
</ElTag>
)
}

4
src/permission.ts
Unescape Escape View File

@ -79,7 +79,9 @@ const whiteList = [
'/auth-redirect',
'/bind',
'/register',
'/oauthLogin/gitee'
'/oauthLogin/gitee',
'/iot/report/dashboardPage/Dashboard8',
'/iot/report/dashboardPage/Dashboard1'
]
// 路由加载前

4
src/views/erp/autocode/AutocodeIndex.vue
Unescape Escape View File

@ -98,8 +98,8 @@
</template>
</el-table-column>
<!-- <el-table-column label="ID" align="center" prop="id" /> -->
<el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleCodeColumn')" align="center" prop="ruleCode" sortable/>
<el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleNameColumn')" align="center" prop="ruleName" sortable/>
<el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleCodeColumn')" align="center" prop="ruleCode" width="260px" sortable/>
<el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleNameColumn')" align="center" prop="ruleName" width="200px" sortable/>
<el-table-column :label="t('FactoryModeling.AutocodeRule.tableBarcodeTypeColumn')" align="center">
<template #default="scope">
<el-tag type="primary">{{ getBarcodeTypeLabel(scope.row.barcodeType) }}</el-tag>

2
src/views/erp/component/product/index.vue
Unescape Escape View File

@ -55,7 +55,7 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name" width="220px" sortable />
<el-table-column v-if="checkPermi(['erp:component:standard'])" :label="t('SparePartsManagement.SpareInfo.standard')" align="center" prop="standard" />
<el-table-column :label="t('SparePartsManagement.SpareInfo.category')" align="center" prop="categoryName" sortable />

2
src/views/erp/component/record/index.vue
Unescape Escape View File

@ -91,7 +91,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column :label="t('SparePartsManagement.SpareRecord.product')" align="left" sortable prop="productName" width="210px"/>
<el-table-column :label="t('SparePartsManagement.SpareRecord.product')" align="left" sortable prop="productName" width="300px"/>
<el-table-column :label="t('SparePartsManagement.SpareRecord.unit')" align="center" prop="unitName" sortable />
<el-table-column :label="t('SparePartsManagement.SpareRecord.warehouse')" align="center" prop="warehouseName" sortable />
<el-table-column :label="t('SparePartsManagement.SpareRecord.bizType')" align="center" prop="bizType" min-width="120" sortable>

2
src/views/erp/moldlist/index.vue
Unescape Escape View File

@ -54,7 +54,7 @@ type="success" plain @click="handleExport" :loading="exportLoading"
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code" sortable />
<el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code" sortable width="200px"/>
<el-table-column :label="t('MoldManagement.Mold.name')" align="left" prop="name" sortable />
<el-table-column :label="t('MoldManagement.Mold.useTime')" align="center" prop="useTime" sortable />
<el-table-column :label="t('MoldManagement.Mold.status')" align="center" prop="status" sortable>

14
src/views/mes/dvrepair/index.vue
Unescape Escape View File

@ -111,11 +111,11 @@
:show-overflow-tooltip="true"
row-key="id"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" fixed="left" reserve-selection />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairCode')" align="center" prop="repairCode" sortable />
<el-table-column type="selection" width="55px" fixed="left" reserve-selection />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairCode')" align="center" prop="repairCode" minWidth="180px" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairName')" align="center" prop="repairName" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryName')" align="center" prop="machineryName" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryCode')" align="center" prop="machineryCode" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryName')" align="center" prop="machineryName" minWidth="180px" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryCode')" align="center" prop="machineryCode" minWidth="180px" sortable />
<!-- <el-table-column label="品牌" align="center" prop="machineryBrand" /> -->
<el-table-column :label="t('EquipmentManagement.DvRepair.machinerySpec')" align="center" prop="machinerySpec" />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryType')" align="center" prop="machineryTypeId" width="100px" sortable>
@ -141,9 +141,9 @@
prop="confirmDate"
:formatter="dateFormatter2"
width="110px" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairResult')" align="center" prop="repairResult" />
<el-table-column :label="t('EquipmentManagement.DvRepair.acceptedBy')" align="center" prop="acceptedBy" />
<el-table-column :label="t('EquipmentManagement.DvRepair.confirmBy')" align="center" prop="confirmBy" />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairResult')" align="center" prop="repairResult" minWidth="130px"/>
<el-table-column :label="t('EquipmentManagement.DvRepair.acceptedBy')" align="center" prop="acceptedBy" minWidth="150px"/>
<el-table-column :label="t('EquipmentManagement.DvRepair.confirmBy')" align="center" prop="confirmBy" minWidth="150px"/>
<el-table-column :label="t('EquipmentManagement.DvRepair.status')" align="center" prop="status" width="110px" sortable>
<template #default="scope">
<el-tag :type="getStatusTagType(scope.row.status)" effect="light">

2
src/views/mes/dvsubject/index.vue
Unescape Escape View File

@ -92,7 +92,7 @@ effect="light" :type="getTagType('value_types', scope.row.valueType)"
</el-tag>
</template>
</el-table-column>
<el-table-column :label="t('EquipmentManagement.DvSubject.judgmentCriteria')" align="center" prop="judgmentCriteria" />
<el-table-column :label="t('EquipmentManagement.DvSubject.judgmentCriteria')" align="center" width="480px" prop="judgmentCriteria" />
<el-table-column :label="t('EquipmentManagement.DvSubject.creatorName')" align="center" prop="creatorName" sortable />
<el-table-column :label="t('EquipmentManagement.DvSubject.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" sortable />
<el-table-column :label="t('EquipmentManagement.DvSubject.operate')" align="center" fixed="right" width="160px">

6
src/views/mes/esopFile/index.vue
Unescape Escape View File

@ -68,13 +68,13 @@
<!-- <el-table-column label="id" align="center" prop="id" />
<el-table-column label="配置编号" align="center" prop="configId" />-->
<el-table-column :label="t('FactoryModeling.EsopFile.tableCodeColumn')" align="center" prop="code" />
<el-table-column :label="t('FactoryModeling.EsopFile.tableNameColumn')" align="center" prop="name" />
<el-table-column :label="t('FactoryModeling.EsopFile.tableClassificationColumn')" align="center" prop="classification" >
<el-table-column :label="t('FactoryModeling.EsopFile.tableNameColumn')" align="center" prop="name" width="500px"/>
<el-table-column :label="t('FactoryModeling.EsopFile.tableClassificationColumn')" align="center" prop="classification" width="200px">
<template #default="scope">
<dict-tag type="classification" :value="scope.row.classification" />
</template>
</el-table-column>
<el-table-column :label="t('FactoryModeling.EsopFile.tableTypeColumn')" align="center" prop="type" />
<el-table-column :label="t('FactoryModeling.EsopFile.tableTypeColumn')" align="center" prop="type" width="200px"/>
<el-table-column :label="t('FactoryModeling.EsopFile.tableStatusColumn')" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.FILE_STATUS" :value="scope.row.status" />

4
src/views/mes/feedingrecord/index.vue
Unescape Escape View File

@ -102,8 +102,8 @@
</template>
</el-table-column>
<el-table-column :label="t('ProductionPlan.FeedingRecord.tableCodeColumn')" align="center" prop="feedingRecordCode" width="150px" sortable />
<el-table-column :label="t('ProductionPlan.FeedingRecord.tablePipelineColumn')" align="center" prop="feedingPipelineName" sortable/>
<el-table-column :label="t('ProductionPlan.FeedingRecord.planCode')" align="center" prop="planCode" sortable/>
<el-table-column :label="t('ProductionPlan.FeedingRecord.tablePipelineColumn')" align="center" prop="feedingPipelineName" width="150px" sortable/>
<el-table-column :label="t('ProductionPlan.FeedingRecord.planCode')" align="center" prop="planCode" width="200px" sortable/>
<el-table-column :label="t('ProductionPlan.FeedingRecord.tableFeedingTypeColumn')" align="center" prop="feedingType" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_FEEDING_TYPE" :value="scope.row.feedingType" />

2
src/views/mes/moldoperate/index.vue
Unescape Escape View File

@ -87,7 +87,7 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- <el-table-column label="ID" align="center" prop="id" /> -->
<!-- <el-table-column label="操作类型" align="center" prop="operateType" sortable /> -->
<el-table-column :label="t('MoldManagement.MoldOperate.moldName')" align="center" prop="moldName" sortable />
<el-table-column :label="t('MoldManagement.MoldOperate.moldName')" align="center" prop="moldName" width="500px" sortable />
<el-table-column :label="t('MoldManagement.MoldOperate.deviceName')" align="center" prop="deviceName" sortable />
<el-table-column :label="t('MoldManagement.MoldOperate.creatorName')" align="center" prop="creatorName" sortable />
<el-table-column :label="t('MoldManagement.MoldOperate.remark')" align="center" prop="remark" />

2
src/views/mes/task/index.vue
Unescape Escape View File

@ -107,7 +107,7 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column :label="t('ProductionPlan.Task.tableCodeColumn')" align="center" prop="code" width="150px" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableCodeColumn')" align="center" prop="code" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableOrderDateColumn')" align="center" prop="orderDate" :formatter="dateFormatter2" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableDeliveryDateColumn')" align="center" prop="deliveryDate" :formatter="dateFormatter2" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableTaskTypeColumn')" align="center" prop="taskType" sortable>

6
src/views/mes/taskManagement/index.vue
Unescape Escape View File

@ -84,7 +84,7 @@
:label="t('EquipmentManagement.TaskManagement.name')"
align="center"
prop="name"
min-width="140"
min-width="200"
sortable />
<el-table-column
:label="t('EquipmentManagement.TaskManagement.taskType')"
@ -106,7 +106,7 @@
:label="t('EquipmentManagement.TaskManagement.projectForm')"
align="center"
prop="projectFormName"
min-width="140"
min-width="300"
sortable />
<el-table-column
:label="t('EquipmentManagement.TaskManagement.startDate')"
@ -146,7 +146,7 @@
:label="t('EquipmentManagement.TaskManagement.creatorName')"
align="center"
prop="creatorName"
width="120"
width="200"
sortable />
<el-table-column
:label="t('EquipmentManagement.TaskManagement.createTime')"

6
src/views/mes/zjTask/index.vue
Unescape Escape View File

@ -112,12 +112,12 @@ type="success" plain @click="handleExport" :loading="exportLoading"
<!-- <el-table-column type="selection" width="55" fixed="left" reserve-selection /> -->
<el-table-column :label="t('QualityManagement.ZjTask.index')" type="index" width="80"/>
<el-table-column :label="t('QualityManagement.ZjTask.code')" align="center" prop="code" width="160px" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.type')" align="center" width="90px">
<el-table-column :label="t('QualityManagement.ZjTask.type')" align="center" width="160px">
<template #default="scope">
<DictTag type="mes_zj_task_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column :label="t('QualityManagement.ZjTask.status')" align="center" prop="status" width="90px" sortable>
<el-table-column :label="t('QualityManagement.ZjTask.status')" align="center" prop="status" width="160px" sortable>
<template #default="scope">
<DictTag :type="'job_status'" :value="scope.row.status" />
</template>
@ -128,7 +128,7 @@ type="success" plain @click="handleExport" :loading="exportLoading"
<DictTag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column :label="t('QualityManagement.ZjTask.schemaName')" align="center" prop="schemaName" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.schemaName')" align="center" prop="schemaName" width="150px" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.managerName')" align="center" prop="managerName" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.executorName')" align="center" prop="executorName" sortable />
<el-table-column

2
src/views/mold/inspectionItems/index.vue
Unescape Escape View File

@ -72,7 +72,7 @@ effect="light" :type="getTagType('value_types', scope.row.valueType)"
</el-tag>
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldInspectionItems.judgmentCriteria')" align="center" prop="judgmentCriteria" />
<el-table-column :label="t('MoldManagement.MoldInspectionItems.judgmentCriteria')" align="center" prop="judgmentCriteria" width="350px"/>
<el-table-column :label="t('MoldManagement.MoldInspectionItems.creatorName')" align="center" prop="creatorName" sortable />
<el-table-column :label="t('MoldManagement.MoldInspectionItems.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" sortable />
<el-table-column :label="t('MoldManagement.MoldInspectionItems.operate')" align="center" fixed="right" width="160px">

4
src/views/mold/moldrepair/index.vue
Unescape Escape View File

@ -107,12 +107,12 @@
<el-table-column type="selection" width="55" fixed="left" reserve-selection />
<el-table-column :label="t('MoldManagement.MoldRepair.repairCode')" align="center" prop="repairCode" min-width="150" sortable />
<el-table-column :label="t('MoldManagement.MoldRepair.repairName')" align="center" prop="repairName" min-width="150" sortable />
<el-table-column :label="t('MoldManagement.MoldRepair.moldName')" align="center" prop="moldName" min-width="160" sortable>
<el-table-column :label="t('MoldManagement.MoldRepair.moldName')" align="center" prop="moldName" min-width="200" sortable>
<template #default="scope">
{{ scope.row.moldName ?? scope.row.machineryName ?? '-' }}
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldRepair.moldCode')" align="center" prop="moldCode" min-width="160" sortable>
<el-table-column :label="t('MoldManagement.MoldRepair.moldCode')" align="center" prop="moldCode" min-width="200" sortable>
<template #default="scope">
{{ scope.row.moldCode ?? scope.row.machineryCode ?? '-' }}
</template>

2
src/views/mold/taskConfiguration/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
>
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column :label="t('EquipmentManagement.TaskManagement.index')" type="index" align="center" width="70" />
<el-table-column :label="t('EquipmentManagement.TaskManagement.name')" align="center" prop="name" min-width="140" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.name')" align="center" prop="name" min-width="200" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.taskType')" align="center" prop="taskType" width="90" sortable>
<template #default="scope">
<el-tag v-if="scope.row.taskType === 1" type="primary">{{ t('EquipmentManagement.TaskManagement.taskTypeInspect') }}</el-tag>

2
src/views/mold/workOrderInquiry/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
<el-table-column type="selection" width="55" />
<el-table-column type="index" :label="t('MoldManagement.MoldWorkOrderInquiry.index')" align="center" width="70" />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.planNo')" align="center" prop="planNo" min-width="160" sortable />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.moldName')" align="center" prop="moldName" min-width="160" sortable />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.moldName')" align="center" prop="moldName" min-width="200" sortable />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.planType')" align="center" prop="planType" min-width="110" sortable>
<template #default="scope">
<el-tag v-if="String(scope.row.planType) === '1'" type="primary">{{ t('MoldManagement.MoldWorkOrderInquiry.planTypeInspect') }}</el-tag>

3
src/views/report/dashboardPage/dashboard8/components/DashboardHeader.vue
Unescape Escape View File

@ -11,6 +11,7 @@
</div>
</div>
<div class="header-right">
<Screenfull class="custom-hover" color="var(--top-header-text-color)"/>
<!-- <el-button class="back-btn" type="primary" size="small" plain @click="goBack">
<Icon icon="fa-solid:arrow-left" class="back-icon" />
<span>返回</span>
@ -32,7 +33,7 @@
import { ref, onMounted, onUnmounted } from 'vue'
import { useRouter } from 'vue-router'
import { useI18n } from '@/hooks/web/useI18n'
import { Screenfull } from '@/layout/components/Screenfull'
const router = useRouter()
const { t } = useI18n('Dashboard8')

1
src/views/system/user/index.vue
Unescape Escape View File

@ -118,6 +118,7 @@
align="center"
key="deptName"
prop="deptName"
width="200px"
:show-overflow-tooltip="true"
sortable />
<el-table-column :label="t('SystemManagement.User.sex')" align="center" prop="sex">

Write Preview
Loading…
Cancel
Save