Merge branch 'fix_1104' into debug

src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -473,7 +473,7 @@ export default {
 
       if(res.Ret !== 200) return
       
-      const { EdbInfoId,EdbCode,EdbName,Frequency,Unit,StartDate,ModifyTime,PredictDataList,DataList,HaveOperaAuth } = res.Data.Item;
+      const { EdbInfoId,EdbCode,EdbName,Frequency,Unit,StartDate,ModifyTime,PredictDataList,DataList,HaveOperaAuth,SourceName } = res.Data.Item;
 
       this.selectEdbInfo = {
         EdbCode,
@@ -484,6 +484,7 @@ export default {
         ModifyTime,
         EdbInfoId,
         HaveOperaAuth,
+        SourceName,
         DataList: PredictDataList ? [...PredictDataList,...DataList].slice(0,5) : DataList.slice(0,5)
       };
     },

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -1709,7 +1709,7 @@ div{
         .report-drag-item-out{
             .report-drag-item-wrap_child-wrap{
                 position: absolute;
-                width: 40px;
+                width: 18px;
                 right: 0;
                 top: 0;
                 height: 100%;