Browse Source

bug修复

iZaiZaiA 2 years ago
parent
commit
f515b1cd49

+ 90 - 0
src/components/plugins/table-form/hc-form-select-search.vue

@@ -0,0 +1,90 @@
+<template>
+    <el-select v-model="selectVal" multiple filterable remote reserve-keyword remote-show-suffix :placeholder="placeholder" :keyname="keyname" :remote-method="formRemoteMethod" @change="formRemoteChange">
+        <el-option v-for="item in selectDatas" :key="item.value" :label="item.label" :value="item.value"/>
+    </el-select>
+</template>
+
+<script setup>
+import {ref, watch} from 'vue'
+import {getDapSiteData} from "~api/other"
+const props = defineProps({
+    val: {
+        type: [Number,String],
+        default: ''
+    },
+    type: {
+        type: [Number,String],
+        default: ''
+    },
+    keyname: {
+        type: [Number,String],
+        default: ''
+    },
+    placeholder: {
+        type: [Number,String],
+        default: '搜索'
+    },
+    contractid: {
+        type: [Number,String],
+        default: ''
+    },
+    pkeyid: {
+        type: [Number,String],
+        default: ''
+    },
+})
+
+//变量
+const selectVal = ref(props.val)
+
+//事件
+const emit = defineEmits(['change'])
+
+//远程搜索
+const selectDatas = ref([])
+const formRemoteMethod = (query) => {
+    const key = props.keyname, type = props.type;
+    if (query && key && type) {
+        setTableFormRemoteMethod(query, key, type)
+    }
+}
+
+//获取下拉框测站点筛选数据
+const setTableFormRemoteMethod = async (query, key, type) => {
+    if (type === 'dap_site_data') {
+        await getDapSiteDataApi(query, key)
+    }
+
+    /*emit('success', {
+        res,
+        src: link,
+        key: isKeyName.value,
+    })*/
+}
+
+//获取数据源
+const dapSiteData = ref([])
+const getDapSiteDataApi = async (query, key) => {
+    const datas = dapSiteData.value
+    if (datas.length > 0) {
+        return datas
+    } else {
+        const {error, code, data} = await getDapSiteData({
+            contractId: props.contractid,
+            pkId: props.pkeyid,
+            key: key
+        }, false)
+
+        console.log(data)
+    }
+}
+
+//上传失败
+const formRemoteChange = (val) => {
+    console.log(val)
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 2 - 2
src/config/index.js

@@ -20,6 +20,6 @@ export default {
     dev_version: '202209291410',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     //dev_host: 'http://192.168.4.6', //黄键楠
-    //dev_host: 'http://192.168.3.13', //祝炜
-    dev_host: 'http://192.168.0.155', //刘依程
+    dev_host: 'http://192.168.0.118', //祝炜
+    //dev_host: 'http://192.168.0.155', //刘依程
 }

+ 4 - 13
src/plugins/HTableForm.js

@@ -2,6 +2,7 @@ import {createApp} from "vue/dist/vue.esm-bundler.js";
 import {getTokenHeader} from '~src/api/request/header';
 import {toParse} from "vue-utils-plus";
 import HcTableFormUpload from "~com/plugins/table-form/hc-form-upload.vue"
+import HcFormSelectSearch from "~com/plugins/table-form/hc-form-select-search.vue"
 
 import {
     ElButton,ElTooltip,ElInput,ElDatePicker,ElUpload,
@@ -12,17 +13,16 @@ import {
 const components = {
     ElButton,ElTooltip,ElInput, ElDatePicker, ElUpload,
     ElInputNumber, ElTimePicker, ElSelect, ElOption, ElRadioGroup,
-    ElRadio, ElCheckbox, ElCheckboxGroup, HcTableFormUpload
+    ElRadio, ElCheckbox, ElCheckboxGroup, HcTableFormUpload, HcFormSelectSearch
 }
 
 //表单渲染
 export default class HTableForm {
-    static createForm({template, tableForm, appId, onRight, onBlur, onRemote}) {
+    static createForm({template, tableForm, appId, onRight, onBlur}) {
         const app = createApp({
             data() {
                 return {
                     getTokenHeader: getTokenHeader(),
-                    dap_site_data: {},
                     formData: tableForm,
                 }
             },
@@ -70,16 +70,7 @@ export default class HTableForm {
                         onBlur(event, KeyName, reg, this.formData[KeyName], msg)
                     }
                 },
-                //远程搜索
-                async formRemoteMethod(query, key, type) {
-                    if (query && key && type) {
-                        if (onRemote) {
-                            this[type][key] = await onRemote(query, key, type)
-                        } else {
-                            this[type][key] = []
-                        }
-                    }
-                },
+                //远程搜索处理
                 formRemoteChange(query, key, type) {
                     console.log(query, key, type)
                 }

+ 1 - 35
src/views/data-fill/components/ListItem.vue

@@ -258,10 +258,7 @@ const getExcelHtml = async (item,index) => {
                 //表单正则效验
                 onBlur: (event, key, reg, val, msg) => {
                     setTableFormBlurReg(pkeyIds, event, key, reg, val, msg, item, index)
-                },
-                onRemote: async (query, key, type) => {
-                    return await setTableFormRemoteMethod(pkeyIds, query, key, type)
-                },
+                }
             })
             item.isTableFormRender = true
             item.isRenderTableForm = true
@@ -297,37 +294,6 @@ const setTableFormBlurReg = (pkeyId, event, key, reg, val, msg, item, index) =>
     }
 }
 
-//获取下拉框测站点筛选数据
-const setTableFormRemoteMethod = async (pkeyId, query, key, type) => {
-    if (type === 'dap_site_data') {
-        return await setFormRemoteDapSiteData(pkeyId, query, key, type)
-    }
-}
-
-//处理数据
-const dap_site_data = ref([]);
-const setFormRemoteDapSiteData = async (pkeyId, query, key, type) => {
-    const datas = await getDapSiteDataApi(pkeyId, query, key, type)
-    console.log(datas)
-}
-
-//获取数据源
-const getDapSiteDataApi = async (pkeyId, query, key, type) => {
-    const datas = dap_site_data.value
-    if (datas.length > 0) {
-        return datas
-    } else {
-        const {error, code, data} = await getDapSiteData({
-            contractId: contractId.value,
-            pkId: pkeyId,
-            key: key
-        }, false)
-
-        console.log(data)
-        return []
-    }
-}
-
 //获取已填写的数据
 const getBussDataInfo = async (item,pkeyId, index) => {
     const pkeyIds = pkeyId ? pkeyId + '' : ''

+ 3 - 3
vite.config.js

@@ -37,13 +37,13 @@ export default defineConfig({
     ],
     server: {
         //port: '3001',
-        //host: '0.0.0.0',
+        host: '0.0.0.0',
         proxy: {
             '/api': {
                 ws: true,
                 changeOrigin: true,
-                target: config.prod_host,
-                //target: config.dev_host,
+                //target: config.prod_host,
+                target: config.dev_host,
                 rewrite: (path) => path.replace(new RegExp('^/api'), '/'),
             }
         }