diff --git a/hb_client/src/views/bigScreen/centerRight1.vue b/hb_client/src/views/bigScreen/centerRight1.vue index 2b5b409..f8ce660 100644 --- a/hb_client/src/views/bigScreen/centerRight1.vue +++ b/hb_client/src/views/bigScreen/centerRight1.vue @@ -9,9 +9,12 @@ 人员到岗情况 -
- +
+
+ +
+
diff --git a/hb_client/src/views/bigScreen/index.vue b/hb_client/src/views/bigScreen/index.vue index 30a77ec..444ee1e 100644 --- a/hb_client/src/views/bigScreen/index.vue +++ b/hb_client/src/views/bigScreen/index.vue @@ -300,7 +300,7 @@ }, //人员到岗 userConfig: { - header: ['姓名', '到岗情况'], + header: ['姓名', '到岗情况','部门'], data: [ ['冯宝宝', "已到岗"] ], @@ -420,7 +420,7 @@ ], limitedTwo: false, configArticle: { - header: ['标题', '置顶', '作者', '发布时间'], + header: ['标题', '置顶', '发布时间'], data: [ ['郑成功', '2022-03-05'], ['冯宝宝', '2022-03-05'] @@ -669,6 +669,7 @@ that.listUser = false; getEmployee({page: 0,type:'big_screen',show_atwork:true}).then((response) => { if (response.data) { + // debugger; let list = response.data; let data = []; list.forEach(item => { @@ -676,10 +677,11 @@ obj.push(item.name); // obj.push(item.dept_.name); if (item.is_atwork) { - obj.push("已到岗") + obj.push("已到岗") } else { - obj.push("未到岗") + obj.push("未到岗") } + obj.push(item.dept_.name); data.push(obj) }); that.userConfig.data = data; @@ -704,7 +706,7 @@ } else { obj.push('已置顶'); } - obj.push(item.author); + // obj.push(item.author); obj.push(item.create_time); data.push(obj) }); diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index 6deb6f1..b12d695 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -241,66 +241,76 @@ - - - - - - - - - - - - - - - - - - - - - + + + + {{item.help_text}} + + + + {{item.help_text}} + + + + {{item.help_text}} + + + - - - - - - + + {{item.help_text}} + + + - - - + type="datetime" + placeholder="选择日期" + value-format="yyyy-MM-dd HH:mm:ss" + style="width:100%" + > + + {{item.help_text}} + + + + + + + {{item.help_text}} + + + + + + + {{item.help_text}} + + @@ -342,6 +352,9 @@ + + + @@ -459,6 +472,7 @@ enabled: true }; const defaultfield = {}; + const defaultfield1 = {field_type: '', field_key: '', field_name: '', sort: '', field_choice: [""],}; export default { components: {Pagination, vueJsonEditor}, data() { @@ -593,6 +607,9 @@ this.getFormList(); }, methods: { + checkValue() { + this.field.field_key = this.field.field_key.replace(/[^0-9a-zA-Z]/g, ''); + }, getProductList(){ getMaterialList({page:0,type:1}).then((response) => { if (response.data) { @@ -784,9 +801,10 @@ //新增字段 handlefieldCreate() { this.field_choice = ['']; - this.field = Object.assign({}, defaultfield); + this.field = Object.assign({}, defaultfield1); this.dialogType1 = "new"; this.dialogVisible1 = true; + this.$nextTick(() => { this.$refs["Form"].clearValidate(); });