解决冲突

liuyg

2021-08-14 ff066fb8d926d9a75efdcfdfc1b37f890cd98d82

 src/views/securityUnit/index.vue

@@ -23,7 +23,7 @@
            :type="type"
            @click="handleUploadPage(row)"
            icon="el-icon-circle-check"
            >单位装备清单附件上传
            >附件上传
          </el-button>
        </template>
        <template slot="menuLeft">
@@ -285,7 +285,7 @@
        searchSize: "mini",
        searchMenuSpan: 6,
        height: 583,
        menuWidth: 290,
        menuWidth: 220,
        align: "center",
        selection: true,
        column: column,