From db327376fcc8ad62b4b9baabbc4110c96821646c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 25 Mar 2022 10:20:35 +0800
Subject: [PATCH] coding261

---
 hb_client/src/components/customForm/index.vue  | 16 +++++++++-------
 hb_client/src/components/customForm/review.vue |  2 ++
 hb_client/src/views/bigScreen/bottomLeft.vue   |  7 ++-----
 hb_client/src/views/bigScreen/index.vue        | 11 ++++++-----
 hb_client/src/views/mtm/material.vue           |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index 81627ee..ad62842 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@@ -18,7 +18,7 @@
           <el-form-item
             v-if="item.field_type === 'string'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-input
               v-model="checkForm[item.field_key]"
@@ -29,7 +29,7 @@
           <el-form-item
             v-else-if="item.field_type === 'int'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-input-number
               style="width: 100%;"
@@ -43,7 +43,7 @@
           <el-form-item
             v-else-if="item.field_type === 'float'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-input-number
               style="width: 100%;"
@@ -57,7 +57,7 @@
           <el-form-item
             v-else-if="item.field_type === 'date'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-date-picker
               v-model="checkForm[item.field_key]"
@@ -65,13 +65,14 @@
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
               style="width: 100%"
+              @input="$forceUpdate()"
               @change="keyChange($index,item.field_key)"
             />
           </el-form-item>
           <el-form-item
             v-else-if="item.field_type === 'datetime'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-date-picker
               v-model="checkForm[item.field_key]"
@@ -79,13 +80,14 @@
               placeholder="选择日期"
               value-format="yyyy-MM-dd HH:mm:ss"
               style="width: 100%"
+              @input="$forceUpdate()"
               @change="keyChange($index,item.field_key)"
             />
           </el-form-item>
           <el-form-item
             v-else-if="item.field_type === 'select'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-select
               v-model="checkForm[item.field_key]"
@@ -104,7 +106,7 @@
           <el-form-item
             v-else-if="item.field_type === 'selects'"
             :label="item.field_name"
-            :required="require"
+            required
           >
             <el-select
               v-model="checkForm[item.field_key]"
diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue
index c410230..045344d 100644
--- a/hb_client/src/components/customForm/review.vue
+++ b/hb_client/src/components/customForm/review.vue
@@ -97,6 +97,7 @@
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
+              @input="$forceUpdate()"
               @change="keyChange($index,item.field_key)"
             />
             <el-date-picker
@@ -105,6 +106,7 @@
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
+              @input="$forceUpdate()"
               @change="keyChange($index,item.field_key)"
             />
           </el-form-item>
diff --git a/hb_client/src/views/bigScreen/bottomLeft.vue b/hb_client/src/views/bigScreen/bottomLeft.vue
index db1b193..0909294 100644
--- a/hb_client/src/views/bigScreen/bottomLeft.vue
+++ b/hb_client/src/views/bigScreen/bottomLeft.vue
@@ -109,7 +109,7 @@
           }
         },*/
         legend: {
-          data: [" 计划完成", " 已完成 "],
+          data: ["已完成", "计划完成"],
           textStyle: {
             color: "#B4B4B4"
           },
@@ -133,10 +133,7 @@
         },
         yAxis:{
           splitLine: {
-            type:"dashed",
-            color: "#B4B4B4",
-            width:"1",
-            // show: true,
+            show: false
           },
           axisLine: {
             lineStyle: {
diff --git a/hb_client/src/views/bigScreen/index.vue b/hb_client/src/views/bigScreen/index.vue
index 5bb5200..8a71ee7 100644
--- a/hb_client/src/views/bigScreen/index.vue
+++ b/hb_client/src/views/bigScreen/index.vue
@@ -96,14 +96,14 @@
           </div>
           <!-- 第四行数据 -->
           <div class="bototm-box">
-            <dv-border-box-3 v-if="limitedTwo">
+            <dv-border-box-3 v-if="listNews">
               <bottomRight
                 :configArticle="configArticle"
               />
             </dv-border-box-3>
             <dv-border-box-13>
               <bottomLeft
-                v-if="limitedTwo"
+                v-if="limitedPlan"
                 :category="category"
                 :planData="planData"
                 :realData="realData"
@@ -146,6 +146,7 @@
         processRate: false,
         listUser: false,
         listNews: false,
+        limitedPlan: false,
         listProcess: false,
         create_time_start: '',
         titleItem: [
@@ -699,7 +700,7 @@
       //任务完成进度
       getPageData() {
         let that = this;
-        that.listNews = false;
+        that.limitedPlan = false;
         getPlanGantt({type: 'big_screen'}).then(res => {
           if (res.code === 200) {
             let list = res.data.results;
@@ -707,8 +708,8 @@
               that.category.push(item.number);
               that.planData.push(item.count);
               that.realData.push(item.count_ok);
-            })
-            that.listNews = true;
+            });
+            that.limitedPlan = true;
           } else {
             that.$message.error(res.msg);
           }
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 5bb2a00..3a4e51d 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -63,9 +63,9 @@
         <el-table-column label="规格型号">
           <template slot-scope="scope">{{ scope.row.specification }}</template>
         </el-table-column>
-        <el-table-column label="单片玻璃数量" v-if="materialList.results[0].type==1">
+        <!--<el-table-column label="单片玻璃数量" v-if="materialList.results[0].type==1">
           <template slot-scope="scope">{{ scope.row.piece_count }}</template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column label="计量单位">
           <template slot-scope="scope">{{ scope.row.unit }}</template>
         </el-table-column>