修复bug

imcs-bt-admin/imcs-bt-admin/src/views/zuihou/internetCenter/brandSpecifications/Index.vue

@@ -4,7 +4,7 @@
     <div class="filter-container">
     	<span>
     		<span>{{$t("internet.searchForm.brand")}}：</span>
-    		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    		<el-input v-model="queryParams.model.brand.key" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("internet.searchForm.model")}}：</span>
@@ -54,7 +54,7 @@
 	      </template>
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-      <el-table-column prop="no" :label='$t("internet.table.tools.no")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+      <!--<el-table-column prop="no" :label='$t("internet.table.tools.no")' :show-overflow-tooltip="true" width="100px"></el-table-column>-->
       <el-table-column prop="type.data" :label='$t("internet.table.tools.category")' :show-overflow-tooltip="true" width="150px"></el-table-column>
       <el-table-column prop="brand" :label='$t("internet.table.tools.brand")' :show-overflow-tooltip="true" width="150px"></el-table-column>
       <el-table-column prop="specification" :label='$t("internet.table.tools.specification")' :show-overflow-tooltip="true"></el-table-column>

imcs-bt-admin/imcs-bt-admin/src/views/zuihou/internetCenter/communicationProtocol/Index.vue

@@ -66,7 +66,7 @@
       <el-table-column prop="status" label="状态" align="center" width="120px">
         <template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'info'">
-          	{{ row.status=='1' ? '启用' : '暂停' }}
+          	{{ row.status=='1' ? '启用' : '冻结' }}
           </el-tag>
         </template>
       </el-table-column>

imcs-bt-admin/imcs-bt-admin/src/views/zuihou/internetCenter/moduleMgr/Index.vue

@@ -69,12 +69,19 @@
       @sort-change="sortChange"
       @cell-click="cellClick"
     >
-      <el-table-column align="center" type="selection" width="40px" :reserve-selection="true" />
+      <el-table-column label="序号"  width="55">
+	      <template slot-scope="scope">
+	        <div>
+	          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
+	        </div>
+	      </template>
+      </el-table-column>
+      <el-table-column  type="selection" width="40" :reserve-selection="true" ></el-table-column>
       <el-table-column prop="name" label="模型名称" :show-overflow-tooltip="true" width="200px"></el-table-column>
       <el-table-column prop="no" label="编号" :show-overflow-tooltip="true" width="120px"></el-table-column>
 	  <el-table-column prop="model" label="模型" :show-overflow-tooltip="true" width="120px"></el-table-column>
 	  <el-table-column prop="category.data" label="分类" :show-overflow-tooltip="true" width="120px"></el-table-column>
-      <el-table-column prop="status" label="状态" align="center" width="90px">
+      <el-table-column prop="status" label="状态" width="90">
         <template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'info'">
           	{{ row.status=='1' ? '启用' : '停用' }}

imcs-bt-admin/imcs-bt-admin/src/views/zuihou/internetCenter/productionResourcesMgr/components/Edit.vue

@@ -76,7 +76,7 @@
 				  </el-select>
 				</template>
       </el-form-item>
-      <el-form-item label="所属产线：" prop="orgId">
+      <el-form-item label="所属部门：" prop="orgId">
         <template>		        				
 				<el-tree :check-strictly="true" :data="orgTree" :default-checked-keys="[tenant.orgId]" :filter-node-method="filterNode" @check="nodeClick" default-expand-all highlight-current node-key="id" ref="orgTree" show-checkbox/>
 		</template>		   
@@ -257,8 +257,7 @@ export default {
 	nodeClick(node, data) {        		
 		if (data.checkedKeys.length > 0) {
 			this.$refs.orgTree.setCheckedKeys([node.id]);
-			this.tenant.orgId = node.id
-			alert(this.tenant.orgId)
+			this.tenant.orgId = node.id			
 		}
     },
     initTenant () {