Sfoglia il codice sorgente

feat: 设备管理静态调整

justkang 1 mese fa
parent
commit
7d268e1061

+ 37 - 23
src/views/iot/device/device-edit.vue

@@ -111,7 +111,7 @@
                                     >
                                         {{ $t('device.device-edit.148398-35') }}
                                     </el-button>
-                                    <el-button size="mini" @click="openCodeDialog()">{{ $t('device.device-edit.148398-36') }}</el-button>
+<!--                                    <el-button size="mini" @click="openCodeDialog()">{{ $t('device.device-edit.148398-36') }}</el-button>-->
                                 </el-form-item>
                             </el-col>
                             <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8" v-if="form.deviceId != 0">
@@ -142,14 +142,16 @@
                     <!-- <real-time-status ref="realTimeStatus" :device="form" @statusEvent="getDeviceStatusData($event)" /> -->
                     <running-status ref="runningStatus" :device="form" @statusEvent="getDeviceStatusData($event)" />
                 </el-tab-pane>
+<!--              数据采集-->
                 <el-tab-pane name="variable" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-74') }}</span>
                     <device-variable ref="deviceVariable" :device="form" />
                 </el-tab-pane>
-                <el-tab-pane name="instructionParsing" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
-                    <span slot="label">{{ $t('device.device-edit.148398-76') }}</span>
-                    <instruction-parsing ref="instructionParsing" :device="form" />
-                </el-tab-pane>
+<!--              数据调试-->
+<!--                <el-tab-pane name="instructionParsing" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-76') }}</span>-->
+<!--                    <instruction-parsing ref="instructionParsing" :device="form" />-->
+<!--                </el-tab-pane>-->
                 <el-tab-pane
                     name="deviceSub"
                     :disabled="form.deviceId == 0"
@@ -165,81 +167,93 @@
                     <span slot="label">{{ $t('device.device-edit.148398-77') }}</span>
                     <device-modbus-task ref="deviceModbusTask" :device="form" />
                 </el-tab-pane>
-
+                <!--组太应用-->
                 <el-tab-pane name="scada" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && isShowScada == true" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-73') }}</span>
                     <device-scada ref="deviceScada" :device="form" />
                 </el-tab-pane>
+                <!--实时监测-->
+<!--                <el-tab-pane name="deviceMonitor" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-51') }}</span>-->
+<!--                    <device-monitor ref="deviceMonitor" :device="form" />-->
+<!--                </el-tab-pane>-->
 
-                <el-tab-pane name="deviceMonitor" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">
-                    <span slot="label">{{ $t('device.device-edit.148398-51') }}</span>
-                    <device-monitor ref="deviceMonitor" :device="form" />
-                </el-tab-pane>
-
+                <!--监测统计-->
                 <el-tab-pane name="deviceStastic" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">
                     <span slot="label">{{ $t('device.device-edit.148398-52') }}</span>
                     <device-statistic ref="deviceStatistic" :device="form" />
                 </el-tab-pane>
 
+<!--              设备通道-->
                 <el-tab-pane name="sipChannel" :disabled="form.deviceId == 0" v-if="form.deviceType === 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-44') }}</span>
                     <channel ref="Channel" :device="form" @playerEvent="getPlayerData($event)" />
                 </el-tab-pane>
 
+<!--              设备管理-->
                 <el-tab-pane name="sipPlayer" :disabled="form.deviceId == 0" v-if="form.deviceType === 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-45') }}</span>
                     <device-live-stream ref="deviceLiveStream" :device="form" />
                 </el-tab-pane>
 
+<!--              设备录像-->
                 <el-tab-pane name="sipVideo" :disabled="form.deviceId == 0" v-if="form.deviceType === 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-46') }}</span>
                     <deviceVideo ref="deviceVideo" :device="form" />
                 </el-tab-pane>
 
+<!--              云端录像-->
                 <el-tab-pane name="ossRecord" :disabled="form.deviceId == 0" v-if="form.deviceType === 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-79') }}</span>
                     <oss-record-list ref="OssRecord" :device="form"></oss-record-list>
                 </el-tab-pane>
 
+<!--              语音对讲-->
                 <el-tab-pane name="sipTalk" :disabled="form.deviceId == 0" v-if="form.deviceType === 3">
                     <span slot="label">{{ $t('device.device-edit.148398-82') }}</span>
                     <siptalk ref="siptalk" :device="form" />
                 </el-tab-pane>
 
+<!--              设备定时-->
                 <el-tab-pane name="deviceTimer" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-47') }}</span>
                     <device-timer ref="deviceTimer" :device="form" />
                 </el-tab-pane>
 
+<!--              事件日支 -->
                 <el-tab-pane name="deviceLog" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-49') }}</span>
                     <device-log ref="deviceLog" :device="form" />
                 </el-tab-pane>
 
