4 次代碼提交 f106b84b41 ... 8ef00d3590

作者 SHA1 備註 提交日期
  yanghao 8ef00d3590 合并更改 1 周之前
  yanghao e737fcc133 fix: 显示问题 1 周之前
  Zimo 21bc5f081b 🌈 style(运维成本): 调整样式颜色,隐藏树title 1 周之前
  yanghao 54c8393c2e Merge branch 'device_book' of shuzhihua/pms-iot-vue into master 1 周之前

+ 1 - 1
.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 VITE_DEV=true
 
 
 # 请求路径  http://192.168.188.149:48080  https://iot.deepoil.cc
 # 请求路径  http://192.168.188.149:48080  https://iot.deepoil.cc
-VITE_BASE_URL='http://192.168.188.149:48080'
+VITE_BASE_URL='https://iot.deepoil.cc'
 
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
 VITE_UPLOAD_TYPE=server

+ 5 - 1
src/components/DeptTreeSelect/index.vue

@@ -24,6 +24,10 @@ const props = defineProps({
   initSelect: {
   initSelect: {
     type: Boolean,
     type: Boolean,
     default: true
     default: true
+  },
+  showTitle: {
+    type: Boolean,
+    default: true
   }
   }
 })
 })
 
 
@@ -140,7 +144,7 @@ onMounted(() => {
 
 
 <template>
 <template>
   <div class="gap-4 flex flex-col h-full">
   <div class="gap-4 flex flex-col h-full">
-    <h1 class="text-lg font-medium">{{ props.title }}</h1>
+    <h1 v-if="showTitle" class="text-lg font-medium">{{ props.title }}</h1>
     <el-input
     <el-input
       v-model="deptName"
       v-model="deptName"
       size="default"
       size="default"

+ 7 - 7
src/views/report-statistics/costs.vue

@@ -69,8 +69,8 @@ const defaultStats: StatItem[] = [
     title: '维修成本',
     title: '维修成本',
     icon: 'i-material-symbols:home-repair-service-outline',
     icon: 'i-material-symbols:home-repair-service-outline',
     class: {
     class: {
-      bg1: 'bg-[var(--el-color-success-light-9)]',
-      bg2: 'bg-[var(--el-color-success-light-8)]',
+      bg1: 'bg-[var(--el-color-success-light-7)]',
+      bg2: 'bg-[var(--el-color-success-light-5)]',
       text: 'text-[var(--el-color-success)]'
       text: 'text-[var(--el-color-success)]'
     },
     },
     value: 0,
     value: 0,
@@ -81,8 +81,8 @@ const defaultStats: StatItem[] = [
     title: '保养成本',
     title: '保养成本',
     icon: 'i-material-symbols:construction-rounded',
     icon: 'i-material-symbols:construction-rounded',
     class: {
     class: {
-      bg1: 'bg-[var(--el-color-primary-light-9)]',
-      bg2: 'bg-[var(--el-color-primary-light-8)]',
+      bg1: 'bg-[var(--el-color-primary-light-7)]',
+      bg2: 'bg-[var(--el-color-primary-light-5)]',
       text: 'text-[var(--el-color-primary)]'
       text: 'text-[var(--el-color-primary)]'
     },
     },
     value: 0,
     value: 0,
@@ -93,8 +93,8 @@ const defaultStats: StatItem[] = [
     title: '委外维修',
     title: '委外维修',
     icon: 'i-material-symbols:work-outline',
     icon: 'i-material-symbols:work-outline',
     class: {
     class: {
-      bg1: 'bg-[var(--el-color-warning-light-9)]',
-      bg2: 'bg-[var(--el-color-warning-light-8)]',
+      bg1: 'bg-[var(--el-color-warning-light-7)]',
+      bg2: 'bg-[var(--el-color-warning-light-5)]',
       text: 'text-[var(--el-color-warning)]'
       text: 'text-[var(--el-color-warning)]'
     },
     },
     value: 0,
     value: 0,
@@ -181,8 +181,8 @@ watch(
         :top-id="156"
         :top-id="156"
         :deptId="156"
         :deptId="156"
         v-model="query.deptId"
         v-model="query.deptId"
-        title="队伍"
         :init-select="false"
         :init-select="false"
+        :show-title="false"
       />
       />
     </div>
     </div>
     <div class="grid grid-rows-[1fr_32px] gap-4">
     <div class="grid grid-rows-[1fr_32px] gap-4">

+ 12 - 8
src/views/report-statistics/device_book/index2.vue

@@ -97,13 +97,20 @@
           ref="tableRef"
           ref="tableRef"
           :height="tableHeight"
           :height="tableHeight"
         >
         >
-          <el-table-column :label="t('iotDevice.serial')" width="70" align="center">
+          <el-table-column :label="t('iotDevice.serial')" width="70" align="center" fixed="left">
             <template #default="scope">
             <template #default="scope">
               {{ scope.$index + 1 }}
               {{ scope.$index + 1 }}
             </template>
             </template>
           </el-table-column>
           </el-table-column>
 
 
-          <el-table-column label="设备编码" sortable align="center" prop="deviceCode" width="150" />
+          <el-table-column
+            label="设备编码"
+            sortable
+            align="center"
+            prop="deviceCode"
+            width="150"
+            fixed="left"
+          />
           <el-table-column
           <el-table-column
             :label="t('iotDevice.name')"
             :label="t('iotDevice.name')"
             sortable
             sortable
@@ -178,7 +185,7 @@
             prop="chargeName"
             prop="chargeName"
             min-width="170"
             min-width="170"
           />
           />
-          <el-table-column
+          <!-- <el-table-column
             :label="t('deviceForm.useProject')"
             :label="t('deviceForm.useProject')"
             align="center"
             align="center"
             prop="useProject"
             prop="useProject"
@@ -189,7 +196,7 @@
             align="center"
             align="center"
             prop="assetOwnership"
             prop="assetOwnership"
             min-width="170"
             min-width="170"
-          />
+          /> -->
           <!-- <el-table-column
           <!-- <el-table-column
             :label="t('operationFill.operation')"
             :label="t('operationFill.operation')"
             align="center"
             align="center"
@@ -229,7 +236,6 @@
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-import download from '@/utils/download'
 import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import { DICT_TYPE } from '@/utils/dict'
 import { DICT_TYPE } from '@/utils/dict'
 import DeptTree from '@/views/system/user/DeptTree.vue'
 import DeptTree from '@/views/system/user/DeptTree.vue'
@@ -243,13 +249,11 @@ import { nextTick } from 'vue'
 /** 设备台账 列表 */
 /** 设备台账 列表 */
 defineOptions({ name: 'IotDevicePms' })
 defineOptions({ name: 'IotDevicePms' })
 
 
-const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
 const { push } = useRouter() // 路由跳转
 const { push } = useRouter() // 路由跳转
 
 
 const refreshStore = useRefreshStore()
 const refreshStore = useRefreshStore()
 const loading = ref(true) // 列表的加载中
 const loading = ref(true) // 列表的加载中
-const ifShow = ref(false)
 const list = ref<IotDeviceVO[]>([]) // 列表的数据
 const list = ref<IotDeviceVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
 const queryParams = reactive({
@@ -289,7 +293,6 @@ const queryParams = reactive({
   yfDeviceCode: undefined
   yfDeviceCode: undefined
 })
 })
 const queryFormRef = ref(null) // 搜索的表单
 const queryFormRef = ref(null) // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 const contentSpan = ref(20)
 const contentSpan = ref(20)
 const treeShow = ref(true)
 const treeShow = ref(true)
 
 
@@ -470,6 +473,7 @@ const debounce = (fn, delay) => {
 }
 }
 /** 初始化 **/
 /** 初始化 **/
 onMounted(async () => {
 onMounted(async () => {
+  getDeviceCount()
   nextTick(() => {
   nextTick(() => {
     calculateTableHeight()
     calculateTableHeight()
     // 使用防抖避免频繁触发
     // 使用防抖避免频繁触发