更新

src/views/vent/home/configurable/components/content.vue

@@ -132,9 +132,6 @@
         </template>
         <template v-if="config.name === 'device_alarm'">
           <DeviceAlarm class="content__module" :devicedata="config.data" :config="config.config" />
-<<<<<<< HEAD
-        </template>  
-=======
         </template>
         <!-- lxh -->
         <template v-if="config.name === 'select_cs'">
@@ -149,15 +146,12 @@
             :btnconfig="config.config.btnconfig"
           />
         </template>
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c
         <template v-if="config.name === 'partition'">
           <Partition class="content__module" :type="config.type" :label="config.label" :icon="config.icon" />
         </template>
         <template v-if="config.name === 'selector_dual_chart'">
           <SelectorDualChart :data="config.data" :moduleData="props.moduleData" :config="config" />
         </template>
-<<<<<<< HEAD
-=======
         <template v-if="config.name === 'radio_label'">
           <RadioLabel class="content__module" :type="config.config.type" :config="config.config" />
         </template>
@@ -240,7 +234,6 @@
         <template v-if="config.name === 'link_log'"> <LinkLog></LinkLog> </template>
         <template v-if="config.name === 'rule_num'"> <RuleNum></RuleNum> </template>
         <template v-if="config.name === 'link_edit'"> <LinkRuleEdit :selected-row="selectRuleRow"> </LinkRuleEdit></template>
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c
       </div>
     </div>
   </div>
@@ -275,8 +268,6 @@ import DeviceAlarm from './preset/DeviceAlarm.vue';
 import MiniBoardNew from './detail/MiniBoard-New.vue';
 import Partition from './preset/partition.vue';
 import SelectorDualChart from './preset/selectorDualChart.vue';
-<<<<<<< HEAD
-=======
 import RadioLabel from './preset/radioLabel.vue';
 import ButtonList from './preset/buttonList.vue';
 import cardList from './preset/cardList.vue';
@@ -305,7 +296,6 @@ import RuleTable from './preset/ruleTable.vue';
 import LinkLog from './preset/linkLog.vue';
 import RuleNum from './preset/ruleNum.vue';
 import LinkRuleEdit from './preset/linkRuleEdit.vue';
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c
 // import FIreWarn from './preset/FIreWarn.vue';
 // import FIreControl from './preset/FIreControl.vue';
 

src/views/vent/home/configurable/linkConfiguration.vue

@@ -21,14 +21,10 @@ import { getAlarmLogList, warningList } from './configurable.api';
 import { testConfigLink } from './configurable.data';
 
 const { configs, fetchConfigs } = useInitConfigs();
