我的报表页面修改

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -20,7 +20,7 @@
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <svg-icon v-if="data.id == -1" icon-class="reports"/>
                 <svg-icon v-else icon-class="report"/>
-                <span :title='data.reportName || data.itemName' style="margin-left: 2px;">{{ data.reportName || data.itemName }}</span>
+                <span :title='data.reportNameTips' style="margin-left: 2px;">{{ data.reportName || data.itemName }}</span>
                 <span v-if="data.id == -1" style="position: absolute; right: 0; background: #646464;">
                   <el-button type="text" size="mini" style="color: #FFFFFF;" title="新建模板"
                              @click="addReportEvent" icon="el-icon-document-add"></el-button>
@@ -888,9 +888,13 @@ export default {
         let dataList = []
         for (let i in res.data.tableTemplateList) {
           let temp = res.data.tableTemplateList[i]
+          let type = temp.templateType == 0 ? '[手动报表]  ' :
+              temp.templateType == 1 ? '[自动报表]  ' :
+              temp.templateType == 2 ? '[事件驱动报表]  ' : ''
           dataList.push({
             id: temp.id,
             reportName: temp.templateName,
+            reportNameTips: type + temp.templateName,
             leaf: true,
             children: []
           })

chuanyi_client2/src/views/data_model/index.vue

@@ -349,6 +349,7 @@ export default {
               showAlertMsgWin(this, null, '修改成功！')
               this.dialogDataModelVisible = false
               this.dataModelForm.id = ''
+              this.calcValResult = ''
               this.$refs['dataModelForm'].resetFields()
               this.getAllDataModel()
             }).catch((e) => {
@@ -361,6 +362,7 @@ export default {
             loading.close()
             showAlertMsgWin(this, null, '保存成功！')
             this.dialogDataModelVisible = false
+            this.calcValResult = ''
             this.$refs['dataModelForm'].resetFields()
             this.getAllDataModel()
           }).catch((e) => {

chuanyi_client2/src/views/run_config/index.vue

@@ -322,7 +322,7 @@
       </el-form>
       <span slot='footer'>
           <el-button type="primary" @click="chooseCronEvent">确定</el-button>
-          <el-button @click="dialogClose">取消</el-button>
+<!--          <el-button @click="dialogClose">取消</el-button>-->
       </span>
     </el-dialog>
 
@@ -417,13 +417,13 @@
           <!--                      type="warning" style="margin-right: 5px;">已分享</el-tag>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-          <el-table-column
-              align="center"
-              label="当前版本"
-              sortable="custom"
-              prop="version"
-              width="120">
-          </el-table-column>
+<!--          <el-table-column-->
+<!--              align="center"-->
+<!--              label="当前版本"-->
+<!--              sortable="custom"-->
+<!--              prop="version"-->
+<!--              width="120">-->
+<!--          </el-table-column>-->
           <el-table-column
               align="center"
               label="运行时间"
@@ -965,7 +965,7 @@ export default {
       let status = data.runState == 0 ? '启动' : '停止'
       let tips = '您确定要' + status + '该报表吗？'
       showConfirmWin(this, null, tips, () => {
-        const loading = showLoading(this, '删除中，请稍候···')
+        const loading = showLoading(this, status + '中，请稍候···')
         let params = {
           'id': data.id,
           'runState': data.runState == 0 ? 1 : 0