Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -48,3 +48,16 @@ export function queryjzd(glBsm) {
 		},
 		},
 	});
 	});
 }
 }
+/**
+ * 查询界址线
+ */
+export function queryjzx(glBsm) {
+    return request({
+        url: '/zd/qjJzx/getQjJzxListByGlBsm',
+        method: 'get',
+        params: {
+            glBsm
+        }
+    })
+}
+

@@ -25,7 +25,7 @@
                     <td><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb"
                     <td><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb"
                                @keydown="oninput"/></td>
                                @keydown="oninput"/></td>
                     <td>
                     <td>
-                        <el-select v-model="item.jblx" :disabled="item.jbisdisabled">
+                        <el-select v-model="item.jblx" :disabled="item.jzdisdisabled">
                             <el-option
                             <el-option
                                     v-for="i in jblx"
                                     v-for="i in jblx"
                                     :key="i.key"
                                     :key="i.key"
@@ -88,10 +88,10 @@
 </template>
 </template>
 
 
 <script>
 <script>
-    import {queryjzd} from '../../../api/zd'
+    import {queryjzx} from '../../../api/zd'
 
 
     export default {
     export default {
-        name: "",
+        name: "界址点",
         components: {},
         components: {},
         props: {},
         props: {},
         data() {
         data() {
@@ -149,7 +149,7 @@
                     }
                     }
                 ],
                 ],
                 jzdlist: [
                 jzdlist: [
-                    {
+                /*    {
                         isCheck: false,
                         isCheck: false,
                         jzdh: 'JZDH001',
                         jzdh: 'JZDH001',
                         sxh: '1',
                         sxh: '1',
@@ -160,29 +160,7 @@
                         iszb: 'readonly',
                         iszb: 'readonly',
                         jbisdisabled: true,
                         jbisdisabled: true,
                         jzdisdisabled: true
                         jzdisdisabled: true
-                    }, {
-                        isCheck: false,
-                        jzdh: 'JZDH002',
-                        sxh: '2',
-                        xzbz: '10.0',
-                        yzbz: '11.0',
-                        jblx: '2',
-                        jzdlx: '2',
-                        iszb: 'readonly',
-                        jbisdisabled: true,
-                        jzdisdisabled: true
-                    }, {
-                        isCheck: false,
-                        jzdh: 'JZDH003',
-                        sxh: '3',
-                        xzbz: '10.0',
-                        yzbz: '11.0',
-                        jblx: '3',
-                        jzdlx: '3',
-                        iszb: 'readonly',
-                        jbisdisabled: true,
-                        jzdisdisabled: true
-                    },
+                    }*/
 
 
                 ]
                 ]
             }
             }
@@ -192,12 +170,11 @@
         },
         },
         mounted() {
         mounted() {
             // 该标识码继承过来
             // 该标识码继承过来
-            let bsm = '401044005bad0557d5e3787239d8e18e';
-            queryjzd(bsm).then(res => {
+            let bsm = '044dc12648a1f41374679281da63e93b';
+            queryjzx(bsm).then(res => {
                 for (let i = 0; i < res.result.length; i++) {
                 for (let i = 0; i < res.result.length; i++) {
                     res.result[i]['isCheck'] = false;
                     res.result[i]['isCheck'] = false;
                     res.result[i]['iszb'] = 'readonly';
                     res.result[i]['iszb'] = 'readonly';
-                    res.result[i]['jbisdisabled'] = true;
                     res.result[i]['jzdisdisabled'] = true;
                     res.result[i]['jzdisdisabled'] = true;
                 }
                 }
                 this.jzdlist = res.result;
                 this.jzdlist = res.result;
@@ -215,11 +192,10 @@
                 }
                 }
             },
             },
             oninput(e) {
             oninput(e) {
-                e.target.value = (e.target.value.match(/^\d*(\.?\d{0,0})/g)[0]) || null
+                e.target.value = (e.target.value.match(/^\d*(\.?\d{0,4})/g)[0]) || null
             },
             },
             changeAll(e) {
             changeAll(e) {
                 if (!e.target.checked) {
                 if (!e.target.checked) {
-                    console.log("11111")
                     this.isCheckAll = false;
                     this.isCheckAll = false;
                     return
                     return
                 }
                 }
@@ -240,7 +216,6 @@
                 for (let item of this.jzdlist) {
                 for (let item of this.jzdlist) {
                     if (item.isCheck) {
                     if (item.isCheck) {
                         item.iszb = false;
                         item.iszb = false;
-                        item.jbisdisabled = false;
                         item.jzdisdisabled = false;
                         item.jzdisdisabled = false;
                     }
                     }
                 }
                 }
@@ -257,7 +232,7 @@
 </script>
 </script>
 <style scoped lang="less">
 <style scoped lang="less">
     /deep/.el-input.is-disabled .el-input__inner{
     /deep/.el-input.is-disabled .el-input__inner{
-        color: #606764;
+        color: #cc1214;
     }
     }
     .main {
     .main {
         box-sizing: border-box;
         box-sizing: border-box;
@@ -289,7 +264,7 @@
         cursor: text;
         cursor: text;
     }
     }
 
 
-    .plxg span {
-        width: 300px;
+    table:hover{
+        cursor: pointer;
     }
     }
 </style>
 </style>