Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/views/login/index.vue

@@ -239,7 +239,7 @@
       	activeName: 'first',
         //是否启用多租户
         isMultiTenant:
-          process.env.VUE_APP_IS_MULTI_TENANT === "true" ? true : false,
+         false,
         isCaptcha:
           process.env.VUE_APP_IS_CAPTCHA === "true" ? true : false,
         tabActiveName: "bindLogin",

imcs-ui/src/views/zuihou/prepareProductMgr/technologyMgr/components/TechnologyTable.vue

@@ -5,7 +5,7 @@
     <el-row class="filter-container">
     	<el-col>
     		<el-button type="primary" :disabled="currBtn" icon="el-icon-document" size="medium" @click="add">{{$t("prepare.buttons.viewTech")}}</el-button>
-    		<el-button type="primary" :disabled="currBtn" icon="el-icon-bangzhu" size="medium" @click="autoAdd">{{$t("prepare.buttons.autoMatic")}}</el-button>
+    		<el-button type="primary" :disabled="currBtn" icon="el-icon-bangzhu" size="medium" @click="autoAdd" v-hasPermission="['technologyVersion:automatic']">{{$t("prepare.buttons.autoMatic")}}</el-button>
     	</el-col>
     </el-row>
 

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/Index.vue

@@ -35,8 +35,8 @@
 	      <el-button v-has-permission="['technologyVersion:pushaudit']" type="warning" icon="el-icon-folder-add" size="medium" @click="audioStatus('1')">{{$t("common.audio.addAudio")}}</el-button>
 	      <el-button v-has-permission="['technologyVersion:audit']" type="success" icon="el-icon-folder-checked" size="medium" @click="audioBtn()">{{$t("common.audio.audio")}}</el-button>
 	      <el-button v-has-permission="['technologyVersion:set']" type="primary" icon="el-icon-box" size="medium" @click="setUse">{{$t("prepare.buttons.setUse")}}</el-button>
-	      <el-button v-has-permission="['technologyVersion:export']" type="primary" icon="el-icon-download" size="medium" @click="">{{$t("prepare.buttons.loadTechn")}}</el-button>
-	      <el-button v-has-permission="['technologyVersion:copy']" type="primary" icon="el-icon-document-copy" size="medium" @click="">{{$t("prepare.buttons.copyVision")}}</el-button>
+	      <el-button v-has-permission="['technologyVersion:export']" type="primary" icon="el-icon-download" size="medium" >{{$t("prepare.buttons.loadTechn")}}</el-button>
+	      <el-button v-has-permission="['technologyVersion:copy']" type="primary" icon="el-icon-document-copy" size="medium" >{{$t("prepare.buttons.copyVision")}}</el-button>
 	      <el-button v-has-permission="['technologyVersion:delete']" type="danger" icon="el-icon-delete" size="medium" @click="deleteOne">{{$t("table.delete")}}</el-button>
     	</el-col>
     </el-row>

imcs-ui/src/views/zuihou/resourceProductMgr/deviceMgr/Index.vue

@@ -64,7 +64,7 @@
       </el-table-column>
       <el-table-column prop="name" :label='$t("resource.table.resours.name")' :show-overflow-tooltip="true" width="180px"></el-table-column>
       <el-table-column prop="code" :label='$t("resource.table.resours.no")' :show-overflow-tooltip="true" width="100px"></el-table-column>
-      <el-table-column prop="brand" :label='$t("resource.table.resours.brand")' width="100px"></el-table-column>
+      <el-table-column prop="brand" :label='$t("resource.table.resours.brand")' width="100px" v-if="this.$store.state.account.permissions.includes('resource:superview')"></el-table-column>
       <el-table-column prop="specification" :label='$t("resource.table.resours.specification")'></el-table-column>
       
 	  <el-table-column prop="capitalNo" :label='$t("resource.table.resours.capitalNo")'></el-table-column>
@@ -76,7 +76,7 @@
       <el-table-column prop="productionNo" :label='$t("resource.table.resours.productionNo")'></el-table-column>
 	  <el-table-column prop="manufacturer" :label='$t("resource.table.resours.manufacturer")'></el-table-column>
    
-	  <el-table-column prop="model" :label='$t("resource.table.resours.model")'></el-table-column>
+	  <el-table-column prop="model" :label='$t("resource.table.resours.model")' v-if="this.$store.state.account.permissions.includes('resource:superview')" ></el-table-column>
       <el-table-column prop="category.data" :label='$t("resource.table.resours.category")' width="100px"></el-table-column>
       <el-table-column prop="zoneName" :label='$t("resource.table.resours.zoneName")' width="180px"></el-table-column>
       <el-table-column prop="positionCount" :label='$t("resource.table.resours.nums")' width="120px"></el-table-column>
@@ -117,28 +117,28 @@
 	            @click="view(row)"
 	          />
           </el-tooltip>-->
-          <el-tooltip class="item" :content='$t("resource.buttons.work")' effect="dark" placement="top-start">
+          <el-tooltip class="item" :content='$t("resource.buttons.work")' effect="dark" placement="top-start" v-hasPermission="['resource:superview']">
 	          <i
 	            class="el-icon-location-information table-operation"
 	            style="color: #2db7f5;"
 	            @click="equipment(row)"
 	          />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.setting")' effect="dark" placement="top-start">
+          <el-tooltip class="item" :content='$t("resource.buttons.setting")' effect="dark" placement="top-start" v-hasPermission="['resource:superview']">
 	          <i
 	            class="el-icon-setting table-operation"
 	            style="color: #2db7f5;"
 	            @click="edit(row)"
 	          />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.hardware")' effect="dark" placement="top-start">
+          <el-tooltip class="item" :content='$t("resource.buttons.hardware")' effect="dark" placement="top-start" v-hasPermission="['resource:superview']">
 	          <i
 	            class="el-icon-s-help table-operation"
 	            style="color: #2db7f5;"
 	            @click="editHardware(row)"
 	          />
           </el-tooltip>
-		  <el-tooltip class="item" :content='$t("resource.buttons.autoCode")' effect="dark" placement="top-start" v-if="row.isAutoCode=='1'">
+		  <el-tooltip class="item" :content='$t("resource.buttons.autoCode")' effect="dark" placement="top-start" v-if="row.isAutoCode=='1'"  v-hasPermission="['resource:superview']">
 	          <i
 	            class="el-icon-place table-operation"
 	            style="color: #2db7f5;"