-<<<<<<< HEAD
-const { data, updateData } = useInitPage('红沙泉露天煤矿火灾监测预警系统');
-=======
 const { data, updateData } = useInitPage('红沙泉露天煤矿系统');
 const warnResult = ref({
   warnInfo: [] as any[],
 });
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c
 let interval: number | undefined;
 onMounted(() => {
   fetchConfigs('gas_injection').then(() => {

src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue

@@ -6,24 +6,6 @@
     <div class="basic-box">
       <basicBorder title="触发条件设置">
         <div class="edit-wrap">
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue
-          <div class="edit-left">
-            <div class="edit-item" v-for="(field, index) in formFields" :key="index">
-              <div class="item-label">{{ field.label }} :</div>
-              <a-input class="item-input" v-model:value="formData[field.key]" placeholder="请输入" size="small" />
-            </div>
-          </div>
-          <div class="edit-right">
-            <div class="right-title">条件逻辑说明</div>
-            <div class="right-content">
-              <div class="right-item">IF 温度≥{{ formData.wdyz || 60 }}℃</div>
-              <div class="right-item">AND 持续时间≥{{ formData.time || 30 }}s</div>
-              <div class="right-item">AND 设备状态=在线</div>
-              <div class="right-item">AND 时间在生效范围内</div>
-              <div class="right-item">THEN 执行联动动作</div>
-              <div class="right-item">【优先级：高】</div>
-              <div class="right-item">此规则触发后将阻断低优先级</div>
-=======
           <div class="edit-right">
             <div class="right-title">条件逻辑说明</div>
             <div class="right-content">
@@ -36,7 +18,6 @@
                 <span class="right-item">AND 时间在生效范围内</span>
                 <span class="right-item">THEN 执行联动动作</span>
               </div>
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/preset/linkRuleEdit.vue
             </div>
           </div>
         </div>
@@ -96,10 +77,6 @@
 </template>
 
 <script setup lang="ts">
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue
-import { reactive, ref, onMounted } from 'vue';
-import basicBorder from './basicBorder.vue';
-=======
 import { reactive, ref, onMounted, watch, computed } from 'vue';
 import basicBorder from '../BasicBorder.vue';
 import { useLinkRuleStore } from '/@/store/modules/linkRule';
@@ -110,7 +87,6 @@ const props = defineProps<{
 
 const linkRuleStore = useLinkRuleStore();
 const currentSelectedRow = computed(() => linkRuleStore.getSelectedRow);
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/preset/linkRuleEdit.vue
 
 interface ITitleItem {
   label: string;
@@ -160,32 +136,6 @@ const steps = ref<IStepItem[]>([
   { id: 'log', name: '记录日志', status: 0 },
 ]);
 
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue
-const formFields: IFormField[] = [
-  { label: '规则名称', key: 'gzmc' },
-  { label: '报警级别', key: 'bjjb' },
-  { label: '温度阈值', key: 'wdyz' },
-  { label: '触发设备', key: 'cfsb' },
-  { label: '持续时间', key: 'time' },
-  { label: '时间范围', key: 'sjfw' },
-];
-
-const formData = reactive({
-  gzmc: '一级温度报警',
-  bjjb: '一级(严重)',
-  wdyz: '60',
-  cfsb: '声光报警',
-  time: '≥30',
-  sjfw: '值班人员',
-});
-
-function toggleSwitch(item: IActionItem) {
-  item.qy = item.qy === 1 ? 0 : 1;
-}
-
-onMounted(() => {
-  // 模拟流程状态
-=======
 // 模拟接口请求获取步骤状态
 const fetchStepStatus = async () => {
   const apiResponse = {
@@ -259,7 +209,6 @@ onMounted(() => {
     updateFormData(currentSelectedRow.value);
     getWarningList(currentSelectedRow.value);
   }
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/preset/linkRuleEdit.vue
 });
 
 watch(
@@ -295,35 +244,6 @@ const updateFormData = (row: any) => {
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue
-
-  .item-input {
-    background: transparent !important;
-    background: linear-gradient(to right, #114469, #0b2542) !important;
-    color: #fff;
-    border: 1px solid #2690c1 !important;
-    border-radius: 5px;
-    box-shadow: none !important;
-
-    &:hover,
-    &:focus {
-      background: transparent !important;
-    }
-  }
-
-  .basic-box {
-    flex: 1.2;
-    min-height: 0;
-
-    :deep(.basic-border) {
-      height: 100%;
-    }
-  }
-
-  .basic-box1 {
-    flex: 0.85;
-    min-height: 0;
-=======
   .basic-box {
     height: 30%;
     margin-top: 10px;
@@ -334,7 +254,6 @@ const updateFormData = (row: any) => {
     margin-top: 10px;
   }
   .basic-box2 {
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/preset/linkRuleEdit.vue
     margin-top: 10px;
 
     :deep(.basic-border) {
@@ -359,27 +278,6 @@ const updateFormData = (row: any) => {
     gap: 10px;
     box-sizing: border-box;
   }
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue
-
-  .edit-left {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    margin: 5px;
-  }
-
-  .edit-item {
-    display: flex;
-    align-items: center;
-    height: 32px;
-    background: linear-gradient(to right, #114469, #0b2542) !important;
-    margin-bottom: 10px;
-    padding: 0 10px;
-    box-sizing: border-box;
-  }
-=======
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/preset/linkRuleEdit.vue
 
   .item-label {
     width: 80px;
@@ -472,9 +370,6 @@ const updateFormData = (row: any) => {
       margin-top: 10px;
     }
   }
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/LinkRuleEditor.vue
-
-=======
   .right-item:nth-child(4) {
     color: #fc002a;
   }
@@ -484,7 +379,6 @@ const updateFormData = (row: any) => {
   .right-item:last-child {
     color: #46e8a3;
   }
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/preset/linkRuleEdit.vue
   .list-title {
     width: 177px;
     height: 30px;

src/views/vent/monitorManager/hsqHome/components/navMenu.vue

@@ -13,33 +13,14 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/navMenu.vue
-let props=defineProps({
-  activeIndex: {
-    type: Number,
-    default: 0
-  }
-})
-
-=======
 //当前激活menu选项索引
 let activeIndex = ref(0);
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/navMenu.vue
 let menuList = ref<any[]>([
   { label: '一张图', value: 'yzt' },
   { label: '监测预警', value: 'jcyj' },
   { label: '设备管理', value: 'sbgl' },
   { label: '联动配置', value: 'ldpz' },
   { label: '系统管理', value: 'xtgl' },
-<<<<<<< HEAD:src/views/vent/monitorManager/hsqHome/components/navMenu.vue
-  // { label: '大屏展示', value: 'dpzs' },
-])
-let $emit=defineEmits(['changeMenu'])
-
-//menu选项切换
-function handlerClick(item, index) {
-  $emit('changeMenu',item.value)
-=======
   { label: '大屏展示', value: 'dpzs' },
 ]);
 let $emit = defineEmits(['changeMenu']);
@@ -48,7 +29,6 @@ let $emit = defineEmits(['changeMenu']);
 function handlerClick(item, index) {
   activeIndex.value = index;
   $emit('changeMenu', item.value);
->>>>>>> d4e15216fce51d59af4718cd7ee6406d7a85b86c:src/views/vent/home/configurable/components/navMenu.vue
 }
 </script>