修改发布问题

components/Cn-device-card/Cn-device-card.vue

@@ -52,7 +52,7 @@
                         </view>
                     </view>
                 </view>
-                <view class="uni-card__header-extra" style="position: relative" @click.stop>
+                <view class="uni-card__header-extra" style="position: relative" @click.stop="jump(device)">
                     <text class="uni-card__header-extra-text"></text>
                     <slot name="title"></slot>
                 </view>
@@ -105,6 +105,7 @@ export default {
             return str
         },
         jump() {
+            
             if (this.device.devType == 'Direct_Connected_Device') {
                 uni.navigateTo({
                     url:

manifest.json

@@ -75,7 +75,9 @@
                 "push" : {
                     "unipush" : {
                         "version" : "2",
-                        "offline" : true
+                        "offline" : true,
+                        "hms" : {},
+                        "mi" : {}
                     }
                 },
                 "share" : {}

pages/device/list.vue

@@ -89,12 +89,18 @@
                             <Cn-device-card :device="item" :key="index">
                                 <template v-slot:title>
                                     <!-- 卡片标题 -->
-                                    <switch
+                                    <view
                                         v-if="transfer || share"
+                                        class="switch-wrap"
+                                        @click.stop
+                                        @tap.stop
+                                    >
+                                        <switch
                                             :checked="checkList.indexOf(item.equipmentId) > -1"
                                             style="transform: scale(0.8); position: relative; left: 20rpx"
-                                        @change="switchChange(item)"
+                                            @change.stop="switchChange(item)"
                                         />
+                                    </view>
                                     <view class="star-icon" v-else>
                                         <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
                                     </view>
@@ -248,7 +254,10 @@ export default {
             this.select.projectName = ''
             this.getProjectList()
         }
+        
+      setTimeout(() => {
         this.store && this.store.reload()
+      }, 500);
     },
     methods: {
         bindClick(e, item) {
@@ -316,6 +325,7 @@ export default {
             console.warn('init')
             this.getEngineeringList()
             this.getProjectList()
+            
             this.getDeviceList()
         },
         getDeviceList() {

pages/engineering/list.vue

@@ -11,7 +11,7 @@
 
 
 
-            <view v-for="(item, index) in store.data" :key="index" style="margin: 0px 7px 7px;">
+            <view v-for="(item, index) in store.data" :key="index" style="margin: 0px 8px 8px;">
                 <!-- extra="🔍" -->
                 <uni-card class="boxClick" :title="item.name" @click="jump(item)">
                     <view class="term-list-bottom">
@@ -203,7 +203,7 @@ export default {
 }
 
 /deep/ .uni-card--border {
-    margin: 0 10px !important;
+    margin: 0 0px !important;
     padding-bottom: 10px;
 }
 

pages/index/comp/apply.vue

@@ -14,7 +14,7 @@
                         ><checkbox value="true" :checked="checkedAll" />全选　
                     </checkbox-group></view
                 > -->
-                已选择 {{ checkedTotal }} 条事件
+                已选择 {{ checkedTotal }} 条事件（最多{{ maxSelectCount }}条）
             </view>
             <view class="nav-menu nav-menu-btn" @click="selectDevice">申请报告 </view>
             <!-- <view style="width: 180rpx">
@@ -61,15 +61,19 @@
                             }}</text>
                         </view>
                         <view class="event-desc">
-                            <text>工程：{{ item.engineeringName }}</text>
+                            <text>工程：</text>
                             <text>项目：{{ item.projectName }}</text>
                             <text>设备：{{ item.equipmentName }}</text>
                         </view>
                     </view>
                     <view class="event-action" @click="handleWrapperClick(item, !item.wavePath)">
                         <!-- 选择 -->
-                        <checkbox-group @change="changeChild($event, item)"
+                        <checkbox-group @change.stop="changeChild($event, item)"
-                            ><checkbox value="true" :disabled="!item.wavePath" :checked="item.checked" />
+                            ><checkbox
+                                value="true"
+                                :disabled="!item.wavePath || (checkedTotal >= maxSelectCount && !item.checked)"
+                                :checked="item.checked"
+                            />
                         </checkbox-group>
                     </view>
                 </view>
@@ -126,6 +130,7 @@ export default {
             height: 0,
             checkedAll: false,
             checkedTotal: 0,
+            maxSelectCount: 5,
             sort: 0,
             array: ['发生时间', '暂降幅值', '持续时间'],
         }
@@ -201,7 +206,18 @@ export default {
             }
         },
         changeChild(e, item) {
-            item.checked = !item.checked
+            const willCheck = e.detail.value.length > 0
+            if (willCheck && !item.checked) {
+                const selectedCount = this.store.data.filter((i) => i.checked).length
+                if (selectedCount >= this.maxSelectCount) {
+                    uni.showToast({
+                        title: `最多只能选择${this.maxSelectCount}条事件`,
+                        icon: 'none',
+                    })
+                    return
+                }
+            }
+            item.checked = willCheck
             this.checkedAll = this.store.data.every((item) => item.checked === true)
             this.checkedTotal = this.store.data.filter((item) => item.checked === true).length
         },
@@ -266,7 +282,13 @@ export default {
                     title: '请选择事件!',
                     icon: 'none',
                 })
-            } else {
+            }
+            if (this.checkedTotal > this.maxSelectCount) {
+                return uni.showToast({
+                    title: `最多只能选择${this.maxSelectCount}条事件`,
+                    icon: 'none',
+                })
+            }
             uni.showLoading({
                     title: '申请中,请稍等...',
                     mask: true,
@@ -287,7 +309,6 @@ export default {
                         title: '申请报告,成功!',
                     })
                 })
