Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

 <template>
     <div>
-        员工上下料管理
         <div class="divborder">
             <div class="choose">
                 <p class="selectTitle">
@@ -117,8 +116,7 @@
                                 <p class="infoLabel">产品图片：</p>
                                 <div>
                                     <img
-                                        :src="
-                                            axios.publicPath + orderDetail.url
+                                        :src="orderDetail.url
                                         "
                                         alt=""
                                         style="width: 100%"
@@ -421,6 +419,11 @@ export default {
                 .then((res) => {
                     if (res.data.ret == 1) {
                         let obj = res.data.data;
+                        if(obj.url == null || obj.url=='' || obj.url ==undefined){
+                            obj.url = ''
+                        }else{
+                            obj.url = this.axios.publicPath +obj.url;
+                        }
                         this.orderDetail = Object.assign(
                             {},
                             this.orderDetail,
@@ -428,6 +431,7 @@ export default {
                         );
                     } else {
                         this.$Message.error(this.$t(res.data.msg));
+                        this.orderDetail = {};
                     }
                 })
                 .catch((err) => {
@@ -556,7 +560,7 @@ export default {
         handleRowChange1(currentRow, oldCurrentRow) {
             console.log(currentRow);
             this.locationobj = currentRow;
-            this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
+            this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;  
             this.orderDetail.location = this.detailobj.locationid;
             if(this.locationobj.id){
                 this.request("/acc/AutomationOperate/ScanCode?id="+this.locationobj.id, '', "get")