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

bigScreenandformstyle

This commit is contained in:
shijing 2022-06-08 08:51:52 +08:00
parent db4adb4756
commit cd69bce3ec
3 changed files with 83 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hb_client/src/views/bigScreen/centerRight1.vue
View File

@ -9,9 +9,12 @@
<span class="fs-xl text mx-2">人员到岗情况</span> <span class="fs-xl text mx-2">人员到岗情况</span>
</div> </div>
</div> </div>
<div class="d-flex jc-center body-box"> <div>
<dv-scroll-board class="dv-scr-board" :config="userConfig" /> <div class="d-flex jc-center body-box">
<dv-scroll-board class="dv-scr-board" :config="userConfig" />
</div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>

12
hb_client/src/views/bigScreen/index.vue
View File

@ -300,7 +300,7 @@
}, },
//人员到岗 //人员到岗
userConfig: { userConfig: {
header: ['姓名', '到岗情况'], header: ['姓名', '到岗情况','部门'],
data: [ data: [
['冯宝宝', "<span class='colorGrass'>已到岗</span>"] ['冯宝宝', "<span class='colorGrass'>已到岗</span>"]
], ],
@ -420,7 +420,7 @@
], ],
limitedTwo: false, limitedTwo: false,
configArticle: { configArticle: {
header: ['标题', '置顶', '作者', '发布时间'], header: ['标题', '置顶', '发布时间'],
data: [ data: [
['郑成功', '2022-03-05'], ['郑成功', '2022-03-05'],
['冯宝宝', '2022-03-05'] ['冯宝宝', '2022-03-05']
@ -669,6 +669,7 @@
that.listUser = false; that.listUser = false;
getEmployee({page: 0,type:'big_screen',show_atwork:true}).then((response) => { getEmployee({page: 0,type:'big_screen',show_atwork:true}).then((response) => {
if (response.data) { if (response.data) {
// debugger;
let list = response.data; let list = response.data;
let data = []; let data = [];
list.forEach(item => { list.forEach(item => {
@ -676,10 +677,11 @@
obj.push(item.name); obj.push(item.name);
// obj.push(item.dept_.name); // obj.push(item.dept_.name);
if (item.is_atwork) { if (item.is_atwork) {
obj.push("<span class='colorGrass'>已到岗</span>") obj.push("<span style='display: inline-block' class='colorGrass roll-table-item'>已到岗</span>")
} else { } else {
obj.push("<span class='colorRed'>未到岗</span>") obj.push("<span style='display: inline-block' class='colorRed roll-table-item'>未到岗</span>")
} }
obj.push(item.dept_.name);
data.push(obj) data.push(obj)
}); });
that.userConfig.data = data; that.userConfig.data = data;
@ -704,7 +706,7 @@
} else { } else {
obj.push('已置顶'); obj.push('已置顶');
} }
obj.push(item.author); // obj.push(item.author);
obj.push(item.create_time); obj.push(item.create_time);
data.push(obj) data.push(obj)
}); });

124
hb_client/src/views/mtm/step.vue
View File

@ -241,66 +241,76 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
class="bigDialog"
:model="tableForm" :model="tableForm"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="dialogVisibleForm" :visible.sync="dialogVisibleForm"
:title="tableForm.name"> :title="tableForm.name">
<el-form <el-form
label-width="180px" label-width="200px"
label-position="right" label-position="right"
> >
<el-row v-for="(item,$index) in dialogFieldList" :key="$index"> <el-row style="box-sizing: border-box;padding-right: 50px">
<el-form-item v-if="item.field_type==='string'" :label="item.field_name"> <el-col v-for="(item,$index) in dialogFieldList" :key="$index" :span="12">
<el-input placeholder="请输入" v-model="item.low_limit"/> <el-form-item v-if="item.field_type==='string'" :label="item.field_name">
</el-form-item> <el-input placeholder="请输入" v-model="item.low_limit"/>
<el-form-item v-else-if="item.field_type==='int'" :label="item.field_name"> <span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
<el-input type="number" placeholder="请输入" v-model="item.low_limit"/> </el-form-item>
</el-form-item> <el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
<el-form-item v-else-if="item.field_type==='float'" :label="item.field_name"> <el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
<el-input type="number" placeholder="请输入" v-model="item.low_limit"/> <span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item> </el-form-item>
<el-form-item v-else-if="item.field_type==='date'" :label="item.field_name"> <el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
<el-date-picker <el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
v-model="item.low_limit" <span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
type="date" </el-form-item>
placeholder="选择日期" <el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
value-format="yyyy-MM-dd" <el-date-picker
style="width:100%"
>
</el-date-picker>
</el-form-item>
<el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
<el-date-picker
v-model="item.low_limit"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
style="width:100%"
>
</el-date-picker>
</el-form-item>
<el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
<el-select style="width: 100%" placeholder="请选择">
<el-option
v-model="item.low_limit" v-model="item.low_limit"
v-for="item1 in item.field_choice" type="date"
:key="item1" placeholder="选择日期"
:label="item1" value-format="yyyy-MM-dd"
:value="item1"> style="width:100%"
</el-option> >
</el-select> </el-date-picker>
</el-form-item> <span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
<el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name"> </el-form-item>
<el-select style="width: 100%" multiple placeholder="请选择"> <el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
<el-option <el-date-picker
v-model="item.low_limit" v-model="item.low_limit"
v-for="item1 in item.field_choice" type="datetime"
:key="item1" placeholder="选择日期"
:label="item1" value-format="yyyy-MM-dd HH:mm:ss"
:value="item1"> style="width:100%"
</el-option> >
</el-select> </el-date-picker>
</el-form-item> <span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
<el-select style="width: 100%" placeholder="请选择">
<el-option
v-model="item.low_limit"
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
:value="item1">
</el-option>
</el-select>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
<el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
<el-select style="width: 100%" multiple placeholder="请选择">
<el-option
v-model="item.low_limit"
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
:value="item1">
</el-option>
</el-select>
<span v-if="item.help_text!==''&&item.help_text">{{item.help_text}}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
@ -342,6 +352,9 @@
<el-table-column label="选项显示名"> <el-table-column label="选项显示名">
<template slot-scope="scope">{{ scope.row.field_choice }}</template> <template slot-scope="scope">{{ scope.row.field_choice }}</template>
</el-table-column> </el-table-column>
<el-table-column label="字段说明">
<template slot-scope="scope">{{ scope.row.help_text }}</template>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="操作" label="操作"
@ -388,7 +401,7 @@
<el-input <el-input
v-model="field.field_key" v-model="field.field_key"
placeholder="字段标识" placeholder="字段标识"
onkeyup="value=value.replace(/[^0-9A-Za-z]/g,'')" @input="checkValue"
/> />
</el-form-item> </el-form-item>
<el-form-item label="字段名称" prop="field_name"> <el-form-item label="字段名称" prop="field_name">
@ -459,6 +472,7 @@
enabled: true enabled: true
}; };
const defaultfield = {}; const defaultfield = {};
const defaultfield1 = {field_type: '', field_key: '', field_name: '', sort: '', field_choice: [""],};
export default { export default {
components: {Pagination, vueJsonEditor}, components: {Pagination, vueJsonEditor},
data() { data() {
@ -593,6 +607,9 @@
this.getFormList(); this.getFormList();
}, },
methods: { methods: {
checkValue() {
this.field.field_key = this.field.field_key.replace(/[^0-9a-zA-Z]/g, '');
},
getProductList(){ getProductList(){
getMaterialList({page:0,type:1}).then((response) => { getMaterialList({page:0,type:1}).then((response) => {
if (response.data) { if (response.data) {
@ -784,9 +801,10 @@
//新增字段 //新增字段
handlefieldCreate() { handlefieldCreate() {
this.field_choice = ['']; this.field_choice = [''];
this.field = Object.assign({}, defaultfield); this.field = Object.assign({}, defaultfield1);
this.dialogType1 = "new"; this.dialogType1 = "new";
this.dialogVisible1 = true; this.dialogVisible1 = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs["Form"].clearValidate(); this.$refs["Form"].clearValidate();
}); });