Merge branch 'nanjing-zhongyan' of https://gitlab.hzleaper.com:81/duoji/duoji-frontend into nanjing-zhongyan

src/layouts/PageHeader.vue

@@ -46,7 +46,7 @@ export default {
             collapsed: false,
             count: 0,
             title: "",
-            indexlogo:require('@/assets/indexlogo.png'),
+            //indexlogo:require('@/assets/indexlogo.png'),
         };
     },
     mounted() {

src/views/historyCheck/index.vue

@@ -96,7 +96,7 @@
                {{ text }}
           </span>
           <span slot="goodsLocation" slot-scope="text">
-               {{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
+            {{text.streetName }}-{{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
           </span>
           <span slot="status" slot-scope="text">
                {{ statusMap[text.status] }}
@@ -152,7 +152,7 @@ export default {
                     dataIndex: "lotnum",
                 },
                 {
-                    title: "货位({左右}-{深浅}-{行}-{列})",
+                    title: "巷道-货位({左右}-{深浅}-{行}-{列})",
                     scopedSlots: {customRender: 'goodsLocation'},
                 },
                 {