|
|
@@ -766,32 +766,37 @@
|
|
|
style="width:120px"
|
|
|
>
|
|
|
<el-option
|
|
|
- :key="5"
|
|
|
+ :key="1"
|
|
|
+ label="-"
|
|
|
+ value="-"
|
|
|
+ ></el-option>
|
|
|
+ <el-option
|
|
|
+ :key="2"
|
|
|
label=">"
|
|
|
value=">"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="6"
|
|
|
+ :key="3"
|
|
|
label="<"
|
|
|
value="<"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="1"
|
|
|
+ :key="4"
|
|
|
label="≥"
|
|
|
value="≥"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="2"
|
|
|
+ :key="5"
|
|
|
label="≤"
|
|
|
value="≤"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="3"
|
|
|
+ :key="6"
|
|
|
label="±"
|
|
|
value="±"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="4"
|
|
|
+ :key="7"
|
|
|
label="【】"
|
|
|
value="【】"
|
|
|
></el-option>
|
|
|
@@ -1023,32 +1028,37 @@
|
|
|
style="width:120px"
|
|
|
>
|
|
|
<el-option
|
|
|
- :key="5"
|
|
|
+ :key="1"
|
|
|
+ label="-"
|
|
|
+ value="-"
|
|
|
+ ></el-option>
|
|
|
+ <el-option
|
|
|
+ :key="2"
|
|
|
label=">"
|
|
|
value=">"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="6"
|
|
|
+ :key="3"
|
|
|
label="<"
|
|
|
value="<"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="1"
|
|
|
+ :key="4"
|
|
|
label="≥"
|
|
|
value="≥"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="2"
|
|
|
+ :key="5"
|
|
|
label="≤"
|
|
|
value="≤"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="3"
|
|
|
+ :key="6"
|
|
|
label="±"
|
|
|
value="±"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- :key="4"
|
|
|
+ :key="7"
|
|
|
label="【】"
|
|
|
value="【】"
|
|
|
></el-option>
|
|
|
@@ -1411,7 +1421,7 @@ export default {
|
|
|
ImportElementdata: {
|
|
|
|
|
|
},
|
|
|
- ImportElementFile: [],//导入元素file文件
|
|
|
+ ImportElementFile: [],//导入元素file文件
|
|
|
ImportElementTag: false,
|
|
|
jiedianId: '',
|
|
|
excelSortTag: false,
|
|
|
@@ -1475,7 +1485,7 @@ export default {
|
|
|
curEleTable: {},
|
|
|
editEleVisible: false,
|
|
|
editEleList: [],
|
|
|
- eleReg: /(>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
|
|
|
+ eleReg: /(-|>|<|≥|≤|±|【】)?([^-≥≤±【】]*)/,
|
|
|
|
|
|
editEleFormulaVisible: false,
|
|
|
formulaInput: '',
|
|
|
@@ -2252,7 +2262,7 @@ export default {
|
|
|
this.namelists = [...this.namelist]
|
|
|
},
|
|
|
async setParameterName () {//设置参数名称中添加节点参数按钮
|
|
|
- // wbsId: this.jiedianId
|
|
|
+ // wbsId: this.jiedianId
|
|
|
this.namelists.unshift({ name: '', remark: '', k: '', type: 0, })
|
|
|
},
|
|
|
async nodeInfoSave () {//节点参数弹框保存按钮
|
