Haier_MES.git - Gitblit

parent: cc30b2b1 | 补丁 | 提交 | ignore whitespace

ZengTao

2023-07-19 52dc8223a2c0f8e3ebb1ca2579f0bd8e4c15a9cb

调整仓储与料架界面

2个文件已修改

	gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/yuanpiancangchu/liaojiaguanli.jsp	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp

@@ -67,7 +67,7 @@
    </script>
</head>

<body style="padding: 20px;background-color:#D5EAFF;height:100%">
<body style="background-color:#D5EAFF;height:100%">
    <!-- Content Wrapper. Contains page content -->
    <div class="" id='app' style='background-color:#D5EAFF;height:100%'>
        <!-- Content Header (Page header) -->
@@ -90,13 +90,13 @@
            <div class="box box-default" style="background-color:#D5EAFF;">
                <div class="box-header with-border">
                    <h3 class="box-title">仓储</h3>
                <span :class="connect[0][1]">{{connect[0][0]}}</span> 
                <span :class="connect[0]['1_classname']">{{connect[0]['0_connect_state']}}</span> 
                </div>
                <!-- /.box-header -->
                <button type="button" @click="delAll('重新开始')" class="btn btn-primary ">重新开始</button>
                <button type="button" @click="delAll('完成')" class="btn btn-primary ">任务完成</button>
                <button type="button" @click="delAll('删除')" class="btn btn-primary ">删除任务</button>
                <div class="box-body" style="height:450px;overflow-y:auto;">
                <div class="box-body" style="height:365px;overflow-y:auto;">
                    <table class="table table-striped table-hover"
                    style="font-size: 18px;" id="example2">
                    <thead>
@@ -113,12 +113,12 @@
                    <tbody>
                        <tr v-for="items in shuzu">
                            <td><input v-model="shelftaskids" type='checkbox'  :value="items[0]"/></td>
                            <td>{{items["0"]}}</td>
                             <td>{{items[1]}}</td> 
                            <td>{{items[2]}}</td>
                            <td>{{items[8]}}</td>
                            <td>{{items[9]}}</td>
                            <td>{{items[6]}}</td> 
                            <td>{{items['0_id']}}</td>
                             <td>{{items['1_task_type']}}</td> 
                            <td>{{items['2_task_state']}}</td>
                            <td>{{items['8_raw_thickness']}}</td>
                            <td>{{items['9_color']}}</td>
                            <td>{{items['6_start_time']}}</td> 
                        </tr> 
                    </tbody>
                </table>

 gmms/WebContent/yuanpiancangchu/liaojiaguanli.jsp

@@ -57,7 +57,7 @@
}

#task {
    height: 315px;
    height: 200px;
    overflow: auto;
}

@@ -82,7 +82,7 @@
}
#example tbody {
      display:block;
      height:280px;
      height:320px;
      overflow-y:scroll;
}
#example thead,#example tbody tr {
@@ -96,11 +96,14 @@
#example thead th {
     background:#ccc;
}
td, th {
    padding: 6px;
}
</style>

<script type="text/javascript">

