Merge branch 'master' of git.xiaojukeji.com:jacklijiajia/thoth-frontend

src/views/data/index.vue

@@ -4,7 +4,7 @@
       <div slot="header">
         <span>{{ subMenu.subMenuName }}</span>
       </div>
-      <el-form label-width="100px" :rules="rules">
+      <el-form label-width="150px" :rules="rules">
         <el-form-item v-for="(item,index) in widgets" :key="index" :label="item.label" :prop="item.name">
           <el-input v-if="item.widgetType === 'INPUT'" v-model="data[item.name]" :placeholder="item.placeHolder" />
           <el-select v-if="item.widgetType === 'SELECT'" v-model="data[item.name]" :placeholder="item.placeHolder" @change="handleChange(item,data[item.name])">
@@ -48,7 +48,10 @@
   width: 50%;
 }
 .el-select {
-  width: 50%;
+  width: 70%;
+}
+.el-input {
+  width: 70%;
 }
 .result {
   padding: 2%;
@@ -89,16 +92,15 @@ export default {
       }
       this.data = {}
       this.result = ''
-      // this.rules = {}
-      // for (var i in newValue.widgets) {
-      //   console.log(i)
-      //   if (newValue.widgets[i].widgetType === 'INPUT') {
-      //     this.rules[newValue.widgets[i].name] = [{ required: true, message: '请输入' + newValue.widgets[i].label, trigger: 'blur' }]
-      //   } else if (newValue.widgets[i].widgetType === 'SELECT') {
-      //     this.rules[newValue.widgets[i].name] = [{ required: true, message: '请选择' + newValue.widgets[i].label, trigger: 'change' }]
-      //   }
-      // }
-      // console.log(this.rules)
+    }
+  },
+  created() {
+    for (const i in this.subMenu.widgets) {
+      if (this.subMenu.widgets[i].widgetId === 0) {
+        this.widgets.push(this.subMenu.widgets[i])
+      } else {
+        this.hidenWidgets.push(this.subMenu.widgets[i])
+      }
     }
   },
   methods: {

src/views/online-quality/BlockServer/blockServer.vue

@@ -110,7 +110,7 @@ export default {
         lineName: 'prado',
         lineId: 5
       }, {
-        lineName: 'b2b',
+        lineName: '企业级',
         lineId: 7
       }
       ]

src/views/online-quality/CheckConfig/index.vue

@@ -110,7 +110,7 @@ export default {
         lineName: 'prado',
         lineId: 5
       }, {
-        lineName: 'b2b',
+        lineName: '企业级',
         lineId: 7
       }
       ],

src/views/online-quality/HistoryTask/taskDetails.vue

@@ -192,7 +192,7 @@ export default {
             if (this.task.jenkinsResultDO.cases) {
               this.task.jenkinsResultDO.cases = JSON.parse(this.task.jenkinsResultDO.cases)
             }
-            this.isJenkensResultShow = true
+            this.isJenkensResultShow = this.task.isBuild
           }
         })
     }