|
@@ -8,7 +8,7 @@
|
|
|
<div class="dataStoreInfo">
|
|
|
<!--基本信息-->
|
|
|
<div class="airportInfoDetails-head">
|
|
|
- <Search title="编辑目标数据信息" :isSearch="false">
|
|
|
+ <Search title="编辑源数据信息" :isSearch="false">
|
|
|
<button class="childBtnAn" @click="storagemod">保存</button>
|
|
|
</Search>
|
|
|
<div class="airportInfoDetails-head-content dialog-public-background">
|
|
@@ -20,34 +20,25 @@
|
|
|
class="demo-ruleForm"
|
|
|
label-width="140px"
|
|
|
>
|
|
|
- <el-form-item label="目标数据名" prop="name">
|
|
|
+ <el-form-item label="源数据名称" prop="name">
|
|
|
<el-input
|
|
|
size="small"
|
|
|
maxlength="128"
|
|
|
- placeholder="请输入目标数据名"
|
|
|
+ placeholder="请输入源数据名称"
|
|
|
v-model="ruleForm.name"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="数据类型" prop="tag">
|
|
|
+ <el-form-item label="数据格式" prop="tag">
|
|
|
<el-select
|
|
|
size="small"
|
|
|
style="width: 100%"
|
|
|
v-model="ruleForm.tag"
|
|
|
- placeholder="请选择数据类型"
|
|
|
+ placeholder="请选择数据格式"
|
|
|
>
|
|
|
<el-option label="Mysql_local" value="1"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="目标数据事件标识" prop="fullName">
|
|
|
- <el-input
|
|
|
- size="small"
|
|
|
- maxlength="128"
|
|
|
- placeholder="请输入目标数据事件标识"
|
|
|
- v-model="ruleForm.fullName"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-row>
|
|
|
- <el-form-item label="目标数据描述" prop="code">
|
|
|
+ <el-form-item label="目标数据描述" prop="code">
|
|
|
<el-input
|
|
|
maxlength="128"
|
|
|
placeholder="请输入描述"
|
|
@@ -57,6 +48,32 @@
|
|
|
style="width: 575px"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+ <el-row>
|
|
|
+ <el-form-item label="取值方法" prop="fullName">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-input
|
|
|
+ size="small"
|
|
|
+ maxlength="128"
|
|
|
+ placeholder="请输入取值方法"
|
|
|
+ v-model="ruleForm.fullName"
|
|
|
+ style="width: 575px"
|
|
|
+ ></el-input>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="检测方法" prop="fullName">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-input
|
|
|
+ size="small"
|
|
|
+ maxlength="128"
|
|
|
+ placeholder="请输入检测方法"
|
|
|
+ v-model="ruleForm.fullName"
|
|
|
+ style="width: 575px"
|
|
|
+ ></el-input>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</div>
|
|
@@ -85,7 +102,7 @@
|
|
|
:cell-style="{ 'text-align': 'center' }"
|
|
|
>
|
|
|
<el-table-column prop="itemName" label="数据项名称"></el-table-column>
|
|
|
- <el-table-column prop="itemCode" label="数据项标识"></el-table-column>
|
|
|
+ <el-table-column prop="itemCode" label="源数据编号"></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="dataTypeName"
|
|
|
label="数据类型"
|
|
@@ -96,7 +113,19 @@
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="isOnlyMarkName"
|
|
|
- label="数据来源表达式"
|
|
|
+ label="取值方法"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="analysisDataItemName"
|
|
|
+ label="取值表达式"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="analysisDataItemName"
|
|
|
+ label="输出标识符"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="analysisDataItemName"
|
|
|
+ label="多条拆分"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="analysisDataItemName"
|
|
@@ -160,7 +189,7 @@
|
|
|
</div>
|
|
|
</Dialog>
|
|
|
<!--新增/编辑存储数据项弹框-->
|
|
|
- <Dialog width="450px" customClass="dataStoreInfoDialog" :flag="addFlag">
|
|
|
+ <Dialog width="750px" customClass="dataStoreInfoDialog" :flag="addFlag">
|
|
|
<div class="dialog-public-background">
|
|
|
<div class="flx">
|
|
|
{{ msgType === 1 ? "新增" : "编辑" }}新增数据项信息
|
|
@@ -170,12 +199,12 @@
|
|
|
:model="dataForm"
|
|
|
:rules="dataRules"
|
|
|
ref="dataForm"
|
|
|
- label-width="130px"
|
|
|
+ label-width="100px"
|
|
|
class="demo-dataForm"
|
|
|
>
|
|
|
- <el-row :gutter="24">
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item class="flex1" label="数据项名称" prop="name">
|
|
|
+ <el-row :gutter="8">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="数据项名称" prop="name">
|
|
|
<el-input
|
|
|
maxlength="128"
|
|
|
size="small"
|
|
@@ -184,10 +213,8 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row :gutter="24">
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item class="flex1" label="数据类型" prop="tag">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="数据类型" prop="tag">
|
|
|
<el-select
|
|
|
size="small"
|
|
|
style="width: 100%"
|
|
@@ -205,49 +232,82 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row :gutter="24">
|
|
|
+ <el-row :gutter="8">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="取值方法" prop="tag">
|
|
|
+ <el-select
|
|
|
+ size="small"
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="dataForm.tag"
|
|
|
+ placeholder="请选择取值方法"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in optiondata"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="输出标识符" prop="name">
|
|
|
+ <el-input
|
|
|
+ maxlength="128"
|
|
|
+ size="small"
|
|
|
+ placeholder="输出标识符"
|
|
|
+ v-model="dataForm.name"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="8">
|
|
|
<el-col :span="24">
|
|
|
<el-form-item
|
|
|
- class="flex1"
|
|
|
- label="数据来源表达式"
|
|
|
+ label="取值表达式"
|
|
|
prop="priority"
|
|
|
>
|
|
|
<el-input
|
|
|
- maxlength="128"
|
|
|
- size="small"
|
|
|
- placeholder="请输入数据来源表达式"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="取值表达式"
|
|
|
v-model="dataForm.priority"
|
|
|
+ style="width: 104%"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row :gutter="24">
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item class="flexer" label="允许空值">
|
|
|
+ <el-form-item label="数据项描述">
|
|
|
+ <el-input
|
|
|
+ v-model="dataForm.uninq"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入描述"
|
|
|
+ style="width: 104%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="8">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item class="flexer" label="多条拆分">
|
|
|
<el-radio v-model="dataForm.isnull" label="1">是</el-radio>
|
|
|
<el-radio v-model="dataForm.isnull" label="0">否</el-radio>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item class="flexer" label="唯一项标志">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item class="flexer" label="是否必填">
|
|
|
<el-radio v-model="dataForm.uninq" label="1">是</el-radio>
|
|
|
<el-radio v-model="dataForm.uninq" label="0">否</el-radio>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row :gutter="24">
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item label="数据项描述">
|
|
|
- <el-input
|
|
|
- v-model="dataForm.uninq"
|
|
|
- size="medium"
|
|
|
- type="textarea"
|
|
|
- :rows="2"
|
|
|
- placeholder="请输入描述"
|
|
|
- />
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item class="flexer" label="是否唯一">
|
|
|
+ <el-radio v-model="dataForm.uninq" label="1">是</el-radio>
|
|
|
+ <el-radio v-model="dataForm.uninq" label="0">否</el-radio>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div class="foot center" style="padding-right: 35px">
|