修改数据源保存

chuanyi_client2/src/components/LeftMenu/index.vue

@@ -96,7 +96,7 @@
           </div>
         </div>
       </div>
-      <span slot='footer'>
+      <span slot='footer' v-if="false">
           <el-button type="primary" @click="handleSaveDatasource">保存</el-button>
           <el-button @click="handleCancel('datasource')">取消</el-button>
       </span>
@@ -144,6 +144,7 @@
         </el-form-item>
         <el-form-item label='密码：' prop="ipPassword" key="ipPassword" v-if="connForm.isAnonymous != 1">
           <el-input v-model='connForm.ipPassword'
+                    clearable
                     type="password"
                     auto-complete="new-password"
                     placeholder="请输入密码"></el-input>
@@ -164,7 +165,8 @@
       </el-form>
       <span slot='footer'>
           <el-button type="warning" @click='handleConnect(1)'>连接测试</el-button>
-          <el-button type="primary" @click='handleConnect(2)'>确定</el-button>
+<!--          <el-button type="primary" @click='handleConnect(2)'>确定</el-button>-->
+          <el-button type="primary" @click='handleSaveDatasource'>确定</el-button>
           <el-button @click='handleCancel("conn")'>取消</el-button>
       </span>
     </el-dialog>

chuanyi_client2/src/views/my_report/index.vue

@@ -331,13 +331,15 @@
         title="选择下载类型"
         width="500px"
         center
+        v-dialog-drag
+        v-if="dialogDownloadReportTypeVisible"
         :before-close="dialogClose"
         :visible.sync="dialogDownloadReportTypeVisible"
         :close-on-click-modal="false"
         :append-to-body="true">
       <div style="text-align: center;">
         <el-radio v-model="downloadType" label="1">Excel</el-radio>
-        <el-radio v-model="downloadType" label="2" disabled>PDF</el-radio>
+<!--        <el-radio v-model="downloadType" label="2" disabled>PDF</el-radio>-->
       </div>
       <div style="text-align: center; margin-top: 40px;">
         <el-button type="primary" @click="downloadReportEvent">确定</el-button>

chuanyi_client2/src/views/report_template/index.vue

@@ -268,6 +268,8 @@
         title="选择模板报表"
         width="60vw"
         center
+        v-dialog-drag
+        v-if="dialogCommReportVisible"
         :before-close="dialogClose"
         :visible.sync="dialogCommReportVisible"
         :close-on-click-modal="false"
@@ -329,6 +331,8 @@
         width="80%"
         top="10vh"
         center
+        v-dialog-drag
+        v-if="dialogGroupItemVisible"
         :before-close="dialogClose"
         :visible.sync="dialogGroupItemVisible"
         :close-on-click-modal="false"

chuanyi_client2/src/views/run_config/index.vue

@@ -389,7 +389,7 @@
         :append-to-body="true">
       <div style="text-align: center;">
         <el-radio v-model="downloadType" label="1">Excel</el-radio>
-        <el-radio v-model="downloadType" label="2" disabled>PDF</el-radio>
+<!--        <el-radio v-model="downloadType" label="2" disabled>PDF</el-radio>-->
       </div>
       <div style="text-align: center; margin-top: 40px;">
         <el-button type="primary" @click="downloadReportEvent">确定</el-button>
@@ -967,10 +967,12 @@ export default {
             this.chooseReportTemplate = luckyData
             this.drawLuckyExcel(luckyData, () => {
               loading.close()
-              this.btnType = 'add'
               this.$refs.reportForm.resetFields()
               this.dialogReportTemplateVisible = false
               this.breadcrumbList = ['新增报表']
+              setTimeout(() => {
+                this.btnType = 'add'
+              }, 100)
             })
           }).catch((e) => {
             loading.close()