海尔mes项目
parent: 2ff9eb02 | 补丁 | 提交 | ignore whitespace
guoyuji
2023-07-19 6de264bcdfb5bb41e2164428c8cb2ecc941adc79 
Merge branch 'master' of ssh://10.153.19.150:29418/Haier_MES
4个文件已修改
71 ■■■■■ 已修改文件
gmms/WebContent/login/bdg.jsp 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/machinelistcontent.jsp 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/qiegeguanli/qiegerenwu.jsp 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/yuanpiancangchu/liaojiaguanli.jsp 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 gmms/WebContent/login/bdg.jsp


@@ -26,6 +26,7 @@


    border-radius: 0px 2px 2px 0px;


}


html,body{




    height:99%;


    width:100%;


    margin:0;




 gmms/WebContent/login/machinelistcontent.jsp


@@ -22,26 +22,22 @@


  .el-table .success-row {


    background: oldlace;


  }


  html,body{


    height:99%;


    width:100%;


    margin:0;


    padding:0


}


</style>




</style>


<title>Insert title here</title>


</head>


<body>


 <div id="app" style="width:100%">


 <div id="app" style="display:width:100%">


     <el-table border


      :data="machine"


      height='650'


      height='700'


      style="width: 100%;"


       :row-class-name="tableRowClassName"


      >


      <el-table-column


        prop="name"


        label="设备">


        label="设备">


      </el-table-column>


      <el-table-column


        prop="ip"


@@ -53,11 +49,11 @@


      </el-table-column>


      <el-table-column


        prop="st"


        label="状态">


        label="״̬">


      </el-table-column>


      <el-table-column


        prop="count"


        label="调用次数">


        label="调用次数">


      </el-table-column>


     </el-table>


</div>


@@ -72,7 +68,7 @@


      methods:{


          tableRowClassName({row, rowIndex}) {


              


                if (row['st'] == '未连接') {


                if (row['st'] == '未连接') {


                 return 'success-row';


               }


               return ''; 




 gmms/WebContent/qiegeguanli/qiegerenwu.jsp


@@ -109,7 +109,8 @@


                                    手动完成


                                </td>


                                <td v-else>


									


									 


									 


                                </td>


                                <td>{{item['12_order_maker']}}</td>


                                <td  v-if="item['11_order_status']==1">




 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":"",