Merge remote-tracking branch 'origin/master'

chuanyi_client2/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "cqcy",
+  "name": "Ei",
   "version": "1.0.0",
   "private": true,
   "scripts": {

chuanyi_client2/src/views/report_template/index.vue

@@ -306,7 +306,7 @@
           <el-select filterable
                      v-model="chooseDataGroup"
                      placeholder="请选择数据组"
-                     style="width: calc(100% - 220px);">
+                     style="width: 330px;">
             <el-option
                 v-for="dict in dataGroupList"
                 :key="dict.id"
@@ -314,8 +314,12 @@
                 :value="dict.id"
             ></el-option>
           </el-select>
-          <el-button size="mini" type="primary" @click="multipleDataItemEvent" style="float: right;width: 100px;margin-top: 4px;margin-left: 10px;">设置数据条件</el-button>
-          <el-button size="mini" @click="addDataItem" style="float: right;width: 100px;margin-top: 4px;">选择数据项</el-button>
+          <el-button size="mini" @click="addDataItem" style="width: 100px;margin-top: 4px; margin-left: 10px;">选择数据项</el-button>
+          <el-button size="mini" type="primary" @click="multipleDataItemEvent"
+                     v-if="templateReportType != 2"
+                     style="width: 100px;margin-top: 4px;">设置数据条件</el-button>
+<!--          <el-button size="mini" type="primary" @click="multipleDataItemEvent" style="float: right;width: 100px;margin-top: 4px;margin-left: 10px;">设置数据条件</el-button>-->
+<!--          <el-button size="mini" @click="addDataItem" style="float: right;width: 100px;margin-top: 4px;">选择数据项</el-button>-->
         </div>
         <div style="height: 30vh; margin-top: 10px; overflow: auto;">
 <!--          <el-tree class="cy-item-tree"-->
@@ -357,22 +361,23 @@
             </el-table-column>
             <el-table-column prop="itemName" label="数据项名称" align="center">
             </el-table-column>
-            <el-table-column prop="valueTakingMode" label="取值模式" align="center">
+            <el-table-column v-if="templateReportType != 2" prop="valueTakingMode" label="取值模式" align="center">
               <template slot-scope="scope">
                 {{ getValByProp(valueTakingModeList, scope.row.valueTakingMode) }}
               </template>
             </el-table-column>
-            <el-table-column prop="bucketType" label="取值时段类型" align="center">
+            <el-table-column v-if="templateReportType != 2" prop="bucketType" label="取值时段类型" align="center">
               <template slot-scope="scope">
                 {{ getValByProp(bucketTypeList, scope.row.bucketType) }}
               </template>
             </el-table-column>
-            <el-table-column prop="bucketValue" label="取值时段间隔" align="center">
+            <el-table-column v-if="templateReportType != 2" prop="bucketValue" label="取值时段间隔" align="center">
             </el-table-column>
             <template v-if="templateReportType == 0">
               <el-table-column prop="startTime" label="取值时段范围" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.startTime }},
+                  {{ scope.row.startTime }}
+                  {{ scope.row.startTime ? ',' : '' }}
                   {{ scope.row.endTime }}
                 </template>
               </el-table-column>
@@ -426,7 +431,7 @@
 
     <!-- 配置数据项取值条件 -->
     <el-dialog
-        title="配置数据项取值条件"
+        title="设置数据条件"
         width="600px"
         top="10vh"
         center
@@ -1512,7 +1517,7 @@ export default {
         }
       })
       if (condCount > 0) {
-        showAlertMsgWin(this, null, '数据项读取条件不能为空！')
+        showAlertMsgWin(this, null, '请设置数据条件！')
         return
       }
       let c, r
@@ -1531,7 +1536,7 @@ export default {
           let groupId = item.itemGroupId
           let name = item.itemName
           let describe = item.describe
-          name = name.substring(name.lastIndexOf('.') + 1)
+          // name = name.substring(name.lastIndexOf('.') + 1)
           let v = '${' + groupId + '.' + name + '}'
           item.placeHolder = v
           item.standby = JSON.stringify({