Merge remote-tracking branch 'origin/main'

main
weitingdong 1 year ago
commit 830a0ccd53
  1. 11
      src/api/inspection/inspectiontasks.js
  2. 16
      src/views/inspection/inspectionPlanDetail.vue
  3. 11
      src/views/inspection/inspectionplan.vue
  4. 11
      src/views/inspection/inspectionroute.vue
  5. 16
      src/views/inspection/inspectionrouteDetail.vue
  6. 2
      src/views/smart/operationticket.vue
  7. 214
      src/views/smart/operationticketDetail.vue
  8. 2
      src/views/smart/workorder.vue
  9. 4
      src/views/spares/manufacturerinfo.vue
  10. 4
      src/views/spares/materialclassification.vue
  11. 4
      src/views/spares/supplierinfo.vue
  12. 2
      src/views/spares/warehouse.vue
  13. 249
      src/views/wel/index.vue

@ -69,3 +69,14 @@ export const stop = (ids, reason) => {
})
}
export const task_getListByToolsCodeId = (legerId) => {
return request({
url: '/api/inspection/inspectiontasks/getListByToolsCodeId',
method: 'get',
params: {
legerId: legerId
}
})
}

@ -67,22 +67,6 @@
trigger: "blur"
}]
},
{
label: "场站",
prop: "station",
type: "select",
span: 8,
dicUrl: "/api/daf-system/dict/dictionary?code=station",
props: {
label: "dictValue",
value: "dictKey"
},
rules: [{
required: true,
message: "请输入场站",
trigger: "blur"
}]
},
{
label: "计划类型",
prop: "planType",

@ -118,17 +118,6 @@
prop: "planName",
search: true
},
{
label: "场站",
prop: "station",
type: "select",
search: true,
dicUrl: "/api/daf-system/dict/dictionary?code=station",
props: {
label: "dictValue",
value: "dictKey"
}
},
{
label: "计划类型",
prop: "planType"

@ -118,17 +118,6 @@
prop: "routeName",
search: true
},
{
label: "场站",
prop: "stations",
type: "select",
search: true,
dicUrl: "/api/daf-system/dict/dictionary?code=station",
props: {
label: "dictValue",
value: "dictKey"
}
},
{
label: "类型",
prop: "type",

@ -58,22 +58,6 @@
trigger: "blur"
}]
},
{
label: "场站",
prop: "stations",
type: "select",
span: 8,
dicUrl: "/api/daf-system/dict/dictionary?code=station",
props: {
label: "dictValue",
value: "dictKey"
},
rules: [{
required: true,
message: "请输入场站",
trigger: "blur"
}]
},
{
label: "类型",
prop: "type",

@ -254,6 +254,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
{
label: "计划结束时间",
prop: "plannedEndTime",
type: "date",
format: 'yyyy/MM/dd',
valueFormat: "yyyyMMdd",
rules: [{
@ -265,6 +266,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
{
label: "签发时间",
prop: "workIssuanceTime",
type: "date",
format: 'yyyy/MM/dd',
valueFormat: "yyyyMMdd",
rules: [{

@ -5,14 +5,15 @@
<span >
<el-col >
审核状态:
<el-select v-model="checkStatusValue" >
<el-option
v-for="item in optionCheckStatus"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<avue-input v-model="form" placeholder="" class="frame_class1" style = "width: 100px"></avue-input>
<!-- <el-select v-model="checkStatusValue" >-->
<!-- <el-option-->
<!-- v-for="item in optionCheckStatus"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-col>
</span>
</div>
@ -59,6 +60,11 @@
@click="back"
v-if="addUpdateShowButton">
取消</el-button>
<el-button type="primary"
size="small"
@click="handleDetailcls"
v-if="shouldShowButton">
关票</el-button>
<el-button type="primary"
size="small"
@click="auditing"
@ -71,7 +77,7 @@
驳回</el-button>
<el-button type="primary"
size="small"
@click="seachToUpdate"
@click="searchToUpdate"
v-if="shouldShowButton">
修改</el-button>
<el-button type="primary"
@ -81,11 +87,32 @@
删除</el-button>
</span>
</div>
<el-dialog title="关票提醒"
append-to-body
:visible.sync="closeTicketBox"
width="555px">
<avue-form :option="closeTicketOption" v-model="closeTicketForm" ref="closeTicketForm">
</avue-form>
<div class="container">
<span>
<el-button type="primary"
size="small"
plain
@click="handleDetailCancel">取消
</el-button>
<el-button type="submit"
size="small"
plain
@click="handleDetailClose">关票
</el-button>
</span>
</div>
</el-dialog>
</basic-container>
<!-- https://avuejs.com/form/form-rules.html#%E5%A4%96%E7%BD%AE%E9%AA%8C%E8%AF%81-->
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/smart/operationticket";
import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/operationticket";
import {
item_add,
item_update,
@ -103,20 +130,22 @@ export default {
name: "operationticketDetail",
data () {
return {
checkStatusValue: this.$route.query.reviewStatus,
optionCheckStatus: [{
value: 1,
label: '审核中',
}, {
value: 2,
label: '已审核',
}, {
value: 3,
label: '未通过',
}, {
value: 4,
label: ' '
}],
// checkStatusValue: this.$route.query.reviewStatus,
// optionCheckStatus: [{
// value: 1,
// label: '',
// }, {
// value: 2,
// label: '',
// }, {
// value: 3,
// label: '',
// }, {
// value: undefined,
// label: ' '
// }],
form:'',
closeTicketBox: false,
defaultOperationTicketNo: "",
frame_class: '',
type: {},
@ -311,9 +340,9 @@ export default {
rules: [{
required: true,
}],
type: "date",
format: 'yyyy/MM/dd',
valueFormat: "yyyyMMdd",
type: "datetime",
format: 'yyyy/MM/dd HH:mm:ss',
valueFormat: "yyyyMMddHH:mm:ss",
span: 8,
maxlength: 20,
},
@ -323,9 +352,9 @@ export default {
rules: [{
required: true,
}],
type: "date",
format: 'yyyy/MM/dd',
valueFormat: "yyyyMMdd",
type: "datetime",
format: 'yyyy/MM/dd HH:mm:ss',
valueFormat: "yyyyMMddHH:mm:ss",
span: 8,
maxlength: 20,
},
@ -335,9 +364,9 @@ export default {
rules: [{
required: true,
}],
type: "date",
format: 'yyyy/MM/dd',
valueFormat: "yyyyMMdd",
type: "datetime",
format: 'yyyy/MM/dd HH:mm:ss',
valueFormat: "yyyyMMddHH:mm:ss",
span: 8,
maxlength: 20,
},
@ -386,6 +415,7 @@ export default {
},
{
label: '作业前风险辨识',
arrow: false,
column: [
{
label: "人员资格",
@ -531,7 +561,42 @@ export default {
}]
},
]
}
},
closeTicketForm: {},
closeTicketOption: {
height: 'auto',
calcHeight: 210,
emptyBtn:false,
submitBtn:false,
tip: false,
border: true,
index: false,
selection: true,
column: [
{
label: "是否合格",
type: "select",
prop: "isQuakified",
dicUrl: "/api/daf-system/dict/dictionary?code=is_qualified",
props: {
label: "dictValue",
value: "dictKey"
},
rules: [{
required: true,
message: "是否合格",
trigger: "blur"
}],
span: 24
},
{
label: "作业后风险管控情况评价",
type: "textarea",
prop: "riskControlEvaluation",
span: 24
},
]
},
}
},
computed: {
@ -548,7 +613,7 @@ export default {
created () {
this.type = this.option.column[0];
// this.option.column.push({ label: '', prop: 'operationItem' });
if(this.$route.query.frameMode == "add"){
if(this.$route.query.frameMode === "add"){
this.readonlyForm=false;
this.shouldShowButton=false;
this.addUpdateShowButton=true;
@ -561,6 +626,28 @@ export default {
this.frame_class = 'frame_class1';
this.SearchDetail();
}
switch (this.$route.query.reviewStatus){
case 1:
this.form = "审核中";
break;
case 2:
this.form = "已审核";
break;
case 3:
this.form = "未通过";
break;
default:
this.form =" ";
}
// if(this.$route.query.reviewStatus ===1){
// this.form = "";
// }else if(this.$route.query.reviewStatus ===2){
// this.form = "";
// }else if(this.$route.query.reviewStatus ===3){
// this.form = "";
// }else {
// this.form =" ";
// }
},
methods: {
handleFormSubmit() {
@ -578,14 +665,14 @@ export default {
},
//
Submit() {
if(this.$route.query.frameMode=="add"){
if(this.$route.query.frameMode==="add"){
this.$confirm("是否新增所填数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.tab1_form.reviewStatus="1"
this.tab1_form.sts= "1"
this.tab1_form.reviewStatus="1";
this.tab1_form.sts= "1" ;
add(this.tab1_form).then(()=>{
this.$router.push({
path: "/smart/operationticket",
@ -610,7 +697,7 @@ export default {
type: "warning"
}).then(() => {
this.tab1_form.reviewStatus="1"
add(this.tab1_form).then(() => {
update(this.tab1_form).then(() => {
this.$router.push({
path: "/smart/operationticket",
query: {},
@ -629,14 +716,14 @@ export default {
}
},
back() {
if(this.$route.query.frameMode=="add") {
if(this.$route.query.frameMode==="add") {
this.$router.push({path: "/smart/operationticket"});
}else{
this.updateToSearch();
this.SearchDetail();
}
},
seachToUpdate () {
searchToUpdate () {
this.shouldShowButton=false;
this.addUpdateShowButton=true;
this.readonlyForm=false;
@ -653,9 +740,15 @@ export default {
this.item_form.operationTicketNo = this.tab1_form.operationTicketNo;
this.item_onLoad();
if(this.type.prop==='operationItem'){
this.shouldShowButton=false;
this.addUpdateShowButton=false;
}
else {
if(this.$route.query.frameMode!=="add"){
this.updateToSearch()
}else {
this.addUpdateShowButton=true;
this.addUpdateShowButton = this.type.prop !== 'operationItem';
}
}
},
@ -690,6 +783,30 @@ export default {
});
},
handleDetailcls() {
debugger
this.updateid = this.$route.query.id;
this.closeTicketBox = true;
},
handleDetailCancel() {
debugger
this.closeTicketBox = false;
},
handleDetailClose() {
debugger
return closeticket( this.updateid, this.closeTicketForm.isQuakified,this.closeTicketForm.riskControlEvaluation)
.then(() => {
this.$router.push({
path: "/smart/operationticket",
query: {},
});
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection()
});
},
//
item_rowDel (form, index,done) {
this.$confirm("确定将选择数据删除?", {
@ -829,4 +946,17 @@ export default {
display: flex;
justify-content: flex-end; /* 将子元素推到容器的末端 */
}
.avue-group__title{
color: rgb(64, 149, 229) !important;
font-size: 16px !important;
line-height: 22px !important;
font-weight: bold !important;
}
.el-form-item__label{
width: 110px !important;
}
.el-form-item__content{
margin-left: 110px!important;
}
</style>

@ -30,7 +30,7 @@
<template #menu="{row,index}">
<el-button @click="handleDetailSearch(row,index)" type="text" size="small" icon="el-icon-view" v-if="permission.workorder_view">查看详情</el-button>
<el-button @click="openDialog(row)" type="text" size="small" icon="el-icon-upload2" v-if="permission.workorder_uploadRes">上传处理结果</el-button>
<el-button @click="rowDel(row)" type="text" size="small" icon="el-icon-delete" v-if="permission.workorder_delete">删除</el-button>
<el-button @click="rowDel(row)" type="text" size="small" icon="el-icon-delete" v-if="permission.workorder_delete"> </el-button>
</template>
</avue-crud>
<el-dialog title="上传处理结果" width="35%" :visible.sync="dialogFormVisible" :before-close="closeDialog">

@ -60,6 +60,8 @@
index: true,
viewBtn: true,
selection: true,
refreshBtn: false,
searchShowBtn: false,
column: [
{
label: "统一社会信用代码/组织机构",
@ -314,7 +316,7 @@
cancelButtonText: "取消",
type: "warning"
}).then(() => {
expUtil.excelExportEasy(`/api/warehouse/export?daf-auth=${getToken()}`, this.search);
expUtil.excelExportEasy(`/api/manufacturerinfo/export?daf-auth=${getToken()}`, this.search);
});
},
}

@ -58,6 +58,8 @@
index: true,
viewBtn: true,
selection: true,
refreshBtn: false,
searchShowBtn: false,
column: [
{
label: "物资分配码",
@ -235,7 +237,7 @@
cancelButtonText: "取消",
type: "warning"
}).then(() => {
expUtil.excelExportEasy(`/api/warehouse/export?daf-auth=${getToken()}`, this.search);
expUtil.excelExportEasy(`/api/materialclassification/export?daf-auth=${getToken()}`, this.search);
});
},
}

@ -60,6 +60,8 @@
index: true,
viewBtn: true,
selection: true,
refreshBtn: false,
searchShowBtn: false,
column: [
{
label: "统一社会信用代码/组织机构",
@ -322,7 +324,7 @@
cancelButtonText: "取消",
type: "warning"
}).then(() => {
expUtil.excelExportEasy(`/api/warehouse/export?daf-auth=${getToken()}`, this.search);
expUtil.excelExportEasy(`/api/supplierinfo/export?daf-auth=${getToken()}`, this.search);
});
},
}

@ -55,6 +55,8 @@
calcHeight: 210,
searchShow: true,
searchMenuSpan: 6,
refreshBtn: false,
searchShowBtn: false,
tip: false,
border: true,
index: true,

@ -1,29 +1,145 @@
<template>
<div>
<basic-container>
<avue-data-display :option="option"></avue-data-display>
<div class="notification-container">
<div class="notification-heading">通知</div>
<p class="notification-title"><i class="el-icon-chat-line-round el-icon-home"></i> 今日消息</p>
<div class="headOverflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
</div>
</div>
<el-row>
<el-col :span="12">
<div class="notification-container-task">
<div class="notification-heading">任务信息</div>
<p class="notification-title"><i class="el-icon-document el-icon-home"></i> 今日任务</p>
<div class="overflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
</div>
</el-col>
<el-col :span="12">
<div class="notification-container-audit">
<div class="notification-heading">审核信息</div>
<p class="notification-title"><i class="el-icon-s-check el-icon-home"></i> 今日待审核</p>
<div class="overflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核设备台账</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
</basic-container>
<el-col :span="16">
<basic-container>
<div id="main" style="height: 360px">
</div>
</basic-container>
</el-col>
</div>
</template>
<script>
import {mapGetters} from "vuex";
import * as echarts from 'echarts';
import {dayLineStatistics , activities} from '@/api/desk/dashboard'
// import * as echarts from 'echarts';
// import {dayLineStatistics , activities} from '@/api/desk/dashboard'
export default {
name: "wel",
data() {
return {
data:[],
skeleton: false,
option: {
span:6,
data: []
@ -34,75 +150,74 @@
...mapGetters(["userInfo"]),
},
mounted() {
activities().then(res =>{
this.option.data = res.data.data
})
return false;
dayLineStatistics().then(res =>{
this.data = res.data.data
const myChart = echarts.init(document.getElementById('main'));
myChart.setOption({
dataset: {
dimensions: ['hours', 'T', 'Q'],
source: this.data
},
title: {
text: '每日请求'
},
tooltip: {
trigger: 'axis'
},
legend: {
data: ['T', 'Q'],
name: '123'
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
toolbox: {
feature: {
saveAsImage: {}
}
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23']
},
yAxis: {
type: 'value'
},
series: [
{ type: 'line' ,smooth: true},
{ type: 'line' ,smooth: true},
]
});
})
},
methods: {
handleChange(val) {
console.log(val);
}
}
};
</script>
<style>
.el-divider--horizontal {
margin: 12px 0 !important;
.notification-container {
padding: 14px;
background-color: #f7f7f7;
height: 260px;
box-shadow: 0 0 10px rgba(0,0,0,0.5);
}
.notification-container-task {
margin-top: 15px;
max-width: 94%;
padding: 14px;
height: 475px;
background-color: #f7f7f7;
box-shadow: 0 0 10px rgba(0,0,0,0.5);
}
.notification-container-audit {
margin-top: 15px;
max-width: 96%;
padding: 14px;
height: 475px;
background-color: #f7f7f7;
box-shadow: 0 0 10px rgba(0,0,0,0.5);
}
.el-font-size {
font-size: 14px;
.notification-heading {
font-size: 24px;
margin-bottom: 10px;
}
.notification-content {
background-color: #fff; /* 白色内容背景 */
padding: 10px;
border-radius: 4px;
}
.notification-message {
font-size: 16px;
}
.notification-title {
font-size: 20px;
}
.el-icon-home {
color: #0087ff;
font-weight: bold;
}
.el-collapse-span {
margin-left: 20px;
}
.el-audit-head {
background-color: #0283f1;
color: white;
height: 40px;
line-height: 40px;
}
.headOverflowList {
height: 170px;
overflow: auto;
}
.like {
cursor: pointer;
font-size: 25px;
display: inline-block;
.overflowList {
height: 380px;
overflow: auto;
}
</style>

Loading…
Cancel
Save