diff --git a/pages.json b/pages.json index 670992c..81184d3 100644 --- a/pages.json +++ b/pages.json @@ -45,6 +45,14 @@ "navigationStyle": "custom" } } + ,{ + "path" : "pages/modules/pointmanage", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/modules/callmanage.vue b/pages/modules/callmanage.vue index 034a2dc..479ad6a 100644 --- a/pages/modules/callmanage.vue +++ b/pages/modules/callmanage.vue @@ -5,16 +5,14 @@ - {{e.region_name}} + {{e.region_name}} - - 站点 - - {{el.device_name}} - + + {{el.device_name}} + {{el.source_device}} @@ -180,31 +178,30 @@ _fj(flex-start,,,wrap) padding-bottom 10rpx .site_item - _wh(32%,100rpx) - padding 0 10rpx - margin-top 12rpx - background-color #e5e5e5 - border-radius 5px + _wh(calc(100% / 3),110rpx) + padding 5rpx 10rpx overflow hidden _fj(center) - &:nth-child(3n+2) - margin-left 2% - margin-right 2% .site_item_box - _wh(100%, 80rpx) - _fj() -.title_2 - width 36rpx - _font(28rpx,40rpx,#000,500) -.site_item_box_inner_r + _wh(100%, 100%) + padding 10rpx 0 + background-color rgb(220, 223, 230) + border-radius 10rpx +.title_locate + width 50% + _font(30rpx,40rpx,#333,bold) + font-style italic +.title_1 + _wh(100%, 60%) _fj(center) - _wh(calc(100% - 36rpx), 100%) - background-color #fff - border-radius 3px - padding 0 5rpx overflow hidden - text - _font(28rpx,40rpx,#999,,center) + _font(28rpx,28rpx,#303133,500, center) +.title_2 + _wh(100%, 40%) + _fj(center) + overflow hidden + _font(24rpx,24rpx,#303133,500, center) + opacity .69 .submit-bar justify-content space-between padding 10rpx diff --git a/pages/modules/pointmanage.vue b/pages/modules/pointmanage.vue new file mode 100644 index 0000000..da3197d --- /dev/null +++ b/pages/modules/pointmanage.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png new file mode 100644 index 0000000..e18e35a Binary files /dev/null and b/static/image/menu/RF04.png differ diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md new file mode 100644 index 0000000..c7a468a --- /dev/null +++ b/uni_modules/uni-data-checkbox/changelog.md @@ -0,0 +1,45 @@ +## 1.0.3(2022-09-16) +- 可以使用 uni-scss 控制主题色 +## 1.0.2(2022-06-30) +- 优化 在 uni-forms 中的依赖注入方式 +## 1.0.1(2022-02-07) +- 修复 multiple 为 true 时,v-model 的值为 null 报错的 bug +## 1.0.0(2021-11-19) +- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox) +## 0.2.5(2021-08-23) +- 修复 在uni-forms中 modelValue 中不存在当前字段,当前字段必填写也不参与校验的问题 +## 0.2.4(2021-08-17) +- 修复 单选 list 模式下 ,icon 为 left 时,选中图标不显示的问题 +## 0.2.3(2021-08-11) +- 修复 在 uni-forms 中重置表单,错误信息无法清除的问题 +## 0.2.2(2021-07-30) +- 优化 在uni-forms组件,与label不对齐的问题 +## 0.2.1(2021-07-27) +- 修复 单选默认值为0不能选中的Bug +## 0.2.0(2021-07-13) +- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 0.1.11(2021-07-06) +- 优化 删除无用日志 +## 0.1.10(2021-07-05) +- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题 +## 0.1.9(2021-07-05) +- 修复 nvue 黑框样式问题 +## 0.1.8(2021-06-28) +- 修复 selectedTextColor 属性不生效的Bug +## 0.1.7(2021-06-02) +- 新增 map 属性,可以方便映射text/value属性 +## 0.1.6(2021-05-26) +- 修复 不关联服务空间的情况下组件报错的Bug +## 0.1.5(2021-05-12) +- 新增 组件示例地址 +## 0.1.4(2021-04-09) +- 修复 nvue 下无法选中的问题 +## 0.1.3(2021-03-22) +- 新增 disabled属性 +## 0.1.2(2021-02-24) +- 优化 默认颜色显示 +## 0.1.1(2021-02-24) +- 新增 支持nvue +## 0.1.0(2021-02-18) +- “暂无数据”显示居中 diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue new file mode 100644 index 0000000..341a4af --- /dev/null +++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue @@ -0,0 +1,821 @@ + + + + + diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json new file mode 100644 index 0000000..113c350 --- /dev/null +++ b/uni_modules/uni-data-checkbox/package.json @@ -0,0 +1,84 @@ +{ + "id": "uni-data-checkbox", + "displayName": "uni-data-checkbox 数据选择器", + "version": "1.0.3", + "description": "通过数据驱动的单选框和复选框", + "keywords": [ + "uni-ui", + "checkbox", + "单选", + "多选", + "单选多选" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.1.1" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": ["uni-load-more","uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-data-checkbox/readme.md b/uni_modules/uni-data-checkbox/readme.md new file mode 100644 index 0000000..6eb253d --- /dev/null +++ b/uni_modules/uni-data-checkbox/readme.md @@ -0,0 +1,18 @@ + + +## DataCheckbox 数据驱动的单选复选框 +> **组件名:uni-data-checkbox** +> 代码块: `uDataCheckbox` + + +本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括: + +1. 数据绑定型组件:给本组件绑定一个data,会自动渲染一组候选内容。再以往,开发者需要编写不少代码实现类似功能 +2. 自动的表单校验:组件绑定了data,且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范,搭配使用会自动实现表单校验 +3. 本组件合并了单选多选 +4. 本组件有若干风格选择,如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件,样式代码虽然不用自己写了,却会牺牲一定的样式自定义性 + +在uniCloud开发中,`DB Schema`中配置了enum枚举等类型后,在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中,会自动生成``uni-data-checkbox``组件并绑定好data + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 \ No newline at end of file diff --git a/utils/getData2.js b/utils/getData2.js index 146ce8f..bc39702 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -27,7 +27,8 @@ export const authority = () => { sonTree: [ {menu_id: '1', imgsrc: 'RF01', name: '呼叫管理', path: '/pages/modules/callmanage'}, {menu_id: '2', imgsrc: 'RF02', name: '指令管理', path: '/pages/modules/zlmanage'}, - {menu_id: '3', imgsrc: 'RF03', name: '任务管理', path: '/pages/modules/taskmanage'} + {menu_id: '3', imgsrc: 'RF03', name: '任务管理', path: '/pages/modules/taskmanage'}, + {menu_id: '4', imgsrc: 'RF04', name: '站点管理', path: '/pages/modules/pointmanage'} ] } return res @@ -58,7 +59,9 @@ export const queryPointByArea = (code) => request({ // let res = { // result: [{ // device_code: '1', -// device_name: 'JLDFJLLJ' +// device_name: 'JLDFJLLJ', +// source_device: 'FAL3LAA01', +// status: '1' // }, { // device_code: '12', // device_name: 'JLDFJLLJ' @@ -135,3 +138,15 @@ export const taskOperation = (uuid, type) => request({ type: type } }) + +/** + * 站点管理 + */ +// 点位状态绑定 +export const bindpoint = (code, status) => request({ + url:'api/hand/bindpoint', + data: { + device_code: code, + status: status + } +})