解决页面展示Bug

imcs-ui/src/lang/zh/lineSide.js

@@ -42,7 +42,9 @@ export default {
 			productName: '产品名称',
 			productGuige: '产品名称',
 			productNo: '产品名称',
-			wareType: '库位类型'
+			wareType: '库位类型',
+			lockStatus: '库位状态',
+			no: '库位编号'
 		},
 		// 按钮的名称--特殊点的按钮信息
 	  	buttons: {

imcs-ui/src/lang/zh/machining.js

@@ -88,6 +88,7 @@ export default {
 			// 质量中心-质量管理
 			qualityMgr: {
 				orderNo: '订单编号',
+				orderName: '订单名称',
 				bomName: '零件名称',
         produceStatus: '生产状态',
 				testResult: '订单状态',

imcs-ui/src/views/zuihou/auth/role/RoleAuthority.vue

@@ -32,7 +32,7 @@
                   :default-checked-keys="roleAuthority.menuIdList"
                   :default-expanded-keys="roleAuthority.menuIdList"
                   :disabled="disabled"
-                  :expand-on-click-node="false"
+                  :expand-on-click-node="false"                  
                   @check="checkMenu"
                   @node-click="nodeClick"
                   default-expand-all
@@ -157,7 +157,8 @@
         return "配置菜单资源";
       }
     },
-    watch: {},
+    watch: {
+    },
     mounted() {
       this.initMenuTree();
       window.onresize = () => {
@@ -266,7 +267,14 @@
 
       initMenuTree() {
         menuApi.allTree().then(response => {
-          const res = response.data;
+          const res = response.data;   
+          /* 
+          console.log(res.data)
+          console.log(this.roleAuthority.menuIdList)     
+          res.data = res.data.filter(item => {
+             return this.allMenuIdList().indexOf(item.id)>-1
+          })  */
+          //console.log(this.allMenuIdList())
           this.menuTree = res.data;
         });
       },
@@ -298,9 +306,10 @@
           vm.roleAuthority.resourceIdList = res.data.resourceIdList;
           vm.echoResourceIdList = res.data.resourceIdList;
           vm.$refs.menuTree.setCheckedKeys(res.data.menuIdList);
+          /*
           res.data.menuIdList.forEach(item => {
             vm.selectedParent(item);
-          });
+          }); */
         });
       },
       close() {

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideMgr/Index.vue

@@ -29,18 +29,24 @@
 		    	<span>
 		    		<span>{{$t("lineSide.searchForm.productName")}}：</span>
 		    		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+		    	</span>
+				<!--
+				<span>
+		    		<span>{{$t("lineSide.searchForm.no")}}：</span>
+		    		<el-input v-model="queryParams.model.no" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
 		    	</span>
 		    	<span style="margin-left: 15px;">
-		    		<span>{{$t("lineSide.searchForm.wareType")}}：</span>
-		    		<el-select v-model="queryParams.model.storgeTypeId" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
+		    		<span>{{$t("lineSide.searchForm.lockStatus")}}：</span>
+		    		<el-select v-model="queryParams.model.lockStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
 		        	<el-option
-					      v-for="item in wareTypeList"
+					      v-for="item in statusList"
 					      :key="item.id"
 					      :label="item.name"
 					      :value="item.id">
 					    </el-option>
 		      	</el-select>
-		    	</span>
+		    	</span> 
+				-->
 		      <span style="margin-left: 15px;">
 			      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
 			        {{ $t("common.search") }}
@@ -175,6 +181,7 @@
 	  data () {
 	    return {
 	    	wareTypeList: [], // 库位类型下拉数据
+			statusList:[{id:0,name:"空闲"},{id:1,name:"锁定"}],
 	    	audioStatus: [],
 	    	dialogPro: {
 	        isVisible: false,

imcs-ui/src/views/zuihou/qualityCenter/qualityMgr/Index.vue

@@ -6,11 +6,11 @@
     		<span>{{$t("machining.table.qualityMgr.bomName")}}：</span>
     		<el-input v-model="queryParams.model.bomName" :placeholder='$t("common.pleaseEnter")' style="width: 180px;" size="medium"/>
     	</span>
-		<!--
+		<!--  -->
     	<span style="margin-left: 15px;">
-    		<span>{{$t("machining.common.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 180px;" size="medium"/>
-    	</span> -->
+    		<span>{{$t("machining.table.qualityMgr.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 180px;" size="medium"/>
+    	</span>
 <!--    	<span style="margin-left: 15px;">-->
 <!--    		<span>{{$t("machining.table.qualityMgr.produceStatus")}}：</span>-->
 <!--    		<el-select v-model="queryParams.model.produceStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 180px;">-->
@@ -82,12 +82,12 @@
 	      </template>
       </el-table-column>
       <!-- 序号 -->
-      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-      <!-- 订单编号 
-      <el-table-column prop="orderNo" :label='$t("machining.table.qualityMgr.orderNo")' :show-overflow-tooltip="true"></el-table-column> -->
+      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />      
       <!-- 零件简称 -->
       <el-table-column prop="bomName" :label='$t("machining.table.qualityMgr.bomName")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 来源
+      <!-- 订单编号--> 
+      <el-table-column prop="orderName" :label='$t("machining.table.qualityMgr.orderName")' :show-overflow-tooltip="true"></el-table-column>
+	 <!-- 来源
       <el-table-column prop="uniqueCode" :label='$t("machining.table.qualityMgr.uniqueCode")' width="100" :show-overflow-tooltip="true"></el-table-column>-->
       <!-- 生产状态 -->
       <el-table-column prop="produceStatus" :label='$t("machining.table.qualityMgr.produceStatus")' :show-overflow-tooltip="true">
@@ -100,9 +100,7 @@
       </el-table-column>
       <!-- 产品数量 -->
       <el-table-column prop="bomNum" :label='$t("machining.table.qualityMgr.bomNum")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 生产中 -->
-     <el-table-column prop="finishedNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>
-
+      
       <el-table-column prop="completeNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="unqualifiedCount" :label='$t("machining.table.qualityMgr.unqualifiedCount")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="qualifiedCount" :label='$t("machining.table.qualityMgr.qualifiedCount")' :show-overflow-tooltip="true"></el-table-column>

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

@@ -58,7 +58,7 @@
 	      </template>
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-      <el-table-column prop="pic" :label='$t("resource.table.resours.pic")' align="center" width="150px">
+      <el-table-column prop="pic" :label='$t("resource.table.resours.pic")' align="center" >
       	<template slot-scope="{ row }">
       		<div v-if="row.pic" class="demo-image__preview">
 					  <el-image
@@ -70,13 +70,13 @@
 					<span v-else="">{{$t("common.noData")}}</span>
       	</template>
       </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="name" :label='$t("resource.table.resours.name")' :show-overflow-tooltip="true" ></el-table-column>
+      <el-table-column prop="code" :label='$t("resource.table.resours.no")' :show-overflow-tooltip="true" ></el-table-column>
 <!--      <el-table-column prop="brand" :label='$t("resource.table.resours.brand")' width="100px"></el-table-column>-->
 <!--      <el-table-column prop="specification" :label='$t("resource.table.resours.specification")' width="180px"></el-table-column>-->
 <!--      <el-table-column prop="model" :label='$t("resource.table.resours.model")'></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="zoneName" :label='$t("resource.table.resours.zoneName")' ></el-table-column>
 <!--      <el-table-column prop="nums" :label='$t("resource.table.resours.nums")' width="120px"></el-table-column>-->
 <!--      <el-table-column prop="cncProgram" :label='$t("resource.table.resours.isProgram")' width="110px" align="center">-->
 <!--      	<template slot-scope="{ row }">-->
@@ -87,11 +87,12 @@
 <!--      </el-table-column>-->
       <el-table-column prop="productionStatus" :label='$t("resource.table.resours.linkStatus")' width="180px" align="center">
       	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.productionStatus.background">{{row.productionStatus.text}}</div>
+      		<div v-if="row.productionStatus" class="statusDiv" :style="'background:'+ row.productionStatus.background">{{row.productionStatus.text}}</div>
+			<div v-else class="statusDiv" >离线</div>
       	</template>
       </el-table-column>
-      <el-table-column prop="programSynTime" :label='$t("resource.table.resours.programSynTime")' width="180px"></el-table-column>
-      <el-table-column prop="programNum" :label='$t("resource.table.resours.programNum")' width="180px"></el-table-column>
+      <el-table-column prop="programSynTime" :label='$t("resource.table.resours.programSynTime")' ></el-table-column>
+      <el-table-column prop="programNum" :label='$t("resource.table.resours.programNum")' ></el-table-column>
 <!--      <el-table-column prop="controlStatus" :label='$t("resource.table.resours.controlStatus")' width="180px" align="center">-->
 <!--      	<template slot-scope="{ row }">-->
 <!--      		<div class="statusDiv" :style="'background:'+ row.controlStatus.background">{{row.controlStatus.text}}</div>-->
@@ -136,9 +137,9 @@
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
 <!--      <el-table-column prop="no" :label='$t("resource.table.program.no")' :show-overflow-tooltip="true"></el-table-column>-->
-      <el-table-column prop="name" :label='$t("resource.table.program.name")' width="280px"></el-table-column>
+      <el-table-column prop="name" :label='$t("resource.table.program.name")' ></el-table-column>
 <!--      <el-table-column prop="runTime" :label='$t("resource.table.program.runTime")' width="180px"></el-table-column>-->
-      <el-table-column prop="size" :label='$t("resource.table.program.size")' width="180px"></el-table-column>
+      <el-table-column prop="size" :label='$t("resource.table.program.size")' ></el-table-column>
 <!--      <el-table-column prop="toolNums" :label='$t("resource.table.program.toolNums")' width="180px"></el-table-column>-->
 <!--      <el-table-column prop="version" :label='$t("resource.table.program.version")' width="180px"></el-table-column>-->
 <!--      <el-table-column prop="status" :label='$t("resource.table.program.status")' align="center" width="90px">-->
@@ -148,12 +149,11 @@
 <!--          </el-tag>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column prop="synTime" :label='$t("resource.table.program.synTime")' width="250px"></el-table-column>
+      <el-table-column prop="synTime" :label='$t("resource.table.program.synTime")' ></el-table-column>
       <el-table-column
         :label="$t('table.operation')"
         align="center"
-        column-key="operation"
-        width="120px"
+        column-key="operation"        
       >
         <template slot-scope="{ row }">
         	<el-tooltip class="item" :content='$t("common.view")' effect="dark" placement="top-start">
@@ -520,11 +520,11 @@
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 固定参数（采集的生产资源）
 	      this.queryParams.resourceStatus = "1"
-		    this.queryParams.displayStatus = "1";
-        this.queryParams.cncProgram = "1";
-        this.queryParams.displayStatus = "1";
+		  this.queryParams.displayStatus = "1"
+          this.queryParams.cncProgram = "1"   
 	      equipmentMgrApi.getPageList(this.queryParams).then(response => {
-	        const res = response.data;
+	        const res = response.data
+			//console.log(res)
 	        if (res.isSuccess) {
 	          // 赋值
 	          this.tableData = res.data
@@ -540,7 +540,7 @@
 	          	//this.$refs.table.toggleRowSelection(this.tableData.data[0], true)  // 多选
 	          	// 加载【刀具列表】数据
 				console.log(this.tableData.data)
-	          	this.fetch2()
+	          	//this.fetch2()
 	          }
 	        }
 	        // eslint-disable-next-line no-return-assign