diff --git a/common/style/layout.css b/common/style/layout.css
index 693f188..a05c566 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -107,7 +107,7 @@ uni-button:after {
.zd_content {
width: 100%;
height: auto;
- padding: 92rpx 15rpx 82rpx 14rpx;
+ padding: 92rpx 14rpx 82rpx 14rpx;
}
.zd_wrapper {
width: 100%;
@@ -288,72 +288,3 @@ uni-button:after {
z-index: 300 !important;
}
-/** 弹窗 */
-.msg_wrapper {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- text-align: center;
- z-index: 201;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-.msg_wrapper_1 {
- text-align: left;
-}
-
-.msg_box {
- width: 90%;
- padding: 20rpx;
- background-color: #fff;
- border-radius: 4px;
- border: 1px solid #ebeef5;
- box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
- backface-visibility: hidden;
-}
-
-.msg_mask {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- opacity: .7;
- background: #000;
- z-index: 200;
-}
-
-.msg_btns {
- width: 100%;
- max-width: 300px;
- margin: 40rpx auto 0;
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-.msg_btn {
- border-radius: 10rpx;
-}
-.msg_btn:disabled {
- background-color: #c9c9c9;
-}
-.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
- font-size: 28rpx !important
-}
-.sin_input {
- width: 150rpx;
- font-size: 28rpx;
- line-height: 150rpx;
- height: 68rpx;
- color: #323232;
- padding: 0 .1rem;
- border: 1px solid #a1a1a1;
- border-radius: 3px;
-}
-.layout-t tr.checked td .sin_input {
- color: #8a8a8a;
- border: 1px solid #ffffff;
-}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 670992c..bf83eb4 100644
--- a/pages.json
+++ b/pages.json
@@ -25,7 +25,7 @@
}
},
{
- "path": "pages/modules/callmanage",
+ "path": "pages/modules/pointmanage",
"style" :
{
"navigationStyle": "custom"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d76317d..5958ad5 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -35,24 +35,18 @@
-
-
diff --git a/pages/modules/pointmanage.vue b/pages/modules/pointmanage.vue
new file mode 100644
index 0000000..66ec4bf
--- /dev/null
+++ b/pages/modules/pointmanage.vue
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+ {{e.name}}
+
+
+
+
+
+ {{e.label}}
+
+
+
+
+
+ 站点
+
+ {{el.device_name}}
+
+
+
+
+
+
+
+
+
+
+ 当前设备
+
+ {{obj.device_name}}
+
+
+
+ 当前物料
+
+
+
+
+
+ 数量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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/static/image/menu/RF05.png b/static/image/menu/RF05.png
new file mode 100644
index 0000000..4de6e93
Binary files /dev/null and b/static/image/menu/RF05.png differ
diff --git a/uni_modules/zxz-uni-data-select/changelog.md b/uni_modules/zxz-uni-data-select/changelog.md
new file mode 100644
index 0000000..d832751
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/changelog.md
@@ -0,0 +1,35 @@
+## 1.0.12(2023-09-27)
+修复搜索输入内容的时候下拉框的箭头会跑到文本框前面去
+优化当有选中项时不显示清除按钮
+## 1.0.11(2023-09-05)
+更换change事件执行顺序
+修复多选更改值时未即时更改下拉框选项
+修复单选搜索框选中了
+修复多选筛选输入时点击其他未清空筛选值
+## 1.0.10(2023-08-29)
+修复单选搜索回显问题
+## 1.0.9(2023-08-28)
+更新文档
+## 1.0.8(2023-08-28)
+更新文档
+## 1.0.7(2023-08-16)
+修复组件禁用bug
+修复数据回显问题
+添加多选搜索功能
+## 1.0.6(2023-08-05)
+修复清空值多选下拉列表还是被选中bug
+## 1.0.5(2023-07-10)
+修复多选初始化异步数据不显示问题
+## 1.0.4(2023-07-07)
+修复微信小程序多选显示兼容问题
+## 1.0.3(2023-07-06)
+修复bug
+多选情况下 初始化之后重新选择第一个不显示
+## 1.0.2(2023-07-06)
+更新VUE3兼容
+## 1.0.1(2023-06-30)
+添加多选合并功能
+## 1.0.0(2023-06-16)
+添加下拉框检索,多选功能,自定义数据
+## 1.0.4(2023-06-16)
+ 添加下拉框检索,多选功能,自定义数据
diff --git a/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
new file mode 100644
index 0000000..490b09e
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue
@@ -0,0 +1,759 @@
+
+
+
+ {{label + ':'}}
+
+
+
+
+
+ {{item[dataKey]}}
+
+
+
+
+
+ +{{current.length-collapseTagsNum}}
+
+
+
+
+ {{current}}
+
+
+ {{typePlaceholder}}
+
+
+
+
+
+
+
+
+ {{emptyTips}}
+
+
+ {{formatItemName(item)}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/zxz-uni-data-select/package.json b/uni_modules/zxz-uni-data-select/package.json
new file mode 100644
index 0000000..d73644b
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+ "id": "zxz-uni-data-select",
+ "displayName": "zxz-uni-data-select 下拉框选择器(添加下拉框检索,多选功能,多选搜索功能,自定义数据)",
+ "version": "1.0.12",
+ "description": "通过数据驱动的下拉框选择器(添加下拉框检索,多选功能,多选搜索功能,自定义数据)",
+ "keywords": [
+ "uni-ui",
+ "select",
+ "uni-data-select",
+ "下拉框",
+ "下拉选"
+],
+ "repository": "",
+ "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": "",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": ["uni-load-more"],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "u",
+ "app-nvue": "u"
+ },
+ "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",
+ "京东": "y"
+ },
+ "快应用": {
+ "华为": "y",
+ "联盟": "y"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/zxz-uni-data-select/readme.md b/uni_modules/zxz-uni-data-select/readme.md
new file mode 100644
index 0000000..45483ef
--- /dev/null
+++ b/uni_modules/zxz-uni-data-select/readme.md
@@ -0,0 +1,26 @@
+## DataSelect 下拉框选择器
+> **组件名:zxz-uni-data-select**
+> 代码块: `zxz-uni-data-select`
+
+当选项过多时,使用下拉菜单展示并选择内容
+## API
+
+### zxz-uni-data-select Props
+
+| 属性名 | 类型 | 默认值 | 说明 |
+| - | - | - | - |
+| v-model | String、Array、Number |- | 选中项绑定值 |
+| multiple | Boolean | false | 是否多选 |
+| disabled | Boolean |false | 是否禁用 |
+| dataKey | String |"key" | 作为 key 唯一标识的键名 |
+| dataValue | String | "value" | 作为 value 唯一标识的键名 |
+| collapseTags | Boolean | false | 多选时是否将选中值按文字的形式展示|
+|collapseTagsNum|Number | 1 | 多选时选中值按文字的形式展示的数量|
+| localdata | Array |- | 下拉列表本地数据 |
+|label | String | - | 左侧标题
+|placeholder | String | "请选择" | 输入框的提示文字
+|emptyTips | String |"无选项" | 无选项提示
+|clear | Boolean | true| 是否清空
+|format | String | - | 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+
+#### 如使用过程中有任何问题,或者您对组件有一些好的建议,欢迎加微weiyila520
diff --git a/utils/getData2.js b/utils/getData2.js
index 146ce8f..2750cfa 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,117 +21,50 @@ export const handLogin = (user, password) => request({
}
})
-// 菜单
-export const authority = () => {
- let res = {
- 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'}
- ]
- }
- return res
-}
-
/**
- * 站点管理
+ * 点位管理
*/
-// 1.1查询所有区域信息
+// 1.1查询区域
export const queryArea = () => request({
- url:'api/hand/queryArea',
+ url:'api/hand/region',
data: {}
})
// export const queryArea = () => {
// let res = {
-// result: [{region_code: '1', region_name: 'A1'}, {region_code: '2', region_name: 'A2'}, {region_code: '3', region_name: 'A2'}, {region_code: '4', region_name: 'A10'}]
+// result: [{value: '1', label: 'A1'}, {value: '2', label: 'A2'}]
// }
// return res
// }
-// 1.2根据区域查询设备编号及状态
+// 1.2查询点位
export const queryPointByArea = (code) => request({
- url:'api/hand/queryPointByArea',
+ url:'api/hand/point',
data: {
- areaCode: code
+ region_code: code
}
})
// export const queryPointByArea = () => {
// let res = {
-// result: [{
-// device_code: '1',
-// device_name: 'JLDFJLLJ'
-// }, {
-// device_code: '12',
-// device_name: 'JLDFJLLJ'
-// }, {
-// device_code: '13',
-// device_name: 'JLDFJLLJ'
-// }, {
-// device_code: '14',
-// device_name: 'JLDFJLLJ'
-// }, {
-// device_code: '15',
-// device_name: 'JLDFJLLJ'
-// }, {
-// device_code: '16',
-// device_name: 'JLDFJLLJ'
-// }, {
-// device_code: '17',
-// device_name: 'JLDFJLLJ'
-// }]
+// result: [{device_code: '1', device_name: 'JLDFJLLJ', status: '0', material_type: '1', qty: '10'}, {device_code: '2', device_name: 'JLDFJLLJ2'}]
// }
// return res
// }
-
-/**
- * 呼叫管理
- */
-// 1.1创建任务(确定起点)
-export const callTask = (scodes, code) => request({
- url:'api/hand/callTask',
+// 1.3查询物料
+export const handMaterial = () => request({
+ url:'api/hand/material',
+ data: {}
+})
+// export const handMaterial = () => {
+// let res = {
+// result: [{value: '1', label: 'a'}, {value: '2', label: 'b'}, {value: '3', label: 'abc'}]
+// }
+// return res
+// }
+// 1.4点位操作
+export const handPointOpt = (type, mtype, qty) => request({
+ url:'api/hand/pointOpt',
data: {
- start_device_codes: scodes,
- next_device_code: code
- }
-})
-
-/**
- * 指令管理
- */
-// 1.1查询未完成指令
-export const queryInstraction = (keyword, scode, ncode) => request({
- url:'api/hand/insts',
- data: {
- keyword: keyword,
- start_devicecode: scode,
- next_devicecode: ncode
- }
-})
-//1.2 指令操作
-export const instOperation = (uuid, type) => request({
- url:'api/hand/inst',
- data: {
- inst_uuid: uuid,
- type: type
- }
-})
-
-/**
- * 任务管理
- */
-// 1.1 查询未完成指令
-export const queryTask = (keyword, scode, ncode) => request({
- url:'api/hand/tasks',
- data: {
- keyword: keyword,
- start_devicecode: scode,
- next_devicecode: ncode
- }
-})
-// 1.2 指令操作
-export const taskOperation = (uuid, type) => request({
- url:'api/hand/taskoperation',
- data: {
- inst_uuid: uuid,
- type: type
+ type: type,
+ material_type: mtype,
+ qty: qty
}
})