rev:更新

nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import Logo from '@/assets/images/newloge.png'
+import Logo from '@/assets/images/newlogo.png'
 import variables from '@/assets/styles/variables.scss'
 export default {
   name: 'SidebarLogo',

nladmin-ui/src/views/acs/route/routeLine/index.vue

@@ -178,12 +178,12 @@
         />
         <el-table-column prop="start_device_type" min-width="120" :label="$t('route.table_title.device_type')" />
         <el-table-column v-if="false" prop="device_code" :label="$t('device.device_table_title.device_name')" />
-        <el-table-column prop="type" :label="$t('route.table_title.type')">
-          <template slot-scope="scope">
-            <span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span>
-            <span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>
-          </template>
-        </el-table-column>
+<!--        <el-table-column prop="type" :label="$t('route.table_title.type')">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span>-->
+<!--            <span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column prop="next_device_code" min-width="120" :label="$t('route.table_title.next_device_code')" />
         <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称" />
         <el-table-column prop="next_device_type" min-width="120" :label="$t('route.table_title.next_device_type')" />