sss

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -6,9 +6,7 @@
     element-loading-text="数据上传中，请稍后"
     element-loading-spinner="el-icon-loading"
   >
-
     <el-form ref="fromCreateData" :model="from">
-
       <div v-if="!releaseType" style=" margin-bottom: 10px;">
         <span style="color: #f56b6c">*</span>
         <span class="backStyle"> 关联任务</span><br>

src/views/reportManagement/components/DailyReport.vue

@@ -1,80 +1,85 @@
 <template>
-  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '测试日报' : `${tipName}测试日报模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
-    <div v-if="reportHome" class="blueStripe" />
-    <i v-if="!reportHome" class="el-icon-arrow-left report-return didi-hover" @click="reportReturn" />
-
-    <el-steps v-if="reportHome" :active="active" align-center finish-status="success" class="report-steps">
-      <el-step title="选择模版" />
-      <el-step title="填写报告" />
-      <el-step title="发送报告" />
-    </el-steps>
-
-    <div class="report-leftRight">
-      <div v-if="showOne" style="min-height: 34vh;">
-        <el-row type="flex" justify="center">
-          <el-col :span="19" class="creator">模版名称</el-col>
-          <el-col :span="5" class="creator" style="margin-right: 17px;"> 创建人 </el-col>
-        </el-row>
-
-        <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 20px 0;">
-          <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center" style="padding-right: 15px;">
-            <el-col :span="19">
-              <el-radio v-model="fromData.radio" class="creatorList" :label="item.id">{{ item.moduleName }}</el-radio>
-            </el-col>
-            <el-col :span="5" class="creatorList">
-              <div class="Layout_space_between">
-                <span>{{ item.creatorObject.name }}</span>
-                <span v-if="item.creator !== 'SYSTEM' && item.creator !== '系统'" class="operation">
-                  <i class="el-icon-edit-outline didi-hover" @click="open_new_template(item)" />
-                  <el-popover :ref="item.id" placement="bottom" width="300" :visible-arrow="false" trigger="click">
-                    <div><div class="blur-column" /> 删除模版</div>
-                    <div class="blueStripe" />
-                    <div class="deletreport">是否要删除模版{{ item.moduleName }}?</div>
-                    <div style="text-align: right; margin: 0">
-                      <el-button size="mini" type="danger" @click="settingDeleteReportModule(item)">确定</el-button>
-                      <el-button size="mini" @click="closeDefaultPopover()">取消</el-button>
-                    </div>
-                    <i slot="reference" class="el-icon-delete reportModel didi-hover" />
-                  </el-popover>
-                </span>
-              </div>
+  <!-- <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '测试日报' : `${tipName}测试日报模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose"> -->
+  <div v-if="dialogDaliy" class="dialogbox">
+    1231212312
+    <div class="content">
+      <div v-if="reportHome" class="blueStripe" />
+      <i v-if="!reportHome" class="el-icon-arrow-left report-return didi-hover" @click="reportReturn" />
+
+      <el-steps v-if="reportHome" :active="active" align-center finish-status="success" class="report-steps">
+        <el-step title="选择模版" />
+        <el-step title="填写报告" />
+        <el-step title="发送报告" />
+      </el-steps>
+
+      <div class="report-leftRight">
+        <div v-if="showOne" style="min-height: 34vh;">
+          <el-row type="flex" justify="center">
+            <el-col :span="19" class="creator">模版名称</el-col>
+            <el-col :span="5" class="creator" style="margin-right: 17px;"> 创建人 </el-col>
+          </el-row>
+
+          <div ref="refName" style="max-height: 260px; overflow:scroll; overflow-x: hidden; margin: 20px 0;">
+            <el-row v-for="(item, index) in selectTemplate" :key="index" type="flex" justify="center" style="padding-right: 15px;">
+              <el-col :span="19">
+                <el-radio v-model="fromData.radio" class="creatorList" :label="item.id">{{ item.moduleName }}</el-radio>
+              </el-col>
+              <el-col :span="5" class="creatorList">
+                <div class="Layout_space_between">
+                  <span>{{ item.creatorObject.name }}</span>
+                  <span v-if="item.creator !== 'SYSTEM' && item.creator !== '系统'" class="operation">
+                    <i class="el-icon-edit-outline didi-hover" @click="open_new_template(item)" />
+                    <el-popover :ref="item.id" placement="bottom" width="300" :visible-arrow="false" trigger="click">
+                      <div><div class="blur-column" /> 删除模版</div>
+                      <div class="blueStripe" />
+                      <div class="deletreport">是否要删除模版{{ item.moduleName }}?</div>
+                      <div style="text-align: right; margin: 0">
+                        <el-button size="mini" type="danger" @click="settingDeleteReportModule(item)">确定</el-button>
+                        <el-button size="mini" @click="closeDefaultPopover()">取消</el-button>
+                      </div>
+                      <i slot="reference" class="el-icon-delete reportModel didi-hover" />
+                    </el-popover>
+                  </span>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+          <el-row type="flex" justify="center">
+            <el-col :span="24">
+              <span class="didi-hover" @click="open_new_template()"><i class="el-icon-circle-plus-outline creatorList didi-hover" /> <span style="margin-left: 8px; color: #333;">新建模版</span></span>
             </el-col>
           </el-row>
         </div>
-        <el-row type="flex" justify="center">
-          <el-col :span="24">
-            <span class="didi-hover" @click="open_new_template()"><i class="el-icon-circle-plus-outline creatorList didi-hover" /> <span style="margin-left: 8px; color: #333;">新建模版</span></span>
-          </el-col>
-        </el-row>
-      </div>
 
-      <!-- new模版 -->
-      <newReportTemplate v-if="reportTamplate" ref="newReportTemplate" class="daily" :template-id="templateId" @getreportTemplate="getreportTemplate" @reportReturn="reportReturn" />
-      <!-- new模版 -->
+        <!-- new模版 -->
+        <newReportTemplate v-if="reportTamplate" ref="newReportTemplate" class="daily" :template-id="templateId" @getreportTemplate="getreportTemplate" @reportReturn="reportReturn" />
+        <!-- new模版 -->
 
-      <!-- 新建日报模版 -->
-      <dailyTemplate v-if="newDailyTemplate" ref="dailyTemplate" class="daily" :model-id="fromData.radio" :task-ids="daily_taskIds" @SaveNextStep="SaveNextStep" />
-      <!-- 新建日报模版 -->
+        <!-- 新建日报模版 -->
+        <dailyTemplate v-if="newDailyTemplate" ref="dailyTemplate" class="daily" :model-id="fromData.radio" :task-ids="daily_taskIds" @SaveNextStep="SaveNextStep" />
+        <!-- 新建日报模版 -->
 
-      <!-- 日报预览 -->
-      <dailyPreview v-if="dailyPreview" ref="dailyPreview" class="daily" :daily-id="dailyId" @handleClose="handleClose" />
-      <!-- 日报预览 -->
+        <!-- 日报预览 -->
+        <dailyPreview v-if="dailyPreview" ref="dailyPreview" class="daily" :daily-id="dailyId" @handleClose="handleClose" />
+        <!-- 日报预览 -->
 
+      </div>
+      <div slot="footer" class="dialog-footer" align="center">
+        <!-- 新建模版 -->
+        <el-button v-if="reportTamplate" size="small" type="primary" @click="created_out()">保存</el-button>
+        <!-- 第一步 -->
+        <el-button v-if="showOne" size="small" type="primary" @click="NextStep()">下一步</el-button>
+        <!-- 第二步 -->
+        <el-button v-if="newDailyTemplate" size="small" type="primary" @click="reportReturn">上一步</el-button>
+        <el-button v-if="newDailyTemplate" size="small" type="primary" @click="getCreateData">保存, 下一步</el-button>
+        <!-- 第三步 -->
+        <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReportReturn">上一步</el-button>
+        <el-button v-if="dailyPreview" size="small" type="primary" :loading="loading" @click="sendReport">发送</el-button>
+      </div>
     </div>
-    <div slot="footer" class="dialog-footer" align="center">
-      <!-- 新建模版 -->
-      <el-button v-if="reportTamplate" size="small" type="primary" @click="created_out()">保存</el-button>
-      <!-- 第一步 -->
-      <el-button v-if="showOne" size="small" type="primary" @click="NextStep()">下一步</el-button>
-      <!-- 第二步 -->
-      <el-button v-if="newDailyTemplate" size="small" type="primary" @click="reportReturn">上一步</el-button>
-      <el-button v-if="newDailyTemplate" size="small" type="primary" @click="getCreateData">保存, 下一步</el-button>
-      <!-- 第三步 -->
-      <el-button v-if="dailyPreview" size="small" type="primary" @click="sendReportReturn">上一步</el-button>
-      <el-button v-if="dailyPreview" size="small" type="primary" :loading="loading" @click="sendReport">发送</el-button>
-    </div>
-
-  </el-dialog>
+    <div class="bg"></div>
+  </div>
+  <!-- </el-dialog> -->
 </template>
 
 <script>
@@ -125,6 +130,9 @@ export default {
       immediate: true
     }
   },
+  mounted() {
+    console.log(this.dialogDaliy)
+  },
   methods: {
     async getreportTemplate() { // 获取模版list
       const res = await settingQueryReportModuleList({ bizId: this.bizId, type: 3 }) // 3 日报
@@ -139,6 +147,7 @@ export default {
 
     init(index, newData) {
       this.dialogDaliy = true
+      console.log(this.dialogDaliy)
       switch (index) {
         case 2: // 编辑
           dailyReportGetV2(newData.id).then(res => {
@@ -297,6 +306,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.dialogbox {
+  .content {
+    position: fixed;
+    top:10vh;
+    width: 800px;
+    height: 90vh;
+    background: #fff;
+    z-index: 1000;
+  }
+  .bg {
+    background: rgba(000, 000, 000, 0.6);
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 100;
+  }
+}
+
 .report-leftRight {
   margin: 20px 9% 0%;
   >>> .el-row .el-col {

src/views/reportManagement/testPresentation.vue

@@ -447,6 +447,7 @@ export default {
           if (res.code === 200) {
             this.centerDialogVisible = false
             this.dialogDaily = true
+            console.log(1111)
             this.$nextTick(() => {
               this.$refs.DailyReport.init(7, [vel])
             })