赵殿龙 1 жил өмнө
parent
commit
7a5630ff72

+ 11 - 2
src/api/rule/data.js

@@ -4,8 +4,8 @@ import request from '@/utils/request'
 export function data_source_list(data) {
   return request({
     url: '/data_source/lists',
-    method: 'get',
-    params: data
+    method: 'post',
+    data: data
   })
 }
 
@@ -17,3 +17,12 @@ export function data_source_del(data) {
     data: data
   })
 }
+
+// 数据源-选项
+export function options_list(data) {
+  return request({
+    url: '/data_source/options',
+    method: 'get',
+    params: data
+  })
+}

+ 7 - 6
src/views/rule/config/components/CreateDialog.vue

@@ -186,9 +186,9 @@
                     <el-col :span="6">
                       <el-input v-model="sItem.param2" clearable placeholder="请输入" style="width: 100%;" />
                     </el-col>
-                    <el-col :span="2" class="text-right">
-                      <el-button type="primary" plain icon="el-icon-plus" @click="onAddTJ(index, sIndex)" />
-                      <el-button v-if="item.condition_content.length !== 1" type="primary" plain icon="el-icon-minus" @click="onDeleteTJ(index, sIndex)" />
+                    <el-col :span="4">
+                      <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="onAddTJ(index, sIndex)" />
+                      <el-button v-if="item.condition_content.length !== 1" size="mini" type="primary" plain icon="el-icon-minus" @click="onDeleteTJ(index, sIndex)" />
                     </el-col>
                   </el-row>
                   <div class="span">
@@ -244,12 +244,13 @@
                         value-key="name"
                         :fetch-suggestions="querySearch"
                         placeholder="请输入"
+                        style="width: 100%;"
                         @select="handleSelect"
                       />
                     </el-col>
-                    <el-col :span="2" class="text-right">
-                      <el-button type="primary" plain icon="el-icon-plus" @click="onAddGZ(index, sIndex)" />
-                      <el-button v-if="item.condition_content.length !== 1" type="primary" plain icon="el-icon-minus" @click="onDeleteGZ(index, sIndex)" />
+                    <el-col :span="4">
+                      <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="onAddGZ(index, sIndex)" />
+                      <el-button v-if="item.condition_content.length !== 1" type="primary" size="mini" plain icon="el-icon-minus" @click="onDeleteGZ(index, sIndex)" />
                     </el-col>
                   </el-row>
                   <div class="span">

+ 16 - 1
src/views/rule/data/index.vue

@@ -15,7 +15,7 @@
 <script>
 import SearchBoxVue from './components/SearchBox.vue'
 import TableBoxVue from './components/TableBox.vue'
-import { data_source_list } from '@/api/rule/data'
+import { data_source_list, options_list } from '@/api/rule/data'
 
 export default {
   components: {
@@ -37,13 +37,28 @@ export default {
         total: 0,
         page: 1,
         limit: 10
+      },
+      options: {
+        qingmiao_table_name: [],
+        qingmiao_field_name: [],
+        qingmiao_field: [],
+        hospital_name: [],
+        hospital_field: []
       }
     }
   },
   created() {
+    this.getOptionsData()
     this.getList()
   },
   methods: {
+    // 质控项目
+    getOptionsData() {
+      options_list().then(res => {
+        const { p } = res
+        this.objects = Array.isArray(p) ? p : []
+      })
+    },
     handleRefresh() {
       this.getList()
     },

+ 9 - 0
vue.config.js

@@ -29,6 +29,15 @@ module.exports = {
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,
+  transpileDependencies: ['element-ui'],
+  css: {
+    loaderOptions: {
+      scss: {
+        prependData: `@import "@/styles/variables.scss";`, // 不同版本的 sass,此属性不同:data、prependData、additionalData
+        sassOptions: { outputStyle: 'expanded' } // fix: 解决 element-ui 图标 icon 偶现乱码问题
+      }
+    }
+  },
   devServer: {
     proxy: {
       [process.env.VUE_APP_BASE_API]: {