wenbobowen 4 년 전
부모
커밋
87f96de902

+ 16 - 7
src/components/formInput/index.vue

@@ -11,6 +11,7 @@
       :size="size"
       clearable
       :placeholder="placeholder"
+      :style="itemStyles"
       @change="(e) => $emit('onChange', e)"
     />
     <!-- number -->
@@ -18,7 +19,7 @@
       v-else-if="type === 'number'"
       v-model="val"
       :size="size"
-      style="width:194px"
+      :style="itemStyles"
       :placeholder="placeholder"
       @change="(e) => $emit('onChange', e)"
     />
@@ -29,6 +30,7 @@
       :size="size"
       type="textarea"
       :placeholder="placeholder"
+      :style="itemStyles"
       @change="(e) => $emit('onChange', e)"
     />
     <!-- 静态下啦选择 -->
@@ -40,6 +42,7 @@
       clearable
       filterable
       :placeholder="placeholder"
+      :style="itemStyles"
       @change="(e) => $emit('onChange', e)"
     >
       <el-option v-for="o in option" :key="o.value" :label="o.label" :value="o.value" />
@@ -56,6 +59,7 @@
       :remote-method="(q) => $emit('remoteMethod', q)"
       :loading="loading"
       :size="size"
+      :style="itemStyles"
       @change="(e) => $emit('onChange', e)"
     >
       <slot v-if="hasSlot" name="option" />
@@ -69,7 +73,7 @@
       value-format="yyyy-MM-dd hh:mm:ss"
       type="datetime"
       :placeholder="placeholder"
-      style="width:194px"
+      :style="itemStyles"
       @change="(e) => $emit('onChange', e)"
     />
   </div>
@@ -82,6 +86,16 @@ export default {
       type: String,
       required: true
     },
+    itemStyles: {
+      type: Object,
+      default: () => {},
+      required: false
+    },
+    styles: {
+      type: Object,
+      default: () => {},
+      required: false
+    },
     type: {
       type: String,
       default: 'input',
@@ -117,11 +131,6 @@ export default {
       default: false,
       required: false
     },
-    styles: {
-      type: Object,
-      default: () => {},
-      required: false
-    },
     placeholder: {
       type: String,
       default: '',

+ 16 - 9
src/views/projectManage/onlineproblem/component/chart.vue

@@ -2,15 +2,18 @@
   <div class="op-chart">
     <!-- 按月份 等级 影响面  -->
     <div class="chartSearchbar">
-      <el-select
-        v-model="type"
-        size="small"
-        filterable
-        style="width: 100px"
-        @change="$emit('search', 'type', type)"
-      >
-        <el-option v-for="(t, index) in dataListType" :key="index" :label="t.label" :value="t.value" />
-      </el-select>
+      <div>
+        <span class="label">分布类型:</span>
+        <el-select
+          v-model="type"
+          size="small"
+          filterable
+          style="width: 100px"
+          @change="$emit('search', 'type', type)"
+        >
+          <el-option v-for="(t, index) in dataListType" :key="index" :label="t.label" :value="t.value" />
+        </el-select>
+      </div>
       <el-select
         v-model="year"
         size="small"
@@ -94,6 +97,10 @@ export default {
     display: flex;
     justify-content: space-between;
     padding: 0 5%;
+    .label {
+      font-size: 14px;
+      color: #444;
+    }
   }
 }
 </style>

+ 11 - 10
src/views/projectManage/onlineproblem/component/list.vue

@@ -27,7 +27,7 @@
         <el-table-column label="责任团队" min-width="150" prop="teamName" show-overflow-tooltip align="center" />
         <el-table-column label="复盘链接" show-overflow-tooltip align="center">
           <template slot-scope="scope">
-            <i class="el-icon-link" @click="goto(scope.row.replayUrl)" />
+            <i v-if="scope.row.replayUrl" class="el-icon-link" @click="goto(scope.row.replayUrl)" />
           </template>
         </el-table-column>
         <el-table-column label="改进项已完成" min-width="130" show-overflow-tooltip align="center">
@@ -37,7 +37,11 @@
               <i class="el-icon-info" />
             </el-tooltip>
           </template>
-          <template slot-scope="scope">{{ scope.row.finishImpr }}/{{ scope.row.imprTotal }}</template>
+          <template slot-scope="scope">
+            <span :class="scope.row.finishImpr !== scope.row.imprTotal && 'origin'">{{ scope.row.finishImpr }}</span>
+            /
+            <span :class="scope.row.finishImpr !== scope.row.imprTotal && 'origin'">{{ scope.row.imprTotal }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="是否星辰花定级" min-width="130" show-overflow-tooltip align="center">
           <template slot-scope="scope">{{ scope.row.isGrading ? '是' : '否' }}</template>
@@ -81,20 +85,14 @@ export default {
       window.open(href, '_blank')
     },
     goto(url) {
-      if (url) {
-        window.open(url, '_blank')
-      } else {
-        this.$message({
-          message: `暂未设置复盘链接`,
-          type: 'warning'
-        })
-      }
+      window.open(url, '_blank')
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 .list {
+  padding-bottom: 40px;
   .tableTitle{
     color: #333;
     font-size: 16px;
@@ -109,6 +107,9 @@ export default {
       background: #f5f7fa;
     }
   }
+  .origin {
+    color: #EE7546;
+  }
   .div_priority {
     display: inline-block;
     text-align: center;

+ 2 - 1
src/views/projectManage/onlineproblem/create/component/base.vue

@@ -10,6 +10,7 @@
         :multiple="d.multiple"
         :value="data[d.key]"
         :requried="d.requried"
+        :item-styles="item.length > 1 && { width: '200px' }"
         @onChange="(e) => $emit('onChange', d.key, e )"
         @remoteMethod="(e) => remoteMethod(d.key, e, d.utilName)"
       />
@@ -61,7 +62,7 @@ export default {
 <style scoped lang="scss">
 .base{
   .formLine {
-    margin: 24px 0px;
+    margin: 15px 0px;
   }
 }
 </style>

+ 14 - 1
src/views/projectManage/onlineproblem/detial/component/base.vue

@@ -148,6 +148,7 @@
           <template slot="active">
             <el-input
               v-model="data.desc"
+              class="textarea"
               :size="size"
               type="textarea"
               placeholder="请填写描述"
@@ -155,7 +156,7 @@
             />
           </template>
           <template slot="overMouse">
-            <span>{{ data.desc }}</span>
+            <span class="textLine">{{ data.desc }}</span>
           </template>
         </over-click>
       </el-form-item>
@@ -212,6 +213,15 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+.wb-base {
+  .textLine {
+    word-wrap: break-word;
+    // display: inherit;
+    word-break: normal;
+  }
+}
+</style>
 <style lang="scss">
 .wb-base {
   .demo-form-inline {
@@ -225,6 +235,9 @@ export default {
       .el-form-item__content {
         width: calc(100% - 150px);
       }
+      .el-form-item__content {
+        line-height: 18px;
+      }
     }
     >>>.el-form-item__content {
       width: calc(100% - 340px);