Explorar el Código

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

YaolongHan hace 4 años
padre
commit
6a8f478565
Se han modificado 3 ficheros con 12 adiciones y 16 borrados
  1. BIN
      src/assets/images/shubiao.png
  2. 3 6
      src/components/edit/attr_select.vue
  3. 9 10
      src/views/drafts.vue

BIN
src/assets/images/shubiao.png


+ 3 - 6
src/components/edit/attr_select.vue

@@ -269,7 +269,7 @@
           <template slot="header">
             <div style="font-size: 12px;color: #8D9399;">
               <a-icon type="exclamation-circle" />
-              <span>键盘操作提示</span>
+              <span style="margin-left: 5px;">键盘操作提示</span>
             </div>
           </template>
 
@@ -280,11 +280,8 @@
           >
             <span>{{item.value}}</span>
             <span class="key-board">{{item.keys}}</span>
-            <span v-if="item.events" style="margin: 0 5px;">
-              +
-              <a-icon type="user" />
-            </span>
-            <span>{{item.events}}</span>
+            <span v-if="item.events" style="margin: 0 5px;">+ <img style="width:13px;height:18px;" src="./../../assets/images/shubiao.png" alt=""></span>
+            <span> {{item.events}}</span>
           </p>
         </a-collapse-panel>
       </a-collapse>

+ 9 - 10
src/views/drafts.vue

@@ -9,6 +9,7 @@
         <div class="conent-tit">
           <div class="tit-left">消防系统-4F</div>
           <div class="tit-right">
+            <a-button>删除</a-button>
             <a-button>发布</a-button>
             <a-button type="primary">编辑</a-button>
           </div>
@@ -22,11 +23,7 @@
           <div class="legend" v-if="legend">
             <div style="font-size:14px;color: #1F2429;padding-left: 12px;height: 40px;line-height: 40px">可能需要补充的图例</div>
             <a-table :columns="columns" :data-source="data" size="middle" :pagination="false">
-              <a-table-column key="name" title="state" data-index="state">
-                <template slot-scope="text, record">
-                  <div style="border:1px solid red;width: 20px;height: 20px;">{{text}}</div>
-                </template>
-              </a-table-column>
+              <img  style="width:10px;heigth:10px" slot="img" slot-scope="text, record" :src="require('@/assets/images/'+record.img+'.png')" />
               <template v-slot:state>
               </template>
             </a-table>
@@ -101,26 +98,28 @@ export default {
         {
           title: "名称", // 列的名称
           dataIndex: "name", // 列的标识
+          scopedSlots: { customRender: 'name' }
         },{
           title: "图例", // 列的名称
-          dataIndex: "state", // 列的标识
+          dataIndex: "img", // 列的标识
+          scopedSlots: { customRender: 'img' }
         },
       ],
       data: [
         {
           key: "1",
           name: "客梯",
-          state:''
+          img:'shubiao'
         },
         {
           key: "2",
           name: "防火分区",
-          state:''
+          img:'shubiao'
         },
         {
           key: "3",
           name: "消防泵室",
-          state:'1'
+          img:'shubiao'
         },
       ],
       legend:false
@@ -177,7 +176,7 @@ export default {
           color: rgba(31, 35, 41, 1);
         }
         .tit-right {
-          width: 146px;
+          width: 246px;
           display: flex;
           justify-content: space-between;
         }