+<!--              指令日支-->
                 <el-tab-pane name="deviceFuncLog" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-50') }}</span>
                     <device-func ref="deviceFuncLog" :device="form" />
                 </el-tab-pane>
 
-                <el-tab-pane name="alertUser" v-hasPermi="['iot:device:alert:user:list']" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">
-                    <span slot="label">{{ $t('device.device-edit.148398-80') }}</span>
-                    <alert-user ref="alertUser" :device="form" />
-                </el-tab-pane>
+<!--              告警用户-->
+<!--                <el-tab-pane name="alertUser" v-hasPermi="['iot:device:alert:user:list']" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-80') }}</span>-->
+<!--                    <alert-user ref="alertUser" :device="form" />-->
+<!--                </el-tab-pane>-->
 
-                <el-tab-pane name="inlineVideo" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
-                    <span slot="label">{{ $t('device.device-edit.148398-75') }}</span>
-                    <device-inline-video ref="deviceInlineVideo" :sipRelationList="form.sipRelationVOList" />
-                </el-tab-pane>
+<!--              视频监控-->
+<!--                <el-tab-pane name="inlineVideo" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-75') }}</span>-->
+<!--                    <device-inline-video ref="deviceInlineVideo" :sipRelationList="form.sipRelationVOList" />-->
+<!--                </el-tab-pane>-->
 
                 <el-tab-pane name="deviceAlert" v-hasPermi="['iot:alertLog:list']" :disabled="form.deviceId == 0" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-81') }}</span>
                     <device-alert ref="deviceAlert" :device="form" />
                 </el-tab-pane>
 
-                <el-tab-pane name="deviceUser" :disabled="form.deviceId == 0" lazy>
-                    <span slot="label">{{ $t('device.device-edit.148398-48') }}</span>
-                    <device-user ref="deviceUser" :device="form" @userEvent="getUserData($event)" />
-                </el-tab-pane>
+<!--              设备分享-->
+<!--                <el-tab-pane name="deviceUser" :disabled="form.deviceId == 0" lazy>-->
+<!--                    <span slot="label">{{ $t('device.device-edit.148398-48') }}</span>-->
+<!--                    <device-user ref="deviceUser" :device="form" @userEvent="getUserData($event)" />-->
+<!--                </el-tab-pane>-->
 
                 <!-- <el-tab-pane name="device04" v-if="form.deviceType !== 3" disabled>
                     <span slot="label">

+ 2 - 2
src/views/iot/device/device-variable-card.vue

@@ -32,13 +32,13 @@
             <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="4" v-for="(item, index) in variableList" :key="index" style="margin-bottom: 20px">
                 <el-card :body-style="{ padding: '20px' }" shadow="always" style="height: 130px">
                     <el-row type="flex" :gutter="10" justify="space-between" align="middle">
-                        <el-col :span="8" style="text-align: left; font-size: 16px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-shadow: 1rpx 1rpx 2rpx rgba(0, 0, 0, 0.1)">
+                        <el-col :span="12" style="text-align: left; font-size: 16px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-shadow: 1rpx 1rpx 2rpx rgba(0, 0, 0, 0.1)">
                             <el-tooltip :content="item.identifier + ' / ' + item.modelName" placement="top-start">
                                 <span>{{ item.modelName }}</span>
                             </el-tooltip>
                         </el-col>
 
-                        <el-col :span="16" style="text-align: right">
+                        <el-col :span="12" style="text-align: right">
                             <el-tooltip class="item" effect="dark" :content="$t('device.variable-case.347856-13')" placement="top-start">
                                 <svg-icon
                                     icon-class="gather"

+ 7 - 7
src/views/iot/device/running-status.vue

@@ -12,13 +12,13 @@
                         <span class="title">{{ title }}</span>
                     </el-descriptions-item>
                     <!-- 设备升级-->
-                    <el-descriptions-item :labelStyle="statusColor">
-                        <template slot="label">
-                            <svg-icon icon-class="ota" />
-                            {{ $t('device.running-status.866086-1') }}
-                        </template>
-                        <el-button type="primary" size="mini" :plain="true" @click="viewVersion()">{{ $t('device.running-status.866086-44') }}</el-button>
-                    </el-descriptions-item>
+<!--                    <el-descriptions-item :labelStyle="statusColor">-->
+<!--                        <template slot="label">-->
+<!--                            <svg-icon icon-class="ota" />-->
+<!--                            {{ $t('device.running-status.866086-1') }}-->
+<!--                        </template>-->
+<!--                        <el-button type="primary" size="mini" :plain="true" @click="viewVersion()">{{ $t('device.running-status.866086-44') }}</el-button>-->
+<!--                    </el-descriptions-item>-->
 
                     <!-- 设备物模型-->
                     <el-descriptions-item v-for="(item, index) in deviceInfo.thingsModels" :key="index" :labelStyle="statusColor">