Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-31 c26d2c757531fac125b5d7ebd5fb1819bb56e3de

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/views/dataCockpit/components/LegendBar.vue

@@ -35,11 +35,6 @@
            <img class="legend-icon" :src="equipmentIcon" alt="设备" />
            <span class="legend-text" data-text="设备">设备</span>
        </div>

        <div class="legend-item">
            <img class="legend-icon" :src="offlineEquipmentIcon" alt="告警设备" />
            <span class="legend-text" data-text="告警设备">告警设备</span>
        </div>
    </div>
</template>


 applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue

@@ -50,7 +50,7 @@
                    <div class="val">{{ formData.reviewOpinion  }}</div>
                </el-col>
            </el-row>
            <div v-if=" detailObjectionStatus === '1' && !requesterProvider">
            <div v-if=" detailObjectionStatus === '1' && permission.orderData_feedback">
                <div class="detail-title" :style="{ marginTop:pxToRem(20)}">异议反馈</div>
                <el-form ref="feedbackFormRef" class="gd-dialog-form" :model="feedbackFormData"
                                 :rules="feedbackRules" label-width="140px">
@@ -188,7 +188,7 @@
    </el-button>
    <el-button class="" color="#4C34FF" :loading="submitting || uploading" :disabled="submitting || uploading" @click="handleApply">申请</el-button>
            </template>
            <template v-if="dialogReadonly && detailObjectionStatus === '1' && !requesterProvider">
            <template v-if="dialogReadonly && detailObjectionStatus === '1' && permission.orderData_feedback">
                <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>

                <el-button
@@ -270,7 +270,8 @@
import { pxToRem } from '@/utils/rem'
import { useStore } from 'vuex'
const store = useStore()
const requesterProvider = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
const permission = computed(() => store.state.user.permission);
// const requesterProvider = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
// 初始化表单数据
const initForm = () => ({
    id:'',