Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -208,10 +208,27 @@ table td {
   box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
   box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
 }
 }
 
 
-.el-table__body tr:hover>td {
+.el-table__body tr:hover>td,
+.el-table__body tr.hover-row>td.el-table__cell {
   background: none !important;
   background: none !important;
 }
 }
 
 
+// table 固定列样式
+tr:hover {
+  background: #063160 !important;
+  box-shadow: inset 0px 0px 20px 0px #03DBFF !important;
+}
+
+.el-table__fixed-right-patch {
+  background-color: #073781;
+}
+
+.el-table__fixed-right {
+  box-shadow: inset 0px 0px 20px 0px #5BE7FF !important;
+  border-left: 3px solid #142e54;
+  background-color: #1f2c3a;
+}
+
 // 表格样式
 // 表格样式
 .el-table th {
 .el-table th {
   height: 48px !important;
   height: 48px !important;

@@ -183,6 +183,26 @@ class data {
             </div>
             </div>
           )
           )
         },
         },
+      },
+      {
+        label: "操作",
+        width: "80",
+        fixed: "right",
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button
+                size="mini"
+                type="primary"
+                onClick={() => {
+                  this.handleEdit(scope.row);
+                }}
+              >
+                编辑
+              </el-button>
+            </div>
+          );
+        },
       }
       }
     ]
     ]
   }
   }

@@ -24,9 +24,8 @@
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="结束日期" prop="endTime">
             <el-form-item label="结束日期" prop="endTime">
-              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
-                @change="endTimeChange"></el-date-picker>
+              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" clearable
+                v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <!-- 操作按钮 -->
           <!-- 操作按钮 -->
@@ -135,6 +134,10 @@ export default {
       this.$refs.ruleForm.resetFields();
       this.$refs.ruleForm.resetFields();
       this.form.currentPage = 1
       this.form.currentPage = 1
       this.featchData();
       this.featchData();
+    },
+    // 编辑
+    handleEdit (row) {
+      console.log(row);
     }
     }
   }
   }
 }
 }

@@ -8,6 +8,7 @@ class data extends filter {
       {
       {
         prop: "name",
         prop: "name",
         label: "菜单名称",
         label: "菜单名称",
+        align: 'left',
         width: 300
         width: 300
       },
       },
       {
       {