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

Form

This commit is contained in:
shijing 2022-02-17 14:32:18 +08:00
parent 0543a90f2b
commit 77d1e92109
4 changed files with 87 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hb_client/src/icons/svg/bigScreen.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1644973249496" class="icon" viewBox="0 0 1061 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3412" xmlns:xlink="http://www.w3.org/1999/xlink" width="33.15625" height="32"><defs><style type="text/css"></style></defs><path d="M939.425185 796.444444H122.500741C57.230222 796.444444 0 745.775407 0 687.824593V108.619852C0 50.669037 57.192296 0 122.500741 0h816.924444C1004.695704 0 1061.925926 50.669037 1061.925926 108.619852v579.204741C1061.925926 745.775407 1004.73363 796.444444 939.425185 796.444444z m-519.888592-137.102222c16.308148 0 40.808296-16.346074 40.808296-40.846222V373.418667c0-24.500148-16.308148-40.846222-40.808296-40.846223-24.538074 0-40.846222 16.346074-40.846223 40.846223v245.077333c0 24.500148 16.308148 40.846222 40.846223 40.846222z m179.693037 0c24.500148 0 40.846222-16.346074 40.846222-40.846222v-122.538667c0-24.500148-16.308148-40.846222-40.846222-40.846222-24.500148 0-40.846222 16.308148-40.846223 40.846222v122.500741c0 24.538074 16.308148 40.884148 40.846223 40.884148z m179.693037 0c24.538074 0 40.846222-16.346074 40.846222-40.846222V577.611852c0-24.500148-16.308148-40.846222-40.846222-40.846222-24.500148 0-40.808296 16.308148-40.808297 40.846222v40.846222c0 24.500148 16.308148 40.846222 40.808297 40.846222z m-539.117037 0c16.308148 0 40.846222-16.346074 40.846222-40.846222V250.88c0-24.500148-16.308148-40.846222-40.846222-40.846222-24.500148 0-40.846222 16.346074-40.846223 40.846222v367.616c0 24.500148 16.308148 40.846222 40.846223 40.846222zM265.481481 872.296296h530.962963a75.851852 75.851852 0 1 1 0 151.703704H265.481481a75.851852 75.851852 0 1 1 0-151.703704z" p-id="3413" fill="#ffffff"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

2
hb_client/src/router/index.js
View File

