Browse Source

Merge remote-tracking branch 'origin/AIControl' into AIControl

zhouna 5 năm trước cách đây
mục cha
commit
41a4c08080
3 tập tin đã thay đổi với 107 bổ sung61 xóa
  1. 18 33
      package-lock.json
  2. 1 1
      package.json
  3. 88 27
      src/components/qualityControl/AddQualityControlTemp.vue

+ 18 - 33
package-lock.json

@@ -1931,6 +1931,7 @@
     "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npm.taobao.org/bindings/download/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -3680,9 +3681,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.4.11.tgz",
-      "integrity": "sha512-RtgK0t840NAFTajGMWvylzZRSX1EkZ7V4YgAoBxhv4TtkeMscLuk/IdYOzPdlQq6IN0byx1YVBxCX+u4yYkGvw==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.1.tgz",
+      "integrity": "sha512-jyvJmXa2c6ElRc4NOw4V1vnjHsvfzTRhbwElZ68CyF9by2F64B+AJRzujg/HJgXCimHwd2g1Av9D04EP3mWymg==",
       "dev": true,
       "requires": {
         "async-validator": "~1.8.1",
@@ -4545,6 +4546,7 @@
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "dev": true,
       "optional": true
     },
@@ -4834,8 +4836,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4856,14 +4857,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4878,20 +4877,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5008,8 +5004,7 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5021,7 +5016,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5036,7 +5030,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5044,14 +5037,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5070,7 +5061,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5160,8 +5150,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5173,7 +5162,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5259,8 +5247,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5296,7 +5283,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5316,7 +5302,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5360,14 +5345,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -6427,6 +6410,7 @@
     "jquery": {
       "version": "3.4.1",
       "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.4.1.tgz",
+      "integrity": "sha1-cU8fjZ3eS9+lV2S6N+8hRjDYDvI=",
       "dev": true
     },
     "js-levenshtein": {
@@ -7208,6 +7192,7 @@
     "nan": {
       "version": "2.14.0",
       "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
       "dev": true,
       "optional": true
     },

+ 1 - 1
package.json

@@ -25,7 +25,7 @@
     "@vue/cli-service": "^3.0.4",
     "@vue/eslint-config-standard": "^3.0.4",
     "axios": "^0.18.0",
-    "element-ui": "^2.4.7",
+    "element-ui": "^2.13.1",
     "jquery": "^3.4.1",
     "js-md5": "^0.7.3",
     "less": "^3.8.1",

+ 88 - 27
src/components/qualityControl/AddQualityControlTemp.vue

@@ -21,7 +21,7 @@
                      <el-form-item label="添加模块内容:" prop="moduleInfo" class="formItem">
                         <div class="moduleInfoItem" v-for="(item,index) in moduleInfoList">
                             <div class="searchBox">
-                                <el-input v-model="item.searchName"  placeholder="搜索字段单元" @input="searchFiled(index)">
+                                <el-input v-model.trim="item.searchName"  placeholder="搜索字段单元" @input="searchFiled(index)">
 
                                 </el-input>
                                 <ul v-if="searchIndex == index &&  item.searchResult.length > 0" class="searchResultBox">
@@ -37,12 +37,17 @@
                             <div>
                                 <p>已选择字段:</p>
                                 <div class="selectFiled" v-for="(it,ii) in item.selectFiled">
-                                    <span>{{it.name}}</span>
-                                    <span @click="upFiled(ii,index)">上升</span>
-                                    <span @click="downFiled(ii,index)">下降</span> 
-                                    <span @click="delSelected(ii,index)">删除</span>
+                                    <div class="orderBox">
+                                        <span v-if="ii !=0" class="el-icon-top order" :class="{lastItem:ii ==item.selectFiled.length}" @click="upFiled(ii,index)"></span>
+                                        <span v-if="ii !=item.selectFiled.length-1" class="el-icon-bottom order"  :class="{firstItem:ii == 0}" @click="downFiled(ii,index)"></span> 
+                                    </div>
+                                    <span class="filedName">{{it.name}}
+                                        <span class="el-icon-circle-close delFiled" @click="delSelected(ii,index)"></span>
+                                    </span>
+                                
                                 </div>
                             </div>
+                            <span class="el-icon-circle-close delUnit" @click="delUnit(index)"></span>
                         </div>
                         <span class="addUnit" @click="addUnit">+单元组</span>
                     </el-form-item>
@@ -53,6 +58,7 @@
     </div>
 </template>
 <script>
+//   import api from '@api/safeControl.js';
 export default {
     name:"AddQualityControlTemp",
     data: function(){
@@ -88,15 +94,15 @@ export default {
                     {   
                         searchName:"",
                         searchResult:[
-                            {
-                                name: "4姓名"
-                            },
-                            {
-                                name: "5职业"
-                            },
-                            {
-                                name: "6年龄"
-                            }
+                            // {
+                            //     name: "4姓名"
+                            // },
+                            // {
+                            //     name: "5职业"
+                            // },
+                            // {
+                            //     name: "6年龄"
+                            // }
                         ],
                         selectFiled:[
                             {
@@ -118,15 +124,7 @@ export default {
             this.moduleInfoList.push({   
                         searchName:"",
                         searchResult:[
-                            {
-                                name: "4姓名"
-                            },
-                            {
-                                name: "5职业"
-                            },
-                            {
-                                name: "6年龄"
-                            }
+                           
                         ],
                         selectFiled:[
                             {
@@ -144,10 +142,35 @@ export default {
         searchFiled(index){
             console.log(index)
             this.searchIndex = index
+            const searchName = this.moduleInfoList[index].searchName
+            // api.searchFiled(param).then(res =>{
+            //     if(res.data.code == '0'){
+            //          this.moduleInfoList[index].searchResult = []
+            //          this.moduleInfoList[index].searchResult.push(res.data.data)
+            //     }
+            // }).catch(e =>{
+            //     console.log(e)
+            // })
+            if(this.moduleInfoList[index].searchName){
+                this.moduleInfoList[index].searchResult = []
+                this.moduleInfoList[index].searchResult.push([
+                    {
+                        name: "4姓名"
+                    },
+                    {
+                        name: "5职业"
+                    },
+                    {
+                        name: "6年龄"
+                    }
+                    ])
+            }
         },
         selectSearchFiled(searchItem,index){
             this.moduleInfoList[index].selectFiled.push(searchItem)
             this.searchIndex = -1
+            this.moduleInfoList[index].searchName=""
+            this.moduleInfoList[index].searchResult = []
             console.log(searchItem)
         },
         upFiled(ii,index){
@@ -168,10 +191,12 @@ export default {
 
         },
         delSelected(ii,index){
-             console.log(this.moduleList)
             this.moduleInfoList[index].selectFiled.splice(ii,1)
            
         },
+        delUnit(index){
+             this.moduleInfoList.splice(index,1)
+        },
         warning(msg, type,time) {
             this.$message({
                 showClose: true,
@@ -208,13 +233,14 @@ export default {
     width: 500px;
     min-height: 200px;
     padding: 0 50px 0 50px;
-    border: 1px solid rgb(220, 223, 230);
+    border: 1px solid #dcdfe6;
     border-radius: 5px;
     margin-bottom: 20px;
+    position: relative;
 }
 .addUnit{
     display: inline-block;
-    border: 1px solid rgb(220, 223, 230);
+    border: 1px solid #dcdfe6;
     border-radius: 5px;
     width: 80px;
     text-align: center;
@@ -247,5 +273,40 @@ export default {
 .searchItem:hover{
     background-color: #abcdef;
 }
-
+.selectFiled{
+    position: relative;
+}
+.orderBox{
+    position: absolute;
+    left: -50px;
+}
+.order{
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    margin-left: 5px;
+    border: 1px solid #dcdfe6;
+    cursor: pointer;
+    i{
+        width: 15px;
+        height: 15px;
+    }
+}
+.firstItem{
+    margin-left: 28px;
+}
+.delUnit,.delFiled{
+    position: absolute;
+    top: -8px;
+    right: -6px;
+    cursor: pointer;
+}
+.delFiled{
+    top: -7px;
+    right: -9px;
+}
+.filedName{
+    position: relative;
+}
 </style>