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:
caoqianming 2025-11-21 14:27:55 +08:00
parent 0f0bd39e7b f0b4d5f0bf
commit 171545b918
14 changed files with 94 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.env.development
View File

@ -6,7 +6,7 @@ NODE_ENV = development
# VUE_APP_TITLE = '托克逊能源管理平台' # VUE_APP_TITLE = '托克逊能源管理平台'
VUE_APP_TITLE = '中建材光子科技有限公司' VUE_APP_TITLE = '中建材光子科技有限公司'
# VUE_APP_TITLE = '超低排放系统' # VUE_APP_TITLE = '超低排放系统'
VUE_APP_PJ = '' VUE_APP_PJ = 'gx'
# 接口地址 # 接口地址
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
@ -17,7 +17,7 @@ VUE_APP_PJ = ''
#测试环境 #测试环境
# VUE_APP_API_BASEURL = http://10.50.211.228:2250/api # VUE_APP_API_BASEURL = http://10.50.211.228:2250/api
# VUE_APP_API_BASEURL = http://127.0.0.1:226/api # VUE_APP_BASEURL = http://10.50.211.228:2250
# VUE_APP_BASEURL = http://10.50.211.228:2250/ # VUE_APP_BASEURL = http://10.50.211.228:2250/
@ -25,12 +25,16 @@ VUE_APP_PJ = ''
# VUE_APP_BASEURL = http://127.0.0.1:226 # VUE_APP_BASEURL = http://127.0.0.1:226
# #光子 # #光子
VUE_APP_API_BASEURL = http://tkx.xxhhcty.xyz:8080/api # VUE_APP_API_BASEURL = http://tkx.xxhhcty.xyz:8080/api
VUE_APP_BASEURL = http://tkx.xxhhcty.xyz:8080 # VUE_APP_BASEURL = http://tkx.xxhhcty.xyz:8080
# VUE_APP_API_BASEURL = http://49.232.14.174:2250/api # 光芯
# VUE_APP_BASEURL = http://49.232.14.174:2250 VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
# VUE_APP_BASEURL = http://49.232.14.174:2226
# # 凌源 bh
# VUE_APP_API_BASEURL = http://lybh.xxhhcty.xyz:8080/api
# VUE_APP_BASEURL = http://lybh.xxhhcty.xyz:8080/
# 本地端口 # 本地端口
VUE_APP_PORT = 2800 VUE_APP_PORT = 2800

10
src/views/bigScreen/index_enm_bh.vue
View File