@ -55,7 +55,7 @@ export const constantRoutes = [
{
path: '/index',
component: () => import('@/views/bigScreen/index'),
meta: { title: '大屏', icon: 'home', affix: true,keepAlive: false }
meta: { title: '大屏', icon: 'bigScreen', affix: true,keepAlive: false }
},
{
path: '/changepassword',

3
hb_client/src/views/dashboard/index.vue
View File

@ -684,7 +684,8 @@
show: false//Y轴刻度线
},
axisLabel: {
color: '#333333'//Y轴文本颜色
color: '#333333',//Y轴文本颜色
fontSize: 10,//字体大小
},
splitLine: {
show: true, //Y轴分割线

178
hb_client/src/views/mtm/materialdo.vue
View File

@ -3,7 +3,7 @@
<el-card>
<el-row :gutter="2">
<!--表格-->
<el-col :span="6">
<el-col :span="10">
<el-card>
<div
slot="header"
@ -30,8 +30,12 @@
@current-change="handleCurrentChange"
>
<el-table-column type="index" width="50"/>
<el-table-column label="表名称">
<template slot-scope="scope">{{ scope.row.name }}</template>
<el-table-column label="表名称" prop="name">
</el-table-column>
<el-table-column label="表类型">
<template slot-scope="scope">
{{typeOptions_[scope.row.type]}}
</template>
</el-table-column>
<el-table-column label="是否启用">
<template slot-scope="scope">
@ -75,6 +79,36 @@
<el-form-item label="表格名称" prop="name">
<el-input v-model="recordform.name" placeholder="表格名称"/>
</el-form-item>
<!--<el-form-item label="引用表单" prop="field_type">
<el-select
style="width: 100%"
v-model="recordform.number"
placeholder="请选择"
>
<el-option
v-for="item in fieldtypeoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>-->
<el-form-item label="表格类型" prop="formUsed">
<el-select
style="width: 100%"
v-model="recordform.type"
placeholder="请选择"
>
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="name">
<el-switch v-model="recordform.enabled"></el-switch>
</el-form-item>
@ -239,7 +273,7 @@
</el-card>
</el-col>
<!--表格字段-->
<el-col :span="18">
<el-col :span="14">
<el-card>
<div slot="header" class="clearfix">
<span style="font-size: 16px; font-weight: 300">记录字段</span>
@ -406,69 +440,6 @@
<el-form-item label="是否需要判定" prop="need_judge">
<el-switch v-model="field.need_judge"></el-switch>
</el-form-item>
<!--
<el-form-item
label="上限值"
v-if="field.need_judge == true"
prop="high_limit"
>
<el-input-number
v-model="field.high_limit"
:precision="2"
:min="0"
></el-input-number>
</el-form-item>
<el-form-item
label="上限规则"
v-if="field.need_judge == true"
prop="high_rule"
>
<el-select
style="width: 100%"
v-model="field.high_rule"
placeholder="请选择"
>
<el-option
v-for="item in highoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="下限值"
v-if="field.need_judge == true"
prop="low_limit"
>
<el-input-number
v-model="field.low_limit"
:precision="2"
:min="0"
></el-input-number>
</el-form-item>
<el-form-item
label="下限规则"
v-if="field.need_judge == true"
prop="low_rule"
>
<el-select
style="width: 100%"
v-model="field.low_rule"
placeholder="请选择"
>
<el-option
v-for="item in lowoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
!-->
<el-form-item label="判定式" v-if="field.need_judge === true">
<el-input v-model="field.rule_expression" type="textarea"/>
</el-form-item>
@ -556,7 +527,7 @@
const defaultfield = {};
let preDrawAry = [];
export default {
components: {Pagination, vueJsonEditor, Treeselect, customForm,faceLogin},
components: {Pagination, vueJsonEditor, Treeselect, customForm, faceLogin},
data() {
return {
step: defaultstep,
@ -677,12 +648,31 @@
label: "绘图模板",
},
],
typeoptions: [
typeOptions: [
{
value: 1,
label: "生产记录",
value: 10,
label: "生产记录表",
}, {
value: 20,
label: "工序检查表",
}, {
value: 30,
label: "入场检验表",
}, {
value: 40,
label: "成品检验表",
}, {
value: 50,
label: "首件检查表",
},
],
typeOptions_:{
10 : "生产记录表",
20 : "工序检查表",
30 : "入场检验表",
40 : "成品检验表",
50 : "首件检查表",
},
canvas: null,
ctx: null,
myCanvas_rect: null,
@ -696,8 +686,8 @@
imgData: '',
canvasImg: '',
judgeList: [],
limitedPhoto:false,
isDisabled:true,
limitedPhoto: false,
isDisabled: true,
};
},
computed: {},
@ -850,7 +840,7 @@
},
recordformLists() {
this.listQueryrecordform.material = this.material;
this.listQueryrecordform.type = 2;
// this.listQueryrecordform.type = 2;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {
this.recordformList = response.data;
@ -895,21 +885,20 @@
//新增字段
handlefieldCreate() {
this.field_choice = [""];
// this.field = Object.assign({}, defaultfield);
this.dialogType1 = "new";
this.dialogVisible1 = true;
// this.$refs["Form"].resetFields();
this.$nextTick(() => {
this.field.field_type= null;
this.field.field_key= null;
this.field.field_name= null;
this.field.sort= null;
this.field.parent= null;
this.field.help_text= null;
this.field.draw_template= null;
this.field.field_choice= null;
this.field.rule_expression= null;
this.field.display_expression= null;
this.field.field_type = null;
this.field.field_key = null;
this.field.field_name = null;
this.field.sort = null;
this.field.parent = null;
this.field.help_text = null;
this.field.draw_template = null;
this.field.field_choice = null;
this.field.rule_expression = null;
this.field.display_expression = null;
this.$refs["Form"].clearValidate();
});
},
@ -965,10 +954,12 @@
this.$refs[form].validate((valid) => {
if (valid) {
const isEdit = this.dialogType === "edit";
let obj = new Object();
obj.name=this.recordform.name;
obj.type=this.recordform.type;
obj.enabled=this.recordform.enabled;
if (isEdit) {
this.recordform.material = this.material;
this.recordform.type = 2;
updaterecordform(this.recordform.id, this.recordform).then(
updaterecordform(this.recordform.id, obj).then(
(res) => {
if (res.code >= 200) {
this.recordformLists();
@ -978,9 +969,8 @@
}
);
} else {
this.recordform.material = this.material;
this.recordform.type = 2;
createrecordform(this.recordform).then((res) => {
obj.material=parseInt(this.material);
createrecordform(obj).then((res) => {
if (res.code >= 200) {
this.recordformLists();
this.dialogVisible = false;
@ -1011,8 +1001,6 @@
} else {
this.field.form = this.formID;
this.field.field_choice = this.field_choice;
debugger;
console.log(this.field);
createrffield(this.field).then((res) => {
if (res.code >= 200) {
this.fieldLists();
@ -1027,12 +1015,12 @@
}
});
},
recordformcon(){
recordformcon() {
this.recordform.material = this.material;
this.recordform.type = 2;
this.limitedPhoto = true;
},
getMsgFormSon(data){
getMsgFormSon(data) {
this.limitedPhoto = data;
this.recordformLists();
this.dialogVisible = false;