fix

src/views/dataEntry_manage/databaseComponents/batchComputedSave.vue

@@ -13,7 +13,7 @@
             </el-table-column>
             <el-table-column label="单位" align="center" width="200px">
                 <template slot-scope="scope">
-                    <selectUnit :disabled="operationForm.view" v-model="scope.row.unit"/>
+                    <selectUnit :disabled="operationForm.view||[6].includes(sourceTypeVal)" v-model="scope.row.unit"/>
                 </template>
             </el-table-column>
             <el-table-column label="频度" align="center" width="200px">
@@ -22,7 +22,7 @@
 						v-model="scope.row.frequency"
 						placeholder="请选择频率"
                         @change="handleFrequencyChange(scope)"
-                        :disabled="operationForm.view"
+                        :disabled="operationForm.view||[5,6,14,61].includes(sourceTypeVal)"
 					>
 						<el-option
 							v-for="item in frequencyArr"

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -326,7 +326,7 @@
                 </div>
             </div>
             <div style="text-align:center;margin:60px 0 40px 0">
-                <el-button type="primary" plain @click="handleClose">取消</el-button>
+                <el-button type="primary" plain @click="handleCloseSelf">取消</el-button>
                 <el-button type="primary" @click="handleNextStep">下一步</el-button>
             </div>
         </div>
@@ -598,6 +598,10 @@ export default {
                 this.$message.warning('请输入alpha值')
                 return
             }
+            if(this.computedType==72&&(Number(this.formData.alphaValue)<=0||Number(this.formData.alphaValue)>=1)){
+                this.$message.warning('请输入>0，<1的数值的alpha值')
+                return
+            }
             if(this.computedType=='withEDB'&&!this.select_target){
                 this.$message.warning('请选择指标B')
                 return
@@ -610,6 +614,8 @@ export default {
             this.isCheckAll=false
             this.isCheckIndeterminate=false
             this.checkAllStatus=false
+            this.tableDataCheckedList=[]
+            this.tableDataIds=[]
 
             this.showSave=true
         },
@@ -687,6 +693,7 @@ export default {
                 user:'',
                 keyword:''
             }
+            this.selectList=[]
             if(this.computedType=='toMonthSeason'){
                 this.subComputedType=5
                 this.filter.frequency=['月度']
@@ -701,6 +708,10 @@ export default {
             if(this.subComputedType==61){
                 this.filter.frequency=['季度']
             }
+            if(this.subComputedType==5){
+                this.filter.frequency=['月度']
+            }
+            this.handleFilter()
         },
 
         /* 指标列表 */
@@ -743,6 +754,9 @@ export default {
             this.showSave=false
             this.$emit('close')
         },
+        handleCloseSelf(){//仅仅关闭批量计算弹窗
+            this.$emit('closeSelf')
+        },
 
         filterNodes(arr) {
 			arr.length &&

src/views/dataEntry_manage/databaseList.vue

@@ -506,7 +506,8 @@
 			:isShow="showBatchComputedPop" 
 			:type="computed_type"
 			:operationForm="operationForm"
-			@close="showBatchComputedPop=false" 
+			@close="isOpenComputed=false;showBatchComputedPop=false" 
+			@closeSelf="handleCloseBatchPopSelf"
 			@addCallBack="addComputedCallBack"
 		/>
 	</div>
@@ -2005,6 +2006,13 @@ export default {
 		// 添加wind wsd指标成功
 		addTargetSuccess(params){
 			this.getTreeData(params);
+		},
+
+		handleCloseBatchPopSelf(){
+			this.showBatchComputedPop=false
+			this.$nextTick(()=>{//重新打开计算指标选择类型弹窗
+				this.isOpenComputed=true
+			})
 		}
 	},
 	//离开页面时保存标签