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

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

@@ -114,9 +114,9 @@
                                 >
                             </div>
                             <div class="flex">
-                                <p>产品图片：</p>
+                                <p class="infoLabel">产品图片：</p>
                                 <div>
-                                    <img :src="orderDetail.imgurl" alt="" />
+                                    <img :src="axios.publicPath+orderDetail.url" alt="" style="width:100%" />
                                 </div>
                             </div>
                             <div>

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsProductRepository.cs

@@ -127,12 +127,14 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         join q in _context.siger_automation_fixture_tools_product on p.product_code equals q.productcode 
                         join t in _context.siger_automation_fixture_tools on q.fixturetools equals t.guid 
                         join l in _context.siger_automation_location on t.guid equals l.fixturetools 
+                        join pd in _context.siger_project_product on p.product_id equals pd.id
                         where q.projectId == projectId && d.OrderNumber == ordernumber
                         && q.status == (int)RowState.Valid && t.status == (int)RowState.Valid && l.status==(int)RowState.Valid
                         select new ResponsePlanlFixtureInfo
                         {
                             OrderNumber = ordernumber,
                             ProductName = p.product_name,
+                            Url=pd.image,
                             FixtureName=t.name,
                             FixtureGuid=t.guid,
                             ProductCode =q!=null? q.productcode:"",

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseProductFixtureInfo.cs

@@ -34,6 +34,7 @@ namespace Siger.Middlelayer.AccRepository.Response
         public string OrderNumber { get; set; }
         public string ProductCode { get; set; }
         public string ProductName { get; set; }
+        public string Url { get; set; }
         public int status { get; set; }
         public string FixtureName { get; set; }
         public string FixtureGuid { get; set; }