Skip to content

M
mes-ui
Commit 22ced5da authored by 康振飞's avatar 康振飞
Browse files
Options

设备管理bug修改

parent f3998490
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 41 deletions
assets/css/base.less
View file @ 22ced5da
...@@ -740,7 +740,7 @@ textarea::-webkit-input-placeholder { ...@@ -740,7 +740,7 @@ textarea::-webkit-input-placeholder {
// 纵横树的样式 // 纵横树的样式
.zh-tree { .zh-tree {
position: relative; // position: relative;
display: block; display: block;
width: 250px; width: 250px;
float: left; float: left;
...@@ -762,15 +762,15 @@ textarea::-webkit-input-placeholder { ...@@ -762,15 +762,15 @@ textarea::-webkit-input-placeholder {
} }
.zh-box { .zh-box {
height: 100%-210px;
width: 100%; width: 100%;
overflow-y: auto; height: 100%;
// overflow-y: auto;
padding: 15px; padding: 15px;
margin-bottom: -5000px; // margin-bottom: -5000px;
padding-bottom: 5000px; // padding-bottom: 5000px;
// .tree-content { // .tree-content {
// //color:#fff; // overflow-y: auto;
// } // }
} }
} }
......
package-lock.json
View file @ 22ced5da
...@@ -8774,8 +8774,7 @@ ...@@ -8774,8 +8774,7 @@
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true, "dev": true
"optional": true
}, },
"figures": { "figures": {
"version": "2.0.0", "version": "2.0.0",
...@@ -8803,7 +8802,6 @@ ...@@ -8803,7 +8802,6 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^3.0.0" "ansi-regex": "^3.0.0"
} }
...@@ -9454,8 +9452,7 @@ ...@@ -9454,8 +9452,7 @@
"dependencies": { "dependencies": {
"deepmerge": { "deepmerge": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "bundled": true
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
} }
} }
}, },
...@@ -15222,8 +15219,7 @@ ...@@ -15222,8 +15219,7 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true, "dev": true
"optional": true
}, },
"rx-lite-aggregates": { "rx-lite-aggregates": {
"version": "4.0.8", "version": "4.0.8",
...@@ -18450,8 +18446,7 @@ ...@@ -18450,8 +18446,7 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -18488,8 +18483,7 @@ ...@@ -18488,8 +18483,7 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
...@@ -18498,8 +18492,7 @@ ...@@ -18498,8 +18492,7 @@
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -18602,8 +18595,7 @@ ...@@ -18602,8 +18595,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -18613,7 +18605,6 @@ ...@@ -18613,7 +18605,6 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -18626,20 +18617,17 @@ ...@@ -18626,20 +18617,17 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -18656,7 +18644,6 @@ ...@@ -18656,7 +18644,6 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -18737,8 +18724,7 @@ ...@@ -18737,8 +18724,7 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -18748,7 +18734,6 @@ ...@@ -18748,7 +18734,6 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -18824,8 +18809,7 @@ ...@@ -18824,8 +18809,7 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -18855,7 +18839,6 @@ ...@@ -18855,7 +18839,6 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -18873,7 +18856,6 @@ ...@@ -18873,7 +18856,6 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -18912,13 +18894,11 @@ ...@@ -18912,13 +18894,11 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true
"optional": true
} }
} }
}, },
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ 22ced5da
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
<h3 class="zh-title">组织架构</h3> <h3 class="zh-title">组织架构</h3>
<div class="zh-box"> <div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" /> <Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList" class="tree-content" @on-select-change="selectTreeNode"></Tree> <Tree :data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"></Tree>
</div> </div>
</div> </div>
<!-- 右侧内容 --> <!-- 右侧内容 -->
...@@ -1068,11 +1071,9 @@ export default { ...@@ -1068,11 +1071,9 @@ export default {
this.formItemMain1.actual_finish = this.atimee; this.formItemMain1.actual_finish = this.atimee;
this.formItemMain1.failure_notes = this.failurenotes; this.formItemMain1.failure_notes = this.failurenotes;
} }
console.log(this.formItemMain1.plan_start); console.log(this.formItemMain1.plan_start);
}, },
saveOkBack() { saveOkBack() {
// console.log(str);
let url = `${systemUrl}/equipmaintainplan/createorupdate`; let url = `${systemUrl}/equipmaintainplan/createorupdate`;
let paramsdata = { let paramsdata = {
id: this.eid1, id: this.eid1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment