吉安感知网项目-前端
张含笑
2026-02-10 92dc99a0282ba44561d5da0039303d56d6b96145
Merge remote-tracking branch 'origin/master'
4 files modified
14 ■■■■ changed files
applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue 4 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/styles/common/cockpit.scss 6 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -13,7 +13,7 @@
                        <el-input class="command-input" v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <div v-if="checkAreaBind" class="warning-text"> 注:该设备已绑定区域,报废设备该区域无法正常使用,是否报废?</div>
                <div v-if="checkAreaBind" class="warning-text"> 注:该设备已绑定{{checkAreaBind}}区域,报废设备该区域无法正常使用,是否报废?</div>
            </el-row>
        </el-form>
        <template #footer>
@@ -108,7 +108,7 @@
    formData.value.deviceId = row.id
    getCheckAreaBind()
}
const checkAreaBind = ref(false)
const checkAreaBind = ref('')
function getCheckAreaBind() {
    fivDevicelcheckAreaBindApi({
        deviceId: formData.value.deviceId
applications/task-work-order/src/styles/common/cockpit.scss
@@ -809,7 +809,13 @@
    color: #4E5969;
  }
  .el-message-box__container {
    display: flex;
    justify-content: center;
  }
  .el-message-box__btns {
    padding-top: 10px;
    display: flex;
    justify-content: center;
applications/task-work-order/src/views/orderView/appConfiguration/inventory/ConfigDiaLog.vue
@@ -12,7 +12,7 @@
            ref="formRef"
            :model="formData"
            :rules="rules"
            label-width="140px"
            label-width="68px"
            v-loading="loading"
        >
            <el-row>
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
@@ -41,7 +41,7 @@
      :model="formData"
      :rules="rules"
      :disabled="dialogReadonly"
      label-width="140px"
      label-width="90px"
    >
      <el-row>
        <el-col :span="12">