zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
TianyangZhang 2025-12-26 16:28:55 +08:00
parent e5d1a340cf f3a8d392d4
commit 432172d2a1
7 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/asm/asset.vue
View File

@ -28,7 +28,7 @@
:query="query"
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
>
<el-table-column label="卡片编号" prop="card_number" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="资产ID" prop="id" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="固定资产名称" prop="name" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="specification" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="资产类别" prop="cate_name" width="100" show-overflow-tooltip></el-table-column>

33
src/views/asm/assetlog.vue
View File

@ -1,12 +1,13 @@
<template>
<el-container>
<el-header>
<div class="left-panel"></div>
<div class="left-panel">
<el-button type="primary" @click="handleAdd('入库')" v-auth="'assetlog.create'">资产入库</el-button>
</div>
<div class="right-panel">
<!-- <el-button type="primary" @click="handleAdd">新增</el-button> -->
<el-input
v-model="query.search"
placeholder="设备信息等"
placeholder="关键词"
clearable
@keyup.enter="$refs.table.refresh()"
></el-input>
@ -21,13 +22,13 @@
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="API.em.repair.list"
:apiObj="API.asm.assetlog.list"
row-key="id"
stripe
:query="query"
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;drawerTitle=row.type}"
>
<el-table-column label="设备" prop="equipment_fullname" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="操作类型" prop="type" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" width="300" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
@ -35,21 +36,31 @@
</el-tag>
<el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
</template>
</el-table-column>`
<el-table-column label="故障类别" prop="fault_cate" width="100" show-overflow-tooltip></el-table-column>`
<el-table-column label="故障描述" prop="fault_description" show-overflow-tooltip></el-table-column>
<el-table-column label="维修人" prop="repair_user_name" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="维修开始时间" prop="repair_start_time" width="200" show-overflow-tooltip></el-table-column>
</el-table-column>
<el-table-column label="启用日期" prop="start_date" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="保管部门" prop="keep_dept_name" width="160" show-overflow-tooltip></el-table-column>`
<el-table-column label="保管人" prop="keeper_name" width="80" show-overflow-tooltip></el-table-column>
<el-table-column label="资产条数" width="80" show-overflow-tooltip>
<template #default="scope">
{{ scope.row.items?.length }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip></el-table-column>
</scTable>
</el-main>
</el-container>
<el-drawer :title="drawerTitle" v-model="drawerVisible" :size="'80%'" destroy-on-close>
<assetlogin_form :mode="mode" :t_id="t_id"></assetlogin_form>
</el-drawer>
</template>
<script setup>
import { ref } from 'vue'
import API from '@/api'
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
import assetlogin_form from './assetlogin_form.vue'
const query = ref({});
const drawerVisible = ref(false);
const drawerTitle = ref('资产入库');
const mode = ref('add');
const t_id = ref(null);
const handleAdd = () => {

2
src/views/asm/assetlogin_form.vue
View File

@ -9,6 +9,8 @@
<xtSelect
v-model="formData.keep_dept"
:apiObj = "$API.system.dept.list"
:params = "{with_children: 'yes', parent__isnull: true}"
:hidePagination="true"
v-model:label="formData.keep_dept_name"
:edit="localMode == 'add'"
>

12
src/views/em/equipment.vue
View File

@ -18,9 +18,9 @@
<el-table-column type="selection" width="50" />
<el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column label="设备位号" prop="number">
<el-table-column label="设备位号" prop="number" show-overflow-tooltip>
</el-table-column>
<el-table-column label="型号规格" prop="model">
<el-table-column label="型号规格" prop="model" show-overflow-tooltip>
</el-table-column>
<el-table-column label="生产厂" prop="factory" show-overflow-tooltip>
</el-table-column>
@ -40,12 +40,11 @@
</el-table-column>
<el-table-column label="购置日期" prop="buy_date">
</el-table-column>
<el-table-column label="工段运行的方式" prop="indicate_mgroup_running">
<el-table-column label="运行规则" prop="indicate_mgroup_running" width="100">
</el-table-column>
<el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
</el-table-column>
<el-table-column label="更新时间" prop="update_time"></el-table-column>
<el-table-column label="更新时间" prop="update_time" width="150"></el-table-column>
<el-table-column label="状态">
<template #default="scope">
<el-tag v-if="scope.row.state === 10" type="success">
@ -77,9 +76,6 @@
<el-table-column label="安装位置" show-overflow-tooltip>
<template #default="scope">{{ scope.row.place }}</template>
</el-table-column>
<el-table-column label="维修记录" show-overflow-tooltip>
<template #default="scope">{{ scope.row.description }}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left" width="180">
<template #default="scope">
<el-button link type="success" @click="table_print(scope.row)">打印</el-button>

28
src/views/em/equipmentjl.vue
View File

@ -22,11 +22,11 @@
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
<el-table-column type="selection" width="50" />
<el-table-column label="设备名称" prop="name" show-overflow-tooltip>
<el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column label="计量编号" prop="number">
<el-table-column label="计量编号" prop="number" show-overflow-tooltip>
</el-table-column>
<el-table-column label="型号规格" prop="model">
<el-table-column label="型号规格" prop="model" show-overflow-tooltip>
</el-table-column>
<el-table-column label="仪表类型" prop="meter_type">
</el-table-column>
@ -34,11 +34,11 @@
</el-table-column>
<el-table-column label="出厂编号" prop="number_factory">
</el-table-column>
<el-table-column label="启用日期" prop="use_date">
<el-table-column label="启用日期" prop="use_date" width="100">
</el-table-column>
<el-table-column label="用电功率(kw)" prop="power_kw">
<el-table-column label="用电功率(kw)" prop="power_kw" width="100">
</el-table-column>
<el-table-column label="设备重要性" prop="importance">
<el-table-column label="设备重要性" prop="importance" width="100">
<template #default="scope">
<el-tag v-if="scope.row.importance === 10" type="A">
{{ importance[scope.row.importance] }}
@ -51,14 +51,14 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="工段运行" prop="indicate_mgroup_running">
<el-table-column label="运行规则" prop="indicate_mgroup_running" width="100">
</el-table-column>
<el-table-column label="生产厂家" prop="factory" show-overflow-tooltip>
</el-table-column>
<el-table-column label="检定/校准" prop="check_date" ></el-table-column>
<el-table-column label="检定周期/月" prop="cycle" width="70">
<el-table-column label="检定/校准" prop="check_date" width="100"></el-table-column>
<el-table-column label="检定周期/月" prop="cycle" width="100">
</el-table-column>
<el-table-column label="设备状态" width="70">
<el-table-column label="设备状态" width="100">
<template #default="scope">
<el-tag v-if="scope.row.state === 10" type="success">
{{ state_[scope.row.state] }}
@ -78,10 +78,10 @@
</el-table-column>
<el-table-column label="安装位置" prop="place" show-overflow-tooltip>
</el-table-column>
<el-table-column label="设备负责人" prop="device_people" show-overflow-tooltip>
<el-table-column label="设备负责人" prop="device_people" width="100" show-overflow-tooltip>
</el-table-column>
<el-table-column label="更新时间" prop="update_time"></el-table-column>
<el-table-column label="临期预警(天)" prop="check_days_number"></el-table-column>
<el-table-column label="更新时间" prop="update_time" width="150"></el-table-column>
<el-table-column label="临期预警(天)" prop="check_days_number" width="100"></el-table-column>
<el-table-column label="检定状态" prop="state_measure" width="100">
<template #default="scope">
<el-tag v-if="scope.row.state_measure === 10" type="success">
@ -98,7 +98,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="下次检定/校准" prop="next_check_date" width="70">
<el-table-column label="下次检定/校准" prop="next_check_date" width="120">
</el-table-column>
<el-table-column label="备注" show-overflow-tooltip>
<template #default="scope">{{ scope.row.description }}</template>

6
src/views/userCenter/user/seting.vue
View File

@ -45,7 +45,7 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="身份证号">
<el-input v-model="form.id_number" disabled></el-input>
<el-input v-model="form.id_number"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
@ -61,12 +61,12 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="证件照">
<sc-upload v-model="form.photo" title="证件照" :disabled="true"></sc-upload>
<sc-upload v-model="form.photo" title="证件照"></sc-upload>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="签名">
<sc-upload v-model="form.signature" title="证件照" :disabled="true"></sc-upload>
<sc-upload v-model="form.signature" title="签名"></sc-upload>
<!-- <el-image :src="form.signature" style="width: 148px; height: 80px"></el-image> -->
</el-form-item>
</el-col>

2
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -821,6 +821,7 @@ export default {
that.qct_testitems = [];
that.qct_testitems = that.testitemlists;
that.tableHeight = document.getElementById('mlogbwMain').clientHeight-80;
this.getList();
}).catch(() => {
that.isSaveing = false;
})
@ -931,6 +932,7 @@ export default {
that.$refs.dialogForm.validate((valid) => {
if (valid) {
that.selectWprList.forEach(item => {
delete item.ftestitems;
if(!item.ftest){
item.ftest = {};
}