+ 多租户变更

src/store/modules/user.js

@@ -63,9 +63,10 @@ const user = {
     // 获取用户信息
     GetInfo({commit, state}) {
       return new Promise(async (resolve, reject) => {
+        let defaultTenant;
         const {rows} = await listTenant()
         if (rows.length > 0) {
-          commit('SET_TENANT', rows[0].id)
+          defaultTenant = rows[0].id
         }
         getInfo().then(res => {
           const user = res.user
@@ -80,8 +81,9 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           if (user.tenantId) {
-            commit('SET_TENANT', user.tenantId)
+            defaultTenant = user.tenantId
           }
+          commit('SET_TENANT', defaultTenant)
           resolve(res)
         }).catch(error => {
           reject(error)

src/views/cons/consUnit/index.vue

@@ -120,7 +120,7 @@
             type="text"
             icon="el-icon-upload"
             @click="handleImport(scope.row)"
-            v-hasPermi="['cons:consUnitInfo:edit']"
+            v-hasPermi="['cons:consUnitInfo:editCAD']"
           >
             {{
               $t('cons.uploadCAD')
@@ -132,7 +132,7 @@
             type="text"
             icon="el-icon-set-up"
             @click="handleAssign(scope.row)"
-            v-hasPermi="['cons:consUnitInfo:edit']"
+            v-hasPermi="['cons:consUnitInfo:assignMachine']"
           >
             {{
               $t('cons.assignMachine')
@@ -144,6 +144,7 @@
             type="text"
             icon="el-icon-download"
             @click="handleExport(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:downloadCAD']"
           >
             {{
               $t('cons.downloadFinishDrawing')
@@ -155,6 +156,7 @@
             type="text"
             icon="el-icon-download"
             @click="handleExportCsv(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:downloadCSV']"
           >
             {{
               $t('cons.downloadPileData')