Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

weapp/package.json

@@ -4,9 +4,9 @@
   "description": "",
   "main": ".eslintrc.js",
   "dependencies": {
+    "@vant/weapp": "^1.10.14",
     "tdesign-miniprogram": "^1.0.0-rc.2"
   },
-  "devDependencies": {},
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

weapp/package/troubleshooting/index.js

@@ -1,66 +1,117 @@
 // package/bindTroubleshooting/index.js
 Page({
 
-  /**
+    /**
-   * 页面的初始数据
+     * 页面的初始数据
-   */
+     */
-  data: {
+    data: {
-
+        // hidden: true,
-  },
+        currentTab: '0',
-
+        // 筛选选择
-  /**
+        structList: ['a', 'b', 'c'],
-   * 生命周期函数--监听页面加载
+        structResult: ['a', 'b'],
-   */
+        pointList: ['a', 'b', 'c'],
-  onLoad(options) {
+        pointResult: ['a', 'b'],
-
+        
-  },
+    },
-
+
-  /**
+    // 顶部tab切换
-   * 生命周期函数--监听页面初次渲染完成
+    clickTab (e) {
-   */
+        this.setData({
-  onReady() {
+            currentTab: e.currentTarget.dataset.current
-
+        })
-  },
+        if (e.currentTarget.dataset.current == '0') {
-
+            this.setData({
-  /**
+                page: 0,
-   * 生命周期函数--监听页面显示
+                dataList: []
-   */
+            }, () => {
-  onShow() {
+                // this.getPatrolPlan();
-
+            })
-  },
+        } else if (e.currentTarget.dataset.current == '1') {
-
+            // this.getPatrolRecord();
-  /**
+        }
-   * 生命周期函数--监听页面隐藏
+    },
-   */
+
-  onHide() {
+    // 筛选选择
-
+    onStructChange (event) {
-  },
+        this.setData({
-
+            structResult: event.detail,
-  /**
+        });
-   * 生命周期函数--监听页面卸载
+    },
-   */
+
-  onUnload() {
+    structToggle (event) {
-
+        const { index } = event.currentTarget.dataset;
-  },
+        const checkbox = this.selectComponent(`.checkboxes-struct-${index}`);
-
+        checkbox.toggle();
-  /**
+    },
-   * 页面相关事件处理函数--监听用户下拉动作
+
-   */
+    onPointChange (event) {
-  onPullDownRefresh() {
+        this.setData({
-
+            pointResult: event.detail,
-  },
+        });
-
+    },
-  /**
+
-   * 页面上拉触底事件的处理函数
+    pointToggle (event) {
-   */
+        const { index } = event.currentTarget.dataset;
-  onReachBottom() {
+        const checkbox = this.selectComponent(`.checkboxes-point-${index}`);
-
+        checkbox.toggle();
-  },
+    },
-
+
-  /**
+    noop () { },
-   * 用户点击右上角分享
+
-   */
+    /**
-  onShareAppMessage() {
+     * 生命周期函数--监听页面加载
-
+     */
-  }
+    onLoad (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage () {
+
+    }
 })

weapp/package/troubleshooting/index.json

@@ -1,3 +1,14 @@
 {
-  "usingComponents": {}
+    "usingComponents": {
+        "van-button": "@vant/weapp/button/index",
+        "van-field": "@vant/weapp/field/index",
+        "van-cell": "@vant/weapp/cell/index",
+        "van-cell-group": "@vant/weapp/cell-group/index",
+        "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+        "van-dropdown-item": "@vant/weapp/dropdown-item/index",
+        "van-checkbox": "@vant/weapp/checkbox/index",
+        "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+        "van-datetime-picker": "@vant/weapp/datetime-picker/index",
+        "timePicker": "/components/timePicker/index"
+    }
 }

weapp/package/troubleshooting/index.wxml

@@ -1,2 +1,59 @@
-<!--package/bindTroubleshooting/index.wxml-->
+<!-- package/bindTroubleshooting/index.wxml -->
-<text>package/bindTroubleshooting/index.wxml</text>
+<view class="page">
+    <!-- 顶部tab切换 -->
+    <view class='swiper-tab'>
+        <view class="swiper-tab-item" data-current="0" bindtap="clickTab" style="{{currentTab=='0' ? 'color:#1979ff' : 'color:black'}}">
+            待办事项
+        </view>
+        <view class="swiper-tab-item" data-current="1" bindtap="clickTab" style="{{currentTab=='1' ? 'color:#1979ff' : 'color:black'}}">
+            已办事项
+        </view>
+    </view>
+    <view>
+        <van-dropdown-menu>
+            <van-dropdown-item title="{{ '结构物' }}">
+                <view style="max-height:60%">
+                    <van-checkbox-group value="{{ structResult }}" bind:change="onStructChange">
+                        <van-cell-group>
+                            <van-cell wx:for="{{ structList }}" wx:key="index" title="复选框 {{ item }}" value-class="value-class" clickable data-index="{{ index }}" bind:click="structToggle">
+                                <van-checkbox catch:tap="noop" class="checkboxes-struct-{{ index }}" name="{{ item }}" />
+                            </van-cell>
+                        </van-cell-group>
+                    </van-checkbox-group>
+                </view>
+            </van-dropdown-item>
+            <van-dropdown-item title="{{ '点位' }}">
+                <view style="max-height:60%">
+                    <van-checkbox-group value="{{ pointResult }}" bind:change="onPointChange">
+                        <van-cell-group>
+                            <van-cell wx:for="{{ pointList }}" wx:key="index" title="复选框 {{ item }}" value-class="value-class" clickable data-index="{{ index }}" bind:click="pointToggle">
+                                <van-checkbox catch:tap="noop" class="checkboxes-point-{{ index }}" name="{{ item }}" />
+                            </van-cell>
+                        </van-cell-group>
+                    </van-checkbox-group>
+                </view>
+            </van-dropdown-item>
+            <van-dropdown-item title="{{ '时间' }}">
+                <view style="max-height:60%">
+                    <van-datetime-picker type="datetime" show-toolbar="{{false}}" type="date"  value="{{ currentDate }}" bind:input="onInput"/>
+                </view>
+            </van-dropdown-item>
+        </van-dropdown-menu>
+    </view>
+    <view style="height:100vh - 98rpx; padding-top:24rpx; overflow:auto">
+        <van-cell-group inset class="mission-card">
+            <view class="mission-card-title">
+                <span>asd</span>
+                <van-button type="info" round bind:tap="pickerShow">按钮</van-button>
+            </view>
+            <van-field value="输入框已禁用" label="点位名称" readonly border="{{ false }}" />
+            <van-field value="输入框已禁用" label="异常等级" readonly border="{{ false }}" />
+            <van-field value="输入框已禁用" label="任务下发时间" readonly border="{{ false }}" />
+        </van-cell-group>
+        <!-- 暂无数据 -->
+        <view hidden="{{hidden}}">
+            <image class="noData" src="../../images/noData.png"></image>
+            <view class="noTxt">暂无数据~</view>
+        </view>
+    </view>
+</view>

weapp/package/troubleshooting/index.wxss

@@ -1 +1,57 @@
-/* package/bindTroubleshooting/index.wxss */
+/* package/bindTroubleshooting/index.wxss */
+.page {
+    min-height: 100vh;
+    background: #F7F7FA;
+    position: relative;
+}
+
+/* 顶部tab */
+.swiper-tab {
+    display: flex;
+    height: 98rpx;
+    line-height: 98rpx;
+    width: 100%;
+    /* position: fixed; */
+    top: 0;
+    z-index: 100;
+    background: #fff;
+    border-bottom: 2rpx solid #e8e8e8;
+}
+
+.swiper-tab-item {
+    flex: 1;
+    font-size: 28rpx;
+    text-align: center;
+    color: #333333;
+    position: relative;
+}
+
+.noData {
+    width: 254rpx;
+    height: 298rpx;
+    display: block;
+    margin: 0rpx auto 16rpx;
+}
+
+.noTxt {
+    font-size: 30rpx;
+    color: #999;
+    font-weight: bold;
+    text-align: center;
+}
+
+/* 任务卡片 */
+.mission-card {}
+
+.mission-card-title {
+    background-color: #fff;
+    overflow: auto;
+    padding: 24rpx 16px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center
+}
+
+.value-class {
+    flex: none !important;
+}

weapp/project.config.json

@@ -27,9 +27,14 @@
     "useApiHook": true,
     "useApiHostProcess": true,
     "showShadowRootInWxmlPanel": true,
-    "packNpmManually": false,
+    "packNpmManually": true,
+    "packNpmRelationList": [
+      {
+        "packageJsonPath": "./package.json",
+        "miniprogramNpmDistDir": "./"
+      }
+    ],
     "enableEngineNative": false,
-    "packNpmRelationList": [],
     "minifyWXSS": true,
     "showES6CompileOption": false,
     "minifyWXML": true,

weapp/project.private.config.json

@@ -4,5 +4,18 @@
     "urlCheck": false,
     "compileHotReLoad": true
   },
-  "projectname": "%E8%BF%90%E7%BB%B4%E5%B7%A1%E6%A3%80"
+  "projectname": "%E8%BF%90%E7%BB%B4%E5%B7%A1%E6%A3%80",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "运维巡检",
+          "pathName": "package/troubleshooting/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
 }