Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

src/views/modules/shequzhili/event/eventList.vue

@@ -127,6 +127,8 @@
               </el-select>
 
             </el-form-item>
+            <el-row>
+              <el-col :span="24" align="right">
                 <el-button style="margin-left:30px"
                        size="small"
                        type="primary " 
@@ -135,6 +137,8 @@
                        size="small"
                        class="diy-button--white"
                        @click="resetSearch">重置</el-button>
+              </el-col>
+            </el-row>
           </div>
         </el-form>
       </div>
@@ -151,11 +155,18 @@
                      class="diy-button--white"
                      size="small">导出</el-button>
 
-          <el-button @click="handleMarkDiffcult"
+          <el-dropdown size="small"
-                     size="small"
+                       split-button type="primary"
-                     type="primary"
+                       style="margin:0 10px;height: 32px;"
-                     >标记痛点难点</el-button>
+                       @command="(command) =>handleMarkDiffcult(command, scope.row)"
-
+                       >
+                    标记痛点难点
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="1">标记为难点堵点</el-dropdown-item>
+                      <el-dropdown-item command="2">标记为矛盾纠纷</el-dropdown-item>
+                      <el-dropdown-item command="3">标记为自身问题</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
           <el-button @click="handleCancalDiffcult"
                      class="diy-button--white"
                      size="small">取消标记痛点难点</el-button>
@@ -537,12 +548,12 @@ export default {
       });
       console.log(this.multipleSelection)
     },
-    async handleMarkDiffcult () {
+    async handleMarkDiffcult (command) {
       const url = "/governance/icEvent/difficultpointevent"
 
       let params = {
         icEventIdList: this.multipleSelection,
-        type: "1"
+        type: command
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -834,4 +845,8 @@ export default {
     width: 200px;
   }
 }
+  ::v-deep .el-dropdown__caret-button{
+  height: 32px;
+}
+
 </style>