-            }
         },
         isAllLineIdSame(data) {
             // 获取第一个元素的lineId作为基准

pages/index/comp/device.vue

@@ -46,9 +46,18 @@
                     <Cn-device-card :device="item" :key="index">
                         <template v-slot:title>
                             <!-- 卡片标题 -->
-                            <switch v-if="transfer || share" :checked="checkList.indexOf(item.equipmentId) > -1"
+                            <view
+                                v-if="transfer || share"
+                                class="switch-wrap"
+                                @click.stop
+                                @tap.stop
+                            >
+                                <switch
+                                    :checked="checkList.indexOf(item.equipmentId) > -1"
                                     style="transform: scale(0.8); position: relative; left: 20rpx"
-                                @change="switchChange(item)" />
+                                    @change.stop="switchChange(item)"
+                                />
+                            </view>
                             <view class="star-icon" v-else>
                                 <uni-icons type="search" size="25" color="#376cf3"></uni-icons>
                             </view>

pages/index/comp/monitoringPoint.vue

@@ -14,7 +14,7 @@
                     </view>
                 </view>
                 <view class="stats-row">
-                    <view class="stats-item" v-for="(item, idx) in summaryStats" :key="idx">
+                    <view class="stats-item" v-for="(item, idx) in summaryStats" :key="idx" @click="jump(idx)">
                         <text class="stats-num">{{ item.value }}</text>
                         <text class="stats-label">{{ item.label }}</text>
                     </view>
@@ -29,8 +29,12 @@
             </view>
             <view class="indicators-card card">
                 <view class="indicator-tags">
-                    <view v-for="(tag, idx) in selectedIndicators" :key="tag"
+                    <view
-                        class="indicator-tag indicator-tag--active" @click="removeIndicator(idx)">
+                        v-for="(tag, idx) in selectedIndicators"
+                        :key="tag"
+                        class="indicator-tag indicator-tag--active"
+                        @click="removeIndicator(idx)"
+                    >
                         <text class="indicator-tag-text">{{ formatIndicatorTag(tag) }}</text>
                         <uni-icons type="closeempty" size="12" color="#376cf3" />
                     </view>
@@ -54,8 +58,12 @@
                     </view>
                 </view>
                 <view class="monitor-search">
-                    <uni-search-bar v-model="filterKeyword" bgColor="#fff" placeholder="搜索项目、设备、监测点"
+                    <uni-search-bar
-                        cancelButton="none" />
+                        v-model="filterKeyword"
+                        bgColor="#fff"
+                        placeholder="搜索项目、设备、监测点"
+                        cancelButton="none"
+                    />
                 </view>
 
                 <view class="monitor-list">
@@ -80,30 +88,43 @@
                         </view>
 
                         <view class="params-section">
-                            <view v-for="(rowItems, rowIdx) in chunkedChildren(getDisplayChildren(point))" :key="rowIdx"
+                            <view
-                                class="double-row">
+                                v-for="(rowItems, rowIdx) in chunkedChildren(getDisplayChildren(point))"
+                                :key="rowIdx"
+                                class="double-row"
+                            >
                                 <view v-for="(child, childIdx) in rowItems" :key="childIdx" class="param-group">
                                     <view class="param-title">
                                         <text>{{ child.name }} {{ child.unit ? `(${child.unit})` : '' }}</text>
                                     </view>
                                     <view v-if="hasTPhaseData(child)" class="phase-single">
-                                        <text class="phase-value-vertical phase-value-vertical--neutral">{{ child.T
+                                        <text class="phase-value-vertical phase-value-vertical--neutral">{{
+                                            child.T
                                         }}</text>
                                     </view>
                                     <view v-else class="phase-vertical">
                                         <view class="phase-item-vertical">
-                                            <text class="phase-value-vertical"
+                                            <text
-                                                :style="{ color: phaseColors[0].color }">{{ child.A }}</text>
+                                                class="phase-value-vertical"
+                                                :style="{ color: phaseColors[0].color }"
+                                                >{{ child.A }}</text
+                                            >
                                         </view>
                                         <view class="phase-divider" />
                                         <view class="phase-item-vertical">
-                                            <text class="phase-value-vertical"
+                                            <text
-                                                :style="{ color: phaseColors[1].color }">{{ child.B }}</text>
+                                                class="phase-value-vertical"
+                                                :style="{ color: phaseColors[1].color }"
+                                                >{{ child.B }}</text
+                                            >
                                         </view>
                                         <view class="phase-divider" />
                                         <view class="phase-item-vertical">
-                                            <text class="phase-value-vertical"
+                                            <text
-                                                :style="{ color: phaseColors[2].color }">{{ child.C }}</text>
+                                                class="phase-value-vertical"
+                                                :style="{ color: phaseColors[2].color }"
+                                                >{{ child.C }}</text
+                                            >
                                         </view>
                                     </view>
                                 </view>
@@ -115,8 +136,10 @@
                             <text>更多指标</text>
                         </view>
                     </view>
-                    <uni-load-more v-if="listStatus == 'loading' || filteredMonitoringPoints.length > 0"
+                    <uni-load-more
-                        :status="listStatus"></uni-load-more>
+                        v-if="listStatus == 'loading' || filteredMonitoringPoints.length > 0"
+                        :status="listStatus"
+                    ></uni-load-more>
                     <Cn-empty v-else-if="listStatus !== 'loading'" style="top: 45%"></Cn-empty>
                 </view>
             </view>
@@ -136,12 +159,20 @@
                     <view v-if="targetLists.length === 0" class="indicator-popup-empty">
                         <text>暂无指标数据</text>
                     </view>
-                    <view v-for="item in targetLists" :key="item.id || item.name" class="indicator-popup-item"
+                    <view
+                        v-for="item in targetLists"
+                        :key="item.id || item.name"
+                        class="indicator-popup-item"
                         :class="{ 'indicator-popup-item--active': popupSelectedIndicators.includes(item.name) }"
-                        @click="togglePopupIndicator(item.name)">
+                        @click="togglePopupIndicator(item.name)"
+                    >
                         <text>{{ item.name }}</text>
-                        <uni-icons v-if="popupSelectedIndicators.includes(item.name)" type="checkmarkempty" size="18"
+                        <uni-icons
-                            color="#376cf3" />
+                            v-if="popupSelectedIndicators.includes(item.name)"
+                            type="checkmarkempty"
+                            size="18"
+                            color="#376cf3"
+                        />
                     </view>
                 </scroll-view>
             </view>
@@ -158,12 +189,7 @@ import { getDevCount } from '@/common/api/device.js'
 const DEFAULT_INDICATOR_CODES = ['Key_Power_Quality_V', 'Key_Power_Quality_I']
 
 /** 治理测点(lineType=0)卡片默认展示的指标 */
-const GOVERNANCE_DEFAULT_INDICATORS = [
+const GOVERNANCE_DEFAULT_INDICATORS = ['电网电流', '电网电压', '负载电流', '总输出电流']
-    '电网电流',
-    '电网电压',
-    '负载电流',
-    '总输出电流',
-]
 
 export default {
     data() {
@@ -239,7 +265,6 @@ export default {
     // 下拉刷新
     onPullDownRefresh() {
         this.info()
-
     },
     methods: {
         // 查询接口
@@ -331,8 +356,7 @@ export default {
             return child.T !== undefined && child.T !== null && child.T !== '-'
         },
         updateSummaryStats(devCount = {}) {
-            const deviceTotal =
+            const deviceTotal = (devCount.currentOnLineDevCount || 0) + (devCount.currentOffLineDevCount || 0)
-                (devCount.currentOnLineDevCount || 0) + (devCount.currentOffLineDevCount || 0)
 
             this.summaryStats = [
                 { label: '项目总数', value: devCount.currentProjectCount || 0 },
@@ -471,6 +495,34 @@ export default {
             })
             this.showBackTop = false
         },
+        // 跳转页面
+        jump(idx) {
+            if (idx == 0) {
+                // 项目总数 -> 项目管理
+                const engineering = uni.getStorageSync('engineering') || {
+                    id: this.engineeringId,
+                    name: this.engineeringName,
+                }
+                if (!engineering?.id) {
+                    return uni.showToast({
+                        title: '请先选择工程',
+                        icon: 'none',
+                    })
+                }
+                uni.navigateTo({
+                    url:
+                        '/pages/project/list?engineeringName=' +
+                        encodeURIComponent(engineering.name || '') +
+                        '&engineeringId=' +
+                        engineering.id,
+                })
+            } else if (idx == 1) {
+                // 设备总数
+                uni.navigateTo({
+                    url: '/pages/device/list?type=nowEngineering',
+                })
+            }
+        },
     },
 }
 </script>
@@ -545,7 +597,7 @@ export default {
     gap: 6rpx;
     padding: 8rpx 20rpx;
     border: 1rpx solid #376cf380;
-    background-color: #266FFF10;
+    background-color: #266fff10;
     border-radius: 16rpx;
     flex-shrink: 0;
 
@@ -736,8 +788,8 @@ export default {
     flex-shrink: 0;
     padding: 4rpx 12rpx;
     font-size: 22rpx;
-    color: #2E8B57;
+    color: #2e8b57;
-    background: #2E8B5715;
+    background: #2e8b5715;
     border-radius: 8rpx;
     line-height: 1.2;
 }
@@ -832,7 +884,7 @@ export default {
     line-height: 72rpx;
     text-align: center;
     border: 1rpx solid #376cf380;
-    background-color: #266FFF10;
+    background-color: #266fff10;
     border-radius: 16rpx;
 
     text {
@@ -867,7 +919,6 @@ export default {
     min-width: 80rpx;
 }
 
-
 .indicator-popup-confirm {
     font-size: 28rpx;
     color: #376cf3;

pages/user/login.vue

@@ -93,7 +93,7 @@ import { sm3Digest } from '@/common/js/sm3.js'
 export default {
     data() {
         return {
-            checkbox: true,
+            checkbox: false,
             loading: false,
             loginType: 'pwd',
             phone: '',

pages/user/register.vue

@@ -61,7 +61,7 @@ export default {
     name: 'jiaban',
     data() {
         return {
-            checkbox: true,
+            checkbox: false,
             step: 1,
             loading: false,
             waitTime: 0,