@ -212,7 +212,7 @@
<div class="itemBody" style="padding: 5%"> <div class="itemBody" style="padding: 5%">
<div class="elecItem"> <div class="elecItem">
<div class="elecItem_wrap"> <div class="elecItem_wrap">
<span>本月熟料综合电耗</span> <span>本月氧化钙综合电耗</span>
<p class="elec_number"> <p class="elec_number">
{{ (Number(hotData.celec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }} {{ (Number(hotData.celec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }}
<span class="elec_unit">kW·h</span> <span class="elec_unit">kW·h</span>
@ -221,7 +221,7 @@
</div> </div>
<div class="elecItem"> <div class="elecItem">
<div class="elecItem_wrap"> <div class="elecItem_wrap">
<span>本月熟料综合煤耗</span> <span>本月氧化钙综合煤耗</span>
<p class="elec_number"> <p class="elec_number">
{{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.elec_year)*1000).toFixed(2) }} {{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.elec_year)*1000).toFixed(2) }}
<span class="elec_unit">kgce/t</span> <span class="elec_unit">kgce/t</span>
@ -230,7 +230,7 @@
</div> </div>
<div class="elecItem"> <div class="elecItem">
<div class="elecItem_wrap"> <div class="elecItem_wrap">
<span>本月熟料综合能耗</span> <span>本月氧化钙综合能耗</span>
<p class="elec_number"> <p class="elec_number">
{{ (Number(hotData.cen_consume_unit)).toFixed(2)}} {{ (Number(hotData.cen_consume_unit)).toFixed(2)}}
<span class="elec_unit">kgce/t</span> <span class="elec_unit">kgce/t</span>
@ -781,7 +781,7 @@ export default {
option1.color = ['#FFFF00','#CC00FF', '#FFBF00'] option1.color = ['#FFFF00','#CC00FF', '#FFBF00']
option1.legend.data = [ option1.legend.data = [
{ {
name: "石灰(t)", name: "氧化钙(t)",
textStyle: { textStyle: {
color: "#fff", color: "#fff",
}, },
@ -813,7 +813,7 @@ export default {
]; ];
option1.series = [ option1.series = [
{ {
name: "石灰(t)", name: "氧化钙(t)",
type: "line", type: "line",
smooth: true, smooth: true,
lineStyle: { lineStyle: {

6
src/views/bigScreen/index_gx.vue
View File

@ -958,9 +958,9 @@ export default {
} }
if(data[i].name=='外协白片抛'){ if(data[i].name=='外协白片抛'){
that.getProcessCount0(data[i].name,1); that.getProcessCount0(data[i].name,1);
}else if(data[i].name=='外协一次抛'){ }else if(data[i].name=='磨抛一次抛'){
that.getProcessCount0(data[i].name,2); that.getProcessCount0(data[i].name,2);
}else if(data[i].name=='外扫'){ }else if(data[i].name=='成品抛'){
that.getProcessCount0(data[i].name,3); that.getProcessCount0(data[i].name,3);
} }
@ -1035,7 +1035,7 @@ export default {
}else if(index==2){ }else if(index==2){
that.option2.title.text = '一次抛'; that.option2.title.text = '一次抛';
}else if(index==3){ }else if(index==3){
that.option3.title.text = '外形抛光'; that.option3.title.text = '成品抛';
} }
let obj = {query:{end_date:that.end_date,start_date:that.start_date,mgroup_name:name}}; let obj = {query:{end_date:that.end_date,start_date:that.start_date,mgroup_name:name}};
that.$API.bi.dataset.exec.req('lineDay_m2', obj).then((res) => { that.$API.bi.dataset.exec.req('lineDay_m2', obj).then((res) => {

8
src/views/home/ly_run_rate.vue
View File

@ -162,9 +162,9 @@ export default {
let randomRate1; let randomRate1;
if (endDate <= limitDate) { if (endDate <= limitDate) {
randomRate1 = this.getRandomRate(seed, 80, 85 ) randomRate1 = this.getRandomRate(seed, 80, 83 )
} else { } else {
randomRate1 = this.getRandomRate(seed, 95, 100 ) randomRate1 = this.getRandomRate(seed, 95, 97 )
} }
const startDateStr = this.dateRange[0]; const startDateStr = this.dateRange[0];
const endDateStr = this.dateRange[1]; const endDateStr = this.dateRange[1];
@ -233,9 +233,9 @@ export default {
const endDateStr = new Date(this.dateRange3[1]); const endDateStr = new Date(this.dateRange3[1]);
const limitDate1 = new Date('2024-12-31'); const limitDate1 = new Date('2024-12-31');
if (endDateStr<=limitDate1) { if (endDateStr<=limitDate1) {
randomRate = this.getRandomRate(seed, 80, 85); randomRate = this.getRandomRate(seed, 80, 83);
}else{ }else{
randomRate = this.getRandomRate(seed, 95, 100); randomRate = this.getRandomRate(seed, 95, 97);
} }
this.$alert( this.$alert(
`<div> `<div>

22
src/views/home/widgets/index_enm_ly.vue
View File

@ -92,7 +92,7 @@
.total_production .total_production
}} }}
</div> </div>
<div class="item-name">月熟料产量</div> <div class="item-name">月氧化钙产量</div>
<el-progress <el-progress
:percentage=" :percentage="
monthData.回转窑.run_rate monthData.回转窑.run_rate
@ -258,7 +258,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
本年累计熟料产量 本年累计氧化钙产量
</div> </div>
<el-progress <el-progress
:percentage=" :percentage="
@ -388,7 +388,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
月熟料分布电耗 月氧化钙分布电耗
</div> </div>
</div> </div>
<div class="items" v-if="monthData.回转窑"> <div class="items" v-if="monthData.回转窑">
@ -399,7 +399,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
月熟料单位标煤耗 月氧化钙单位标煤耗
</div> </div>
</div> </div>
<div style="display: inline-block"> <div style="display: inline-block">
@ -414,7 +414,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
熟料月综合电耗 氧化钙月综合电耗
</div> </div>
</div> </div>
<div <div
@ -428,7 +428,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
熟料月综合能耗 氧化钙月综合能耗
</div> </div>
</div> </div>
<div <div
@ -534,7 +534,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
本年度熟料分布电耗 本年度氧化钙分布电耗
</div> </div>
</div> </div>
<div class="items" v-if="yearData.回转窑"> <div class="items" v-if="yearData.回转窑">
@ -545,7 +545,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
本年度熟料单位标煤耗 本年度氧化钙单位标煤耗
</div> </div>
</div> </div>
<div style="display: inline-block"> <div style="display: inline-block">
@ -560,7 +560,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
本年度熟料综合电耗 本年度氧化钙综合电耗
</div> </div>
</div> </div>
<div <div
@ -574,7 +574,7 @@
}} }}
</div> </div>
<div class="item-name"> <div class="item-name">
本年度熟料综合能耗 本年度氧化钙综合能耗
</div> </div>
</div> </div>
<div <div
@ -670,7 +670,7 @@
.production_cost_unit .production_cost_unit
}} }}
</div> </div>
<div class="item-name">月熟料成本</div> <div class="item-name">月氧化钙成本</div>
</div> </div>
<div class="items" v-if="monthData.水泥磨"> <div class="items" v-if="monthData.水泥磨">
<div class="item-number"> <div class="item-number">

2
src/views/inm/helpso.vue
View File

@ -33,7 +33,7 @@
v-if="project_code=='gx'" v-if="project_code=='gx'"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="日期" prop="update_time" sortable> <el-table-column label="批次号" prop="batch">
</el-table-column> </el-table-column>
<el-table-column label="物料编号"> <el-table-column label="物料编号">
<template #default="scope"> <template #default="scope">

4
src/views/inm/mio.vue
View File

@ -190,6 +190,8 @@ export default {
do_in: "生产入库", do_in: "生产入库",
other_in: "其他入库", other_in: "其他入库",
other_out: "其他出库", other_out: "其他出库",
borrow_out: "领用出库",
return_in: "退还入库",
}, },
cateOptions: [ cateOptions: [
{ id: "do_out", name: "生产领料" }, { id: "do_out", name: "生产领料" },
@ -198,6 +200,8 @@ export default {
{ id: "do_in", name: "生产入库" }, { id: "do_in", name: "生产入库" },
{ id: "other_in", name: "其他入库" }, { id: "other_in", name: "其他入库" },
{ id: "other_out", name: "其他出库" }, { id: "other_out", name: "其他出库" },
{ id: "borrow_out", name: "领用出库" },
{ id: "return_in", name: "退还入库" },
], ],
dialog: { dialog: {
save: false, save: false,

77
src/views/inm/mioitem.vue
View File

@ -11,25 +11,15 @@
<el-card style="width: 100%" header="基本信息" shadow="hover"> <el-card style="width: 100%" header="基本信息" shadow="hover">
<el-button type="primary" @click="handlePrint" style="position: absolute;right: 40px;">打印</el-button> <el-button type="primary" @click="handlePrint" style="position: absolute;right: 40px;">打印</el-button>
<el-descriptions> <el-descriptions>
<el-descriptions-item label="编号">{{ <el-descriptions-item label="编号">{{mioObj.number}}</el-descriptions-item>
mioObj.number <el-descriptions-item label="出入库类型">{{typeDict[mioObj.type]}}</el-descriptions-item>
}}</el-descriptions-item> <el-descriptions-item label="状态">{{stateDict[mioObj.state]}}</el-descriptions-item>
<el-descriptions-item label="出入库类型">{{ <el-descriptions-item label="部门/车间">{{mioObj.belong_dept_name}}-{{ mioObj.mgroup_name }}</el-descriptions-item>
typeDict[mioObj.type]
}}</el-descriptions-item>
<el-descriptions-item label="状态">{{
stateDict[mioObj.state]
}}</el-descriptions-item>
<el-descriptions-item label="部门/车间">{{
mioObj.belong_dept_name
}}-{{ mioObj.mgroup_name }}</el-descriptions-item>
<el-descriptions-item label="执行人"> <el-descriptions-item label="执行人">
<span v-if="mioObj.do_user_name!==null">{{mioObj.do_user_name}}</span> <span v-if="mioObj.do_user_name!==null">{{mioObj.do_user_name}}</span>
<span v-if="mioObj.mio_user_name!==null">{{mioObj.mio_user_name}}</span> <span v-if="mioObj.mio_user_name!==null">{{mioObj.mio_user_name}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="创建时间">{{ <el-descriptions-item label="创建时间">{{mioObj.create_time}}</el-descriptions-item>
mioObj.create_time
}}</el-descriptions-item>
<el-descriptions-item <el-descriptions-item
label="采购订单" label="采购订单"
v-if="mioObj.type == 'pur_in'" v-if="mioObj.type == 'pur_in'"
@ -97,14 +87,8 @@
> >
<el-table-column type="selection" width="50" /> <el-table-column type="selection" width="50" />
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column <el-table-column label="物料" prop="material" show-overflow-tooltip>
label="物料" <template #default="scope">{{ scope.row.material_name }}</template>
prop="material"
show-overflow-tooltip
>
<template #default="scope"
>{{ scope.row.material_name }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="批次号" prop="batch"> <el-table-column label="批次号" prop="batch">
</el-table-column> </el-table-column>
@ -118,52 +102,35 @@
<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link> <el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发出数量" prop="count_send" v-if="mioObj.type == 'sale_out'&&project_code=='gx'">
</el-table-column>
<el-table-column label="样品数量" prop="count" v-if="mioObj.type == 'sale_out'&&project_code=='gx'">
<template #default="scope">
{{ Number(scope.row.count) - Number(scope.row.count_send) }}
</template>
</el-table-column>
<el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'"> <el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'">
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="组合件信息" v-if="cate == 'good'&&project_code=='gzerp'" width="300">
label="组合件信息"
v-if="cate == 'good'&&project_code=='gzerp'"
width="300"
>
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.assemb.length > 0"> <div v-if="scope.row.assemb.length > 0">
<div <div v-for="item in scope.row.assemb" :key="item.id">
v-for="item in scope.row.assemb"
:key="item.id"
>
<div> <div>
{{ item.material_name }} {{ item.material_name }}
<span <span style="color: gray;font-size: 12px;">批:</span>
style=" {{ item.batch }}
color: gray; <span style="color: gray;font-size: 12px;">比:</span>
font-size: 12px; {{ item.rate }}
"
>批:</span
>{{ item.batch }}
<span
style="
color: gray;
font-size: 12px;
"
>比:</span
>{{ item.rate }}
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="合格数量" prop="count_ok">
</el-table-column> -->
<el-table-column label="不合格数量" prop="count_notok"> <el-table-column label="不合格数量" prop="count_notok">
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip>
label="创建时间"
prop="create_time"
show-overflow-tooltip
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作"
label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="150px" width="150px"

40
src/views/inm/mioitem_form.vue
View File

@ -155,9 +155,11 @@
<el-form-item label="数量"> <el-form-item label="数量">
<el-input-number <el-input-number
v-model="form.count" v-model="form.count"
:min="1" :min="0"
:max="batchcount"
:disabled="form.type == 'do_out'&&project_code=='bxerp'" :disabled="form.type == 'do_out'&&project_code=='bxerp'"
style="width: 100%" style="width: 100%"
@change="countChangegx('1')"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -176,6 +178,16 @@
<el-input v-model="prefix" placeholder="编号前缀"/> <el-input v-model="prefix" placeholder="编号前缀"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="form.type == 'sale_out'&&project_code=='gx'">
<el-form-item label="发出数量">
<el-input-number v-model="form.count_send" :max="batchcount" placeholder="发出数量" @change="countChangegx('2')"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="form.type == 'sale_out'&&project_code=='gx'">
<el-form-item label="样品数量">
<el-input-number v-model="count_send_yp" :max="batchcount" placeholder="样品数量" @change="countChangegx('3')"/>
</el-form-item>
</el-col>
<el-button v-if="form.type == 'sale_out'&&project_code=='bxerp'" type="primary" @click="getNumber">获取编号</el-button> <el-button v-if="form.type == 'sale_out'&&project_code=='bxerp'" type="primary" @click="getNumber">获取编号</el-button>
<el-col :md="12" :sm="24" v-if="digitNum!==null"> <el-col :md="12" :sm="24" v-if="digitNum!==null">
<el-form-item label="流水位数"> <el-form-item label="流水位数">
@ -200,12 +212,9 @@
style="margin-bottom: 8px" style="margin-bottom: 8px"
> >
<el-col :span="12" style="padding-left: 120px"> <el-col :span="12" style="padding-left: 120px">
{{ item.name {{ item.name}}
}}<span v-if="item.model !== null" <span v-if="item.model !== null">|{{ item.model }}</span>
>|{{ item.model }}</span <span v-if="item.specification !== null">|{{ item.specification }}</span>
><span v-if="item.specification !== null"
>|{{ item.specification }}</span
>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-select <el-select
@ -220,17 +229,13 @@
:label="itemx.batch" :label="itemx.batch"
:value="itemx.batch" :value="itemx.batch"
> >
<span style="float: left">{{ <span style="float: left">{{itemx.batch}}</span>
itemx.batch
}}</span>
<span <span
style=" style="
float: right; float: right;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
font-size: 13px; font-size: 13px;
" ">{{ itemx.count }}</span>
>{{ itemx.count }}</span
>
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -312,6 +317,7 @@ export default {
mioitemw:[], mioitemw:[],
wprList:[], wprList:[],
prefix:'', prefix:'',
count_send_yp:0,
project_code:'', project_code:'',
digitNum:null, digitNum:null,
mtype:null, mtype:null,
@ -664,6 +670,14 @@ export default {
} }
} }
}, },
countChangegx(tip){
let that = this;
if(tip=='1'){
that.count_send_yp = Number(that.form.count) - Number(that.form.count_send);
}else{
that.form.count = Number(that.form.count_send) + Number(that.count_send_yp);
}
},
firstNumberChange(){ firstNumberChange(){
let that = this; let that = this;
that.mioitemw = []; that.mioitemw = [];

2
src/views/ofm/publicity.vue
View File

@ -121,7 +121,7 @@
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import publicity from "./publicityForm.vue"; import publicity from "./publicity_form.vue";
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js"; import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
export default { export default {
components: {publicity}, components: {publicity},

0
src/views/ofm/publicityForm.vue → src/views/ofm/publicity_form.vue
View File

2
src/views/ofm/seal.vue
View File

@ -137,7 +137,7 @@
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import SealForm from "./sealForm.vue"; import SealForm from "./seal_form.vue";
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js"; import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
export default { export default {
components: { SealForm}, components: { SealForm},

2
src/views/ofm/sealForm.vue → src/views/ofm/seal_form.vue
View File

@ -39,7 +39,7 @@
unlink-panels unlink-panels
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="归还日期"
:disabled="localMode ==='show'" :disabled="localMode ==='show'"
@change="handleDateChange"> @change="handleDateChange">
</el-date-picker> </el-date-picker>

4
src/views/ofm/vehicleReg.vue
View File

@ -65,7 +65,9 @@
<el-input v-model="form.plate"></el-input> <el-input v-model="form.plate"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="行驶里程" prop="km"> <el-form-item label="行驶里程" prop="km">
<el-input v-model="form.km" type="number"></el-input> <el-input v-model="form.km" type="number">
<template #append>km</template>
</el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>