Merge branch 'dev' into feature

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

@@ -119,7 +119,16 @@
             <div class="m-table">
                 <div class="div_btn">
                     <el-button size="small" type="primary " @click="handleAdd">新增</el-button>
-
+                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                        @command="(command) => handleMarkDiffcult(command)">
+                        标记
+                        <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-item command="4">标记为超出服务范围</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
 
                     <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"

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

@@ -29,14 +29,15 @@
                       <div class="m-info-prop" style="flex: 0 0 50%;">
                         <span class="u-info-title-2">照片: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.picture || "--" }}</span>
+                        <span><img :src="formData.picture" style="width: 50px;height: 50px;"/></span>
                       </div>
                   </div>
                   <div style="display: flex;">
                       <div class="m-info-prop" style="flex: 0 0 50%;">
                         <span class="u-info-title-2">二维码: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.code || "--" }}</span>
+<!--                        <span>{{ formData.code || "&#45;&#45;" }}</span>-->
+                        <span><img :src="formData.code" style="width: 50px;height: 50px;"/></span>
                       </div>
                   </div>
 

src/views/modules/shequzhili/materialcode/icmaterialcode.vue

@@ -46,10 +46,10 @@
 
         <el-table-column prop="name" label="名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="introduce" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="picture" label="图片" header-align="center" align="center">
+        <el-table-column prop="picture" label="图片" header-align="center" align="center" >
 
-          <template slot-scope="scope">
-              <img :src="scope.row.picture"/>
+          <template slot-scope="scope" >
+              <img :src="scope.row.picture" style="width: 50px;height: 50px;"/>
           </template>
 
         </el-table-column>
@@ -66,7 +66,7 @@
             <el-button type="text" style="color:#1C6AFD;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small"
-                       @click="download(scope.row)">下载</el-button>
+                       @click="download(scope.row)">二维码</el-button>
           </template>
         </el-table-column>
       </el-table>