var interval = setInterval('refreshStatus()', 20000);
/* var interval = setInterval('refreshStatus()', 20000); */
//设备页面自动刷新
/* function refreshStatus() {
    window.location.reload();
@@ -548,21 +551,26 @@
                            </div>
                        </td> --%>
                        <td v-for="item in shuzu">
                            <div :value="item[1]" class='progress vertical active'  style='width: 21px;background-color: gray;height: 90px;'>

                            <div :value="item['1_raw_type']" class='progress vertical active'  style='width: 30px;background-color: gray;height: 90px;'>

                            <div :value="item['1_raw_type']" class='progress vertical active'  style='width: 30px;background-color: gray;height: 90px;'>

                                <span style='margin-top: opx'>
                                    {{item[8]}}
                                    {{item['8_pieces']}}
                                </span>
                                <div v-show="item[9]*1<3" :style="{height:item[10]}" class='progress-bar  progress-bar-primary progress-bar-striped progress-bar-aqua'>
                                    <span>{{item[5]}}/{{item[8]}}</span>
                                <div v-show="item['9_rukutime']*1<3" :style="{height:item['10_bfb']}" class='progress-bar  progress-bar-primary progress-bar-striped progress-bar-aqua'>
                                    <span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
                                </div>
                                <div v-show="2<item[9]*1 && item[9]*1<8" :style="{height:item[10]}" class='progress-bar progress-bar-striped progress-bar-green'>
                                    <span>{{item[5]}}/{{item[8]}}</span>
                                <div v-show="2<item['9_rukutime']*1 && item['9_rukutime']*1<8" :style="{height:item['10_bfb']}" class='progress-bar progress-bar-striped progress-bar-green'>
                                    <span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
                                </div>
                                <div v-show="item[9]*1>7" :style="{height:item[10]}" class='progress-bar progress-bar-danger progress-bar-striped progress-bar-red'>
                                    <span>{{item[5]}}/{{item[8]}}</span>
                                <div v-show="item['9_rukutime']*1>7" :style="{height:item['10_bfb']}" class='progress-bar progress-bar-danger progress-bar-striped progress-bar-red'>
                                    <span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
                                </div>
								
                            </div>
                            <div>{{item[0]}}</div>
                            <div>{{item['0_number']}}</div>
                        </td>
                    </tr>
                </table>
@@ -585,7 +593,7 @@
            <!-- <button type="button" @click="fanpian()" class="btn btn-primary ">翻片</button> -->
            <button type="button" onclick="updatecount()" class="btn btn-primary ">修改数量</button>
            
            <table id="example" class="table table-bordered table-condensed">
            <table id="example" class="table table-bordered table-condensed" style="font-size: 12px;">
                <thead style="font-size: 20px; Height: 40px">
                    <tr>
                        <th><input type="checkbox" name="allChecked" /></th>
@@ -604,9 +612,9 @@
                <tbody>
                    
                    <tr  v-for='(items,index) in shuzu'  :key='index'>
                        <td><input v-model="shelfId" name='id' type='checkbox' :value="items[0]" /></td>
                        <td class="rankid" style="display:none">{{items[0]}}</td>
                          <td v-show="(key1<8?true:false)" v-for='(item,key1) in items' :key='items.list1'  >
                        <td><input v-model="shelfId" name='id' type='checkbox' :value="items['0_number']" /></td>
                        <td class="rankid" style="display:none">{{items['0_number']}}</td>
                          <td v-show="(indexs<8?true:false)" v-for='(item,key1,indexs) in items' :key='items.list1'  >
                              {{item}}
                          </td>
                      </tr>
@@ -731,7 +739,7 @@
                                                        <%-- <li style="font-size: 20px"><a href="#"
                                                            onclick="$('#shelfRankInput').val('${shelfRankNumber}')">${shelfRankNumber}</a></li> --%>
                                                    <li v-for='items in shelfRack' style="font-size: 20px">
                                                        <a href="#" onclick="$('#shelfRankInput').val($(this).text())">{{items[0]}}</a>
                                                        <a href="#" onclick="$('#shelfRankInput').val($(this).text())">{{items['0_number']}}</a>
                                                    </li>
                                                </ul>
                                            </div>
@@ -761,7 +769,7 @@
                                            <ul class="dropdown-menu"
                                                style="height: 280px; overflow: auto;">
                                                    <li v-for='color in colors' style="font-size: 20px"><a href="#"
                                                        onclick="$('#colorinput').val($(this).text())">{{color[0]}}</a></li>
                                                        onclick="$('#colorinput').val($(this).text())">{{color['0_glass_id']}}</a></li>
                                                
                                            </ul>
                                        </div>
@@ -917,7 +925,7 @@
                                            <ul class="dropdown-menu"
                                                style="height: 280px; overflow: auto;">
                                                    <li v-for='color in colors' style="font-size: 20px"><a href="#"
                                                    onclick="$('#colors').val($(this).text())">{{color[0]}}</a></li>
                                                    onclick="$('#colors').val($(this).text())">{{color['0_glass_id']}}</a></li>
                                            </ul>
                                        </div>

@@ -1080,6 +1088,7 @@
               "pici":"",
               "date":""  
          },
		  
          shelfGlass:{
              "shelfID":"",
               "color":"",

			@@ -67,7 +67,7 @@
			</script>
			</head>

			<body style="padding: 20px;background-color:#D5EAFF;height:100%">
			<body style="background-color:#D5EAFF;height:100%">
			<!-- Content Wrapper. Contains page content -->
			<div class="" id='app' style='background-color:#D5EAFF;height:100%'>
			<!-- Content Header (Page header) -->
			@@ -90,13 +90,13 @@
			<div class="box box-default" style="background-color:#D5EAFF;">
			<div class="box-header with-border">
			<h3 class="box-title">仓储</h3>
			<span :class="connect[0][1]">{{connect[0][0]}}</span>
			<span :class="connect[0]['1_classname']">{{connect[0]['0_connect_state']}}</span>
			</div>
			<!-- /.box-header -->
			<button type="button" @click="delAll('重新开始')" class="btn btn-primary ">重新开始</button>
			<button type="button" @click="delAll('完成')" class="btn btn-primary ">任务完成</button>
			<button type="button" @click="delAll('删除')" class="btn btn-primary ">删除任务</button>
			<div class="box-body" style="height:450px;overflow-y:auto;">
			<div class="box-body" style="height:365px;overflow-y:auto;">
			<table class="table table-striped table-hover"
			style="font-size: 18px;" id="example2">
			<thead>
			@@ -113,12 +113,12 @@
			<tbody>
			<tr v-for="items in shuzu">
			<td><input v-model="shelftaskids" type='checkbox' :value="items[0]"/></td>
			<td>{{items["0"]}}</td>
			<td>{{items[1]}}</td>
			<td>{{items[2]}}</td>
			<td>{{items[8]}}</td>
			<td>{{items[9]}}</td>
			<td>{{items[6]}}</td>
			<td>{{items['0_id']}}</td>
			<td>{{items['1_task_type']}}</td>
			<td>{{items['2_task_state']}}</td>
			<td>{{items['8_raw_thickness']}}</td>
			<td>{{items['9_color']}}</td>
			<td>{{items['6_start_time']}}</td>
			</tr>
			</tbody>
			</table>

			@@ -57,7 +57,7 @@
			}

			#task {
			height: 315px;
			height: 200px;
			overflow: auto;
			}

			@@ -82,7 +82,7 @@
			}
			#example tbody {
			display:block;
			height:280px;
			height:320px;
			overflow-y:scroll;
			}
			#example thead,#example tbody tr {
			@@ -96,11 +96,14 @@
			#example thead th {
			background:#ccc;
			}
			td, th {
			padding: 6px;
			}
			</style>

			<script type="text/javascript">

			var interval = setInterval('refreshStatus()', 20000);
			/* var interval = setInterval('refreshStatus()', 20000); */
			//设备页面自动刷新
			/* function refreshStatus() {
			window.location.reload();
			@@ -548,21 +551,26 @@
			</div>
			</td> --%>
			<td v-for="item in shuzu">
			<div :value="item[1]" class='progress vertical active' style='width: 21px;background-color: gray;height: 90px;'>

			<div :value="item['1_raw_type']" class='progress vertical active' style='width: 30px;background-color: gray;height: 90px;'>

			<div :value="item['1_raw_type']" class='progress vertical active' style='width: 30px;background-color: gray;height: 90px;'>

			<span style='margin-top: opx'>
			{{item[8]}}
			{{item['8_pieces']}}
			</span>
			<div v-show="item[9]*1<3" :style="{height:item[10]}" class='progress-bar progress-bar-primary progress-bar-striped progress-bar-aqua'>
			<span>{{item[5]}}/{{item[8]}}</span>
			<div v-show="item['9_rukutime']*1<3" :style="{height:item['10_bfb']}" class='progress-bar progress-bar-primary progress-bar-striped progress-bar-aqua'>
			<span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
			</div>
			<div v-show="2<item[9]1 && item[9]1<8" :style="{height:item[10]}" class='progress-bar progress-bar-striped progress-bar-green'>
			<span>{{item[5]}}/{{item[8]}}</span>
			<div v-show="2<item['9_rukutime']1 && item['9_rukutime']1<8" :style="{height:item['10_bfb']}" class='progress-bar progress-bar-striped progress-bar-green'>
			<span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
			</div>
			<div v-show="item[9]*1>7" :style="{height:item[10]}" class='progress-bar progress-bar-danger progress-bar-striped progress-bar-red'>
			<span>{{item[5]}}/{{item[8]}}</span>
			<div v-show="item['9_rukutime']*1>7" :style="{height:item['10_bfb']}" class='progress-bar progress-bar-danger progress-bar-striped progress-bar-red'>
			<span>{{item['5_left_pieces']}}/{{item['8_pieces']}}</span>
			</div>

			</div>
			<div>{{item[0]}}</div>
			<div>{{item['0_number']}}</div>
			</td>
			</tr>
			</table>
			@@ -585,7 +593,7 @@
			<!-- <button type="button" @click="fanpian()" class="btn btn-primary ">翻片</button> -->
			<button type="button" onclick="updatecount()" class="btn btn-primary ">修改数量</button>

			<table id="example" class="table table-bordered table-condensed">
			<table id="example" class="table table-bordered table-condensed" style="font-size: 12px;">
			<thead style="font-size: 20px; Height: 40px">
			<tr>
			<th><input type="checkbox" name="allChecked" /></th>
			@@ -604,9 +612,9 @@
			<tbody>

			<tr v-for='(items,index) in shuzu' :key='index'>
			<td><input v-model="shelfId" name='id' type='checkbox' :value="items[0]" /></td>
			<td class="rankid" style="display:none">{{items[0]}}</td>
			<td v-show="(key1<8?true:false)" v-for='(item,key1) in items' :key='items.list1' >
			<td><input v-model="shelfId" name='id' type='checkbox' :value="items['0_number']" /></td>
			<td class="rankid" style="display:none">{{items['0_number']}}</td>
			<td v-show="(indexs<8?true:false)" v-for='(item,key1,indexs) in items' :key='items.list1' >
			{{item}}
			</td>
			</tr>
			@@ -731,7 +739,7 @@
			<%-- <li style="font-size: 20px"><a href="#"
			onclick="$('#shelfRankInput').val('${shelfRankNumber}')">${shelfRankNumber}</a></li> --%>
			<li v-for='items in shelfRack' style="font-size: 20px">
			<a href="#" onclick="$('#shelfRankInput').val($(this).text())">{{items[0]}}</a>
			<a href="#" onclick="$('#shelfRankInput').val($(this).text())">{{items['0_number']}}</a>
			</li>
			</ul>
			</div>
			@@ -761,7 +769,7 @@
			<ul class="dropdown-menu"
			style="height: 280px; overflow: auto;">
			<li v-for='color in colors' style="font-size: 20px"><a href="#"
			onclick="$('#colorinput').val($(this).text())">{{color[0]}}</a></li>
			onclick="$('#colorinput').val($(this).text())">{{color['0_glass_id']}}</a></li>

			</ul>
			</div>
			@@ -917,7 +925,7 @@
			<ul class="dropdown-menu"
			style="height: 280px; overflow: auto;">
			<li v-for='color in colors' style="font-size: 20px"><a href="#"
			onclick="$('#colors').val($(this).text())">{{color[0]}}</a></li>
			onclick="$('#colors').val($(this).text())">{{color['0_glass_id']}}</a></li>
			</ul>
			</div>

			@@ -1080,6 +1088,7 @@
			"pici":"",
			"date":""
			},

			shelfGlass:{
			"shelfID":"",
			"color":"",