|
@@ -35,7 +35,9 @@
|
|
<!-- 空间 -->
|
|
<!-- 空间 -->
|
|
<spaceRules v-else-if="curType=='空间'" ref="space" :typeName="curType" @refresh="refreshTabs" :isPending="isPending"></spaceRules>
|
|
<spaceRules v-else-if="curType=='空间'" ref="space" :typeName="curType" @refresh="refreshTabs" :isPending="isPending"></spaceRules>
|
|
<!-- 应用规则弹窗 -->
|
|
<!-- 应用规则弹窗 -->
|
|
- <apply-rules-dialog ref="apply" @refresh="getExecuteFeedback" @cancel="cancelApply"></apply-rules-dialog>
|
|
|
|
|
|
+ <apply-rules-dialog ref="apply" @refresh="getExecuteFeedback" @cancel="cancelApply" @clash="getClash"></apply-rules-dialog>
|
|
|
|
+ <!-- 冲突日志 -->
|
|
|
|
+ <applyLog ref="applyLog"></applyLog>
|
|
<!-- 规则更新提示 -->
|
|
<!-- 规则更新提示 -->
|
|
<el-dialog title="提示" :visible.sync="ruleDialogShow" width="25%" @close="rulesClose">
|
|
<el-dialog title="提示" :visible.sync="ruleDialogShow" width="25%" @close="rulesClose">
|
|
<span>{{tipCon}}</span>
|
|
<span>{{tipCon}}</span>
|
|
@@ -45,7 +47,7 @@
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
<!-- 选择增量 or 全量 执行 -->
|
|
<!-- 选择增量 or 全量 执行 -->
|
|
- <el-dialog title="提示" :visible.sync="allApplyDialog" width="50%" @close="allApplyClose">
|
|
|
|
|
|
+ <el-dialog title="提示" :visible.sync="allApplyDialog" width="30%" @close="allApplyClose">
|
|
<div id="applySelect">
|
|
<div id="applySelect">
|
|
<el-radio v-model="force" :label="false">增量执行:只设定对应规则or原始点位有变化的实例动态参数信息点</el-radio>
|
|
<el-radio v-model="force" :label="false">增量执行:只设定对应规则or原始点位有变化的实例动态参数信息点</el-radio>
|
|
<p style="color:#999;">因自动判断是否变化,可能更新不够完整,但速度比较快</p>
|
|
<p style="color:#999;">因自动判断是否变化,可能更新不够完整,但速度比较快</p>
|
|
@@ -69,7 +71,9 @@
|
|
<script>
|
|
<script>
|
|
import tools from "@/utils/tools";
|
|
import tools from "@/utils/tools";
|
|
import { mapGetters, mapActions } from "vuex";
|
|
import { mapGetters, mapActions } from "vuex";
|
|
-import applyRulesDialog from "@/components/point/dynamicdata/applyRulesDialog";
|
|
|
|
|
|
+// import applyRulesDialog from "@/components/point/dynamicdata/applyRulesDialog";
|
|
|
|
+import applyRulesDialog from "@/components/point/dynamicdata/applyRulesDialog-copy";
|
|
|
|
+import applyLog from "@/components/point/dynamicdata/applyLog";
|
|
import equipRules from "@/components/point/dynamicdata/equipRules";
|
|
import equipRules from "@/components/point/dynamicdata/equipRules";
|
|
import partsRules from "@/components/point/dynamicdata/partsRules";
|
|
import partsRules from "@/components/point/dynamicdata/partsRules";
|
|
import systemRules from "@/components/point/dynamicdata/systemRules";
|
|
import systemRules from "@/components/point/dynamicdata/systemRules";
|
|
@@ -97,10 +101,12 @@ export default {
|
|
force: false, //默认增量执行 ----- false - 增量 true - 全量执行
|
|
force: false, //默认增量执行 ----- false - 增量 true - 全量执行
|
|
isPending: false, //是否执行中:执行中禁用所有功能 true即为执行中
|
|
isPending: false, //是否执行中:执行中禁用所有功能 true即为执行中
|
|
missionID: '', //任务id
|
|
missionID: '', //任务id
|
|
|
|
+ hasClash: false, //默认不含冲突
|
|
};
|
|
};
|
|
},
|
|
},
|
|
components: {
|
|
components: {
|
|
applyRulesDialog,
|
|
applyRulesDialog,
|
|
|
|
+ applyLog,
|
|
equipRules,
|
|
equipRules,
|
|
partsRules,
|
|
partsRules,
|
|
systemRules,
|
|
systemRules,
|
|
@@ -234,6 +240,10 @@ export default {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.isPending = false;
|
|
this.isPending = false;
|
|
this.getPrompt()
|
|
this.getPrompt()
|
|
|
|
+ this.$refs.apply.getPromptobjs()
|
|
|
|
+ if(this.hasClash){
|
|
|
|
+ this.$refs.applyLog.showDialog(missionID)
|
|
|
|
+ }
|
|
}, 2000)
|
|
}, 2000)
|
|
} else {
|
|
} else {
|
|
this.isPending = true;
|
|
this.isPending = true;
|
|
@@ -249,6 +259,10 @@ export default {
|
|
cancelApply(x) {
|
|
cancelApply(x) {
|
|
this.isPending = false;
|
|
this.isPending = false;
|
|
this.tipsType = 1;
|
|
this.tipsType = 1;
|
|
|
|
+ },
|
|
|
|
+ //接收是否有冲突
|
|
|
|
+ getClash(length){
|
|
|
|
+ this.hasClash = !!length
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|