|
@@ -99,10 +99,10 @@
|
|
|
<p>暂无数据</p>
|
|
|
</template>
|
|
|
<el-table-column property="id" label="序号" />
|
|
|
- <el-table-column property="snId" label="开始节点" />
|
|
|
+ <!-- <el-table-column property="snId" label="开始节点" />
|
|
|
<el-table-column property="enId" label="结束节点" />
|
|
|
- <el-table-column property="code" label="编号" />
|
|
|
- <el-table-column property="name" label="名称" width="150" />
|
|
|
+ <el-table-column property="code" label="编号" /> -->
|
|
|
+ <el-table-column property="name" label="名称"/>
|
|
|
<el-table-column property="sectionType" label="截面类型" width="120" />
|
|
|
<el-table-column property="roughCoe" label="粗糙系数" width="120"/>
|
|
|
<el-table-column property="sectionPara1" label="截面参数1" width="90" />
|
|
@@ -648,7 +648,7 @@ let qxmobj=ref({
|
|
|
val2:49,
|
|
|
val3:24.5,
|
|
|
val4:29.4,
|
|
|
- val4:39.2,
|
|
|
+ val5:39.2,
|
|
|
})
|
|
|
let qtzhobj=ref({
|
|
|
val1:88.2,
|
|
@@ -663,7 +663,7 @@ let zaiobj=ref({
|
|
|
val3:29.4,
|
|
|
})
|
|
|
// 文件上传参数
|
|
|
-const radio1 = ref('1');
|
|
|
+const radio1 = ref('0');
|
|
|
const gfx=ref();
|
|
|
const inp=ref();
|
|
|
let gid=ref("");
|
|
@@ -1286,7 +1286,13 @@ const fileboolen=(val)=>{
|
|
|
const handleChange=(val)=>{
|
|
|
//resourcechange();
|
|
|
jsuanval.value=val;
|
|
|
- calculatefun();
|
|
|
+ console.log(val);
|
|
|
+ if(zairadio.value=='0'){
|
|
|
+ falsecalculatefun();
|
|
|
+ }else{
|
|
|
+ calculatefun();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
// 阻碍
|
|
|
const zaihandleChange=(val)=>{
|
|
@@ -1308,11 +1314,15 @@ switch(resource.value){
|
|
|
jsuanval.value=jisuanobj.value.val3;
|
|
|
break;
|
|
|
case '3':
|
|
|
- jsuanval.value=jisuanobj.value.val3;
|
|
|
+ jsuanval.value=jisuanobj.value.val4;
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
-calculatefun()
|
|
|
+if(zairadio.value=='0'){
|
|
|
+ falsecalculatefun();
|
|
|
+ }else{
|
|
|
+ calculatefun();
|
|
|
+ }
|
|
|
}
|
|
|
// 砌碹巷道
|
|
|
const resourcechange2=(val)=>{
|
|
@@ -1334,7 +1344,11 @@ switch(resource.value){
|
|
|
jsuanval.value=qxmobj.value.val5;
|
|
|
break;
|
|
|
}
|
|
|
-calculatefun()
|
|
|
+if(zairadio.value=='0'){
|
|
|
+ falsecalculatefun();
|
|
|
+ }else{
|
|
|
+ calculatefun();
|
|
|
+ }
|
|
|
}
|
|
|
// 障碍物
|
|
|
const zaireschange=(val)=>{
|
|
@@ -1354,6 +1368,14 @@ switch(zaires.value){
|
|
|
console.log( zuaival.value);
|
|
|
calculatefun()
|
|
|
}
|
|
|
+// 障碍为否是
|
|
|
+// 计算
|
|
|
+const falsecalculatefun=()=>{
|
|
|
+ let zonghe= parseFloat( jsuanval.value);
|
|
|
+ console.log(zonghe);
|
|
|
+ zuli.value.jsuan=zonghe/ 10000;
|
|
|
+}
|
|
|
+
|
|
|
// 计算
|
|
|
const calculatefun=()=>{
|
|
|
let zonghe= parseFloat( jsuanval.value)+parseFloat( zuaival.value);
|
|
@@ -1361,11 +1383,20 @@ const calculatefun=()=>{
|
|
|
}
|
|
|
// 清空
|
|
|
const zairadiochage1=()=>{
|
|
|
- if(radio1.value=="0"||zairadio.value=='0'){
|
|
|
- zuli.value.jsuan=null;
|
|
|
+ if(radio1.value=="0"){
|
|
|
+ zuli.value.jsuan='';
|
|
|
+ zuli.value.zidiny=guandaoobj.value.roughCoe;
|
|
|
+ console.log('jis'+zuli.value.jsuan);
|
|
|
|
|
|
- }else{
|
|
|
+ }else if(radio1.value=="1"&&zairadio.value=='1'){
|
|
|
+ zuli.value.zidiny=null;
|
|
|
calculatefun();
|
|
|
+
|
|
|
+ }else if(zairadio.value=='0'){
|
|
|
+ falsecalculatefun();
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ calculatefun();
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1382,18 +1413,20 @@ const maoqueding=()=>{
|
|
|
sdialog.value.resistance = false;
|
|
|
}
|
|
|
const seltree=(val)=>{
|
|
|
-console.log(val);zulitext.value
|
|
|
+ zairadiochage1();
|
|
|
+ radio1.value='0';
|
|
|
+ zuli.value.jsuan='';
|
|
|
+ zuli.value.zidiny= guandaoobj.value.roughCoe;
|
|
|
if(val=='毛壁面'){
|
|
|
- jsuanval.value=147.0;
|
|
|
+ jsuanval.value=58.8;
|
|
|
zulitext.value='毛壁面'
|
|
|
sdialog.value.resistance=true;
|
|
|
- calculatefun();
|
|
|
-
|
|
|
+ // calculatefun();
|
|
|
}else if(val=='砌碹面'){
|
|
|
jsuanval.value=29.4;
|
|
|
zulitext.value='砌碹巷道'
|
|
|
sdialog.value.resistance=true;
|
|
|
- calculatefun();
|
|
|
+ // calculatefun();
|
|
|
}else if(val=='其它支护'){
|
|
|
zulitext.value='其它支护'
|
|
|
sdialog.value.resistance=true;
|