Merge branch 'dev' of http://39.98.150.180/antissoft/NetworkInformation into dev

monkeyhouyi
2 parents 5aef094b 8e0317fe
Showing 3 changed files with 31 additions and 11 deletions
.DS_Store
src/.DS_Store
src/views/baseSpecialAction/FormPage.vue
@@ -47,11 +47,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="发布次数" prop="releaseCount">
-                <el-input-number v-model="dataForm.releaseCount" :min="1" :max="100"></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
               <el-form-item label="发布周期" prop="releaseCount">
                 <el-select v-model="dataForm.releaseCycle" placeholder="请选择">
                   <el-option v-for="item in CycleOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -59,7 +54,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="自动发布" prop="isOpenRelease">
                 <el-radio-group v-model="dataForm.isOpenRelease">
                   <el-radio :label="true">是</el-radio>
@@ -67,6 +62,11 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="发布次数" prop="releaseCount">
+                <el-input-number v-model="dataForm.releaseCount" :min="1" :max="100"></el-input-number>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" v-if="ncc.hasFormP('annex')">
               <el-form-item label="附件" prop="annex">
                 <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
@@ -87,7 +87,11 @@
             </el-col>
             <el-col :span="24" v-if="ncc.hasFormP('communicationArea')">
               <el-form-item label="填报表单" prop="communicationArea">
-                <el-button size="mini" @click="dialogVisible = true">设计表单</el-button>
+                <el-select v-model="dataForm.relationId" placeholder="请选择专项行动填报表单" style="margin-right: 10px;width: 300px;">
+                  <el-option v-for="item in BaseList" :key="item.id" :label="item.fullName" :value="item.id">
+                  </el-option>
+                </el-select>
+                <el-button size="mini" type="text" @click="dialogVisible = true">没有找到表单？点击设计表单</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="false">
@@ -128,12 +132,11 @@
         </span>
       </div>
     </div>
-    <el-dialog title="专项行动表单设计" :visible.sync="dialogVisible" fullscreen >
-      <!-- <webDesignForm ref="webDesignForm"></webDesignForm> -->
+    <el-dialog title="专项行动表单设计" :visible.sync="dialogVisible" fullscreen @close="handleClose">
       <iframe 
         :src="nestedPageUrl" 
         width="100%" 
-        :height="viewportHeight - 110 + 'px'" 
+        :height="viewportHeight - 58 + 'px'" 
         frameborder="0" 
         allowfullscreen>
       </iframe>
@@ -157,6 +160,7 @@ export default {
       dialogVisible: false,
       viewportHeight: 0,
       nestedPageUrl:"http://8.130.38.56:8043/old/#/onlineDev/webDesign/indexNew",
+      // nestedPageUrl:"http://localhost:3000/#/onlineDev/webDesign/indexNew",
       dataForm: {
         id: undefined,
         specialActionType: undefined,
@@ -207,6 +211,7 @@ export default {
       ],
       specialActionTypeOptions: [],
       communicationAreaOptions: [],
+      BaseList:[]
     };
   },
   computed: {},
@@ -214,6 +219,7 @@ export default {
   created() {
     this.getspecialActionTypeOptions();
     this.getcommunicationAreaOptions();
+    this.getDataForm();
     this.updateViewportHeight();
     // 监听窗口大小变化事件
     window.addEventListener('resize', this.updateViewportHeight);
@@ -224,7 +230,11 @@ export default {
     window.removeEventListener('resize', this.updateViewportHeight);
   },
   methods: {
-
+    handleClose() {
+      // 这里是对话框关闭后需要执行的代码
+      this.getDataForm();
+      // 例如，你可以在这里添加任何其他的逻辑
+    },
     //查询所有区县
     getcommunicationAreaOptions() {
       request({
@@ -234,6 +244,16 @@ export default {
         this.communicationAreaOptions = res.data;
       });
     },
+    //查询表单
+    getDataForm() {
+      request({
+        url: "/visualdev/Base?type=1",
+        method: "get",
+      }).then((res) => {
+        this.BaseList = res.data.list[0].children;
+        console.log(this.BaseList)
+      });
+    },
     updateViewportHeight() {
       // 获取页面显示高度
       this.viewportHeight = window.innerHeight || document.documentElement.clientHeight;