吉安感知网项目-前端
张含笑
2026-02-10 a8795de267acc1e71cddbbc798c599732c198123
Merge remote-tracking branch 'origin/master'
6 files modified
57 ■■■■■ changed files
applications/drone-command/env/.env.development 2 ●●● patch | view | raw | blame | history
applications/drone-command/src/styles/common/cockpit.scss 18 ●●●●● patch | view | raw | blame | history
applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue 6 ●●●● patch | view | raw | blame | history
applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue 19 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/appConfiguration/inventory/FormDiaLog.vue 8 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue 4 ●●●● patch | view | raw | blame | history
applications/drone-command/env/.env.development
@@ -16,7 +16,7 @@
#开发环境代理地址(推荐本地新建文件 .env.development.local 来进行覆盖)
# VITE_APP_URL=https://wrj.shuixiongit.com/api
VITE_APP_URL=http://192.168.1.227
VITE_APP_URL=http://192.168.1.168
# 域名
VITE_APP_AREA_NAME=https://wrj.shuixiongit.com
applications/drone-command/src/styles/common/cockpit.scss
@@ -1639,7 +1639,13 @@
        color: #D4D5D7;
    }
    .el-message-box__container {
        display: flex;
        justify-content: center;
    }
    .el-message-box__btns {
        padding-top: 30px;
        display: flex;
        justify-content: center;
@@ -1815,6 +1821,17 @@
                    overflow-y: auto;
                    .detail-title {
                        margin-bottom: 20px;
                        font-family: Source Han Sans CN, Source Han Sans CN;
                        font-weight: 500;
                        font-size: 16px;
                        color: #FFFFFF;
                        text-align: left;
                        font-style: normal;
                        text-transform: none;
                    }
                    .el-row {
                        .el-col {
                            margin-bottom: 0;
@@ -1981,6 +1998,7 @@
                }
                .footer {
                    margin-top: 20px;
                    width: 100%;
                    display: flex;
                    align-items: center;
applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue
@@ -127,7 +127,11 @@
const fetchStatistics = async () => {
    try {
        const res = await sceneManageStatisticsApi()
        const params = {
            time: dayjs().format('YYYY-MM-DD HH:mm:ss')
        }
        const res = await sceneManageStatisticsApi(params)
        if (res.data.code === 200) {
            const { sceneManageCount, areaCount } = res.data.data
            categoryList.value[0].val = sceneManageCount || 0
applications/drone-command/src/views/dataCockpit/components/templateComponents/EquipmentTemplate.vue
@@ -27,16 +27,6 @@
        <div class="content">
            <div class="row">
                <div class="col">
                    <span class="label">类型</span>
                    {{ data.type }}
                </div>
                <div class="col">
                    <span class="label">厂商</span>
                    {{ data.manufacturer }}
                </div>
            </div>
            <div class="row">
                <div class="col">
                    <span class="label">方位角</span>
                    {{ data.azimuth }}°
                </div>
@@ -55,7 +45,14 @@
                    {{ data.model }}
                </div>
            </div>
            <div>
                <span class="label">类型</span>
                <span class="value">{{ data.type }}</span>
            </div>
            <div>
                <span class="label">厂商</span>
                <span class="value">{{ data.manufacturer }}</span>
            </div>
            <div>
                <span class="label">部署位置</span>
                <span class="value">{{ data.longitude }},{{ data.latitude }}</span>
applications/task-work-order/src/views/orderView/appConfiguration/inventory/FormDiaLog.vue
@@ -37,11 +37,11 @@
            :model="formData"
            :rules="rules"
            :disabled="dialogReadonly"
            label-width="140px"
            label-width="112px"
        >
            <el-row>
                <el-col :span="12">
                    <el-form-item label="所属区划" prop="areaCode">
                    <el-form-item label-width="90px" label="所属区划" prop="areaCode">
                    <RegionSelect
                        v-model="formData.areaCode"
                        placeholder="请选择"
@@ -55,7 +55,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="事项名称" prop="matterName">
                    <el-form-item label-width="90px" label="事项名称" prop="matterName">
                        <el-input class="gd-input" v-model="formData.matterName" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
@@ -65,7 +65,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="所属机构" prop="orgCode">
                    <el-form-item label-width="90px" label="所属机构" prop="orgCode">
                        <el-tree-select
                            class="gd-select"
                            popper-class="gd-tree-select-popper"
applications/task-work-order/src/views/orderView/appConfiguration/materials/FormDiaLog.vue
@@ -41,7 +41,7 @@
        >
            <el-row>
                <el-col :span="12">
                    <el-form-item label="材料名称" prop="materialName">
                    <el-form-item label-width="90px" label="材料名称" prop="materialName">
                        <el-input class="gd-input" v-model="formData.materialName" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
@@ -51,7 +51,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="必要性" prop="necessity">
                    <el-form-item label-width="90px" label="必要性" prop="necessity">
                        <el-select
                            class="gd-select"
                            popper-class="gd-select-popper"