From 2ebfac32ae11f2c883d57b61626835d2e9c33b2a Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 06 五月 2023 09:19:18 +0800
Subject: [PATCH] 修改发布影像白色无法选择；修改空间搜索选择后，上面的框类显示目录结构最高层级的名称；下拉框的收回机制修改；图层管理移动修改；管线输送介质，图层管理-属性表-翻译错误修改；3D切换到2D，底图切换失效修改；模板管理修改；
---
src/views/datamanage/uploadmanage.vue | 5
src/components/mapol.vue | 14 +-
src/views/Synthesis/LeftMenu.vue | 4
src/views/userManage/templateManage.vue | 173 ++++++++++++++++++++----
src/views/datamanage/dataUpdata.vue | 5
src/views/datamanage/layerManagement.vue | 4
src/views/Tools/maplayer.vue | 84 +++++++++++
src/assets/lang/zh.js | 3
src/views/Tools/LayerTree.vue | 4
public/SmartEarthSDK/Workers/path/Path.html | 2
src/assets/css/config.css | 4
src/components/MapView/mapMenuTop.vue | 19 +-
src/assets/lang/en.js | 3
src/components/MapView/mapSpacePop.vue | 81 +++++++++--
src/views/Tools/AddOnlineMap.vue | 7 +
15 files changed, 339 insertions(+), 73 deletions(-)
diff --git a/public/SmartEarthSDK/Workers/path/Path.html b/public/SmartEarthSDK/Workers/path/Path.html
index 745e860..bbeb9c4 100644
--- a/public/SmartEarthSDK/Workers/path/Path.html
+++ b/public/SmartEarthSDK/Workers/path/Path.html
@@ -249,7 +249,7 @@
var fly = null;
var sgworld = parent.sgworld;
var routeData = parent.PathAnimationData.flyData;
- var url = parent.SmartEarthRootUrl + "Workers/Model/xiaoche.glb";
+ var url = parent.SmartEarthRootUrl + "Workers/Model/car_samll.glb";
$('#start').hide();
$('#stop').show();
var form, element, slider;
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index 219b050..e457839 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -525,4 +525,8 @@
.Black_theme .el-icon-crop {
color: #fff !important;
+}
+
+.Black_theme .box-card {
+ background: rgba(48, 48, 48, 0.95) !important;
}
\ No newline at end of file
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index a7b0e27..2abee09 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -59,7 +59,8 @@
attribute: 'Attribute',
id: "ID",
info: 'Info',
- warehousResults: 'Warehousing results'
+ warehousResults: 'Warehousing results',
+ templateType: 'Template Type'
},
dataManage: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index db75efb..ea92f58 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -59,7 +59,8 @@
attribute: '灞炴��',
id: "ID",
info: '淇℃伅',
- warehousResults: '鍏ュ簱缁撴灉'
+ warehousResults: '鍏ュ簱缁撴灉',
+ templateType: '妯℃澘绫诲瀷'
},
dataManage: {
dataManage: '鏁版嵁绠＄悊',
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index dd34abe..901cadd 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -389,17 +389,22 @@
getCheckedNodes() {
this.layerTabe = [];
var valTree = this.$refs.tree.getCheckedNodes()
+ var parentIds = this.$refs.tree.getHalfCheckedKeys(true)
if (valTree.length == 0) return
-
- this.menuTopFrom.queryLayer = null;
-
- this.$store.state.propertiesName = valTree[0];
this.treeChange = [];
+ this.menuTopFrom.queryLayer = null;
+ if (parentIds.length > 0) {
+ this.menuTopFrom.queryLayer = this.$refs.tree.getNode(parentIds[0]).data.label
+ } else {
+ this.menuTopFrom.queryLayer = valTree[0].label
+ }
+ this.$store.state.propertiesName = valTree[0];
+
for (var i = 0; i < valTree.length; i++) {
if (valTree[i].entity) {
- if (!this.menuTopFrom.queryLayer) {
- this.menuTopFrom.queryLayer = valTree[i].tabDesc;
- }
+ // if (!this.menuTopFrom.queryLayer) {
+ // this.menuTopFrom.queryLayer = valTree[i].tabDesc;
+ // }
this.layerTabe.push(valTree[i])
// this.treeChange.push(valTree[i])
}
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index d20a926..1b2e5e9 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -500,23 +500,54 @@
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触")
}
- this.filedsOption = [];
+ const data1 = await inquiry_selectDomains({ name: this.spaceLayer })
+ if (data1.code != 200) {
+ this.$message.error("鍒楄〃璋冪敤澶辫触")
+ }
+
+
+
this.optionx = []
+ this.attributeData = []
var valadata = data.result
+ var laydomain = data1.result
+ this.optionx = data1.result
for (var i in valadata) {
if (valadata[i].showtype == 1) {
if (
valadata[i].domainNa != null &&
valadata[i].domainNa != undefined
) {
- valadata[i].domainNa = this.getMatchDomainNa(valadata[i].domainNa)
+ for (var j in laydomain) {
+ if (laydomain[j].domName == valadata[i].domainNa) {
+ // valadata[i].domainNa = laydomain[j].codeDesc
+ }
+ }
}
- this.optionx.push(valadata[i])
+
this.filedsOption.push(valadata[i])
+ // this.attributeData.push(valadata[i])
+ // this.optionx.push(valadata[i])
this.attributeData.push(valadata[i])
+
}
}
- this.startFiledAndcondition();
+
+ // this.filedsOption = [];
+ // this.optionx = []
+ // var valadata = data.result
+ // for (var i in valadata) {
+ // if (valadata[i].showtype == 1) {
+ // if (
+ // valadata[i].domainNa != null &&
+ // valadata[i].domainNa != undefined
+ // ) {
+ // valadata[i].domainNa = this.getMatchDomainNa(valadata[i].domainNa)
+ // }
+
+ // }
+ // }
+ // this.startFiledAndcondition();
this.showSpacePopLayer()
},
appendQueryFilter() {
@@ -645,21 +676,41 @@
})
- var val_Data = data.result
+
this.count = data.count
-
- for (var i in val_Data) {
- var valste = val_Data[i]
- for (var j in this.optionx) {
- if (
- this.optionx[j].domainNa != null &&
- this.optionx[j].domainNa != undefined
- ) {
- valste[this.optionx[j].field] = this.optionx[j].domainNa
+ for (var i in val) {
+ var meson = this.optionx.filter(res => {
+ if (res.domCode == val[i].medium) {
+ return res
}
+ })
+ if (meson.length > 0) {
+ val[i].medium = meson[0].codeDesc
+ } else {
+ val[i].medium = ''
}
- }
+ }
+ // debugger
+ // // debugger
+ // // // for (var i in val_Data) {
+ // // // var valste = val_Data[i]
+ // // // for (var j in this.optionx) {
+ // // // if (
+ // // // this.optionx[j].domainNa != null &&
+ // // // this.optionx[j].domainNa != undefined
+ // // // ) {
+ // // // console.log(this.optionx[j])
+ // // // // valste[this.optionx[j].field] = this.optionx[j].domainNa
+ // // // }
+ // // // }
+ // // // }
+ // // for (var j in this.optionx) {
+ // // console.log(this.optionx[j].domainNa)
+ // // // if (this.optionx[j].alias == '杈撻�佷粙璐�') {
+ // // // console.log(this.optionx[j].domainNa)
+ // // // }
+ // // }
this.tableData = val
this.$refs.filterTable.doLayout()
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 4a78b1d..b668f48 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -98,17 +98,17 @@
init2DMap() {
var layerBase = [];
if (!is_production) {
- var vectorLayer = new TileLayer({
- source: new XYZ({
- url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
- }),
- })
- var imageLayer = new TileLayer({
+ // window.vectorLayer = new TileLayer({
+ // source: new XYZ({
+ // url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+ // }),
+ // })
+ window.vectorLayer = new TileLayer({
source: new XYZ({
url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
}),
})
- layerBase = [vectorLayer, imageLayer]
+ layerBase = [vectorLayer]
}
window.map = new Map({
target: "mapol",
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 5913567..fb4755b 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -2779,10 +2779,6 @@
}
}
-
-
-
-
arr['eventid'] = valste.eventid
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index 156b600..d6bbf49 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -248,6 +248,11 @@
window.BaseMapLayer
);
window.map.removeLayer(window.olBaseMapLayer);
+ if (!is_production) {
+ if (window.vectorLayer) {
+ window.map.removeLayer(window.vectorLayer);
+ }
+ }
},
addImageLayer(map, mapCollection) {
@@ -273,6 +278,7 @@
window.map.addLayer(window.olBaseMapLayer);
return;
} else if (mapCollection.sourceType === "tdmap") {
+
var tokne = mapCollection.tokne;
//娣诲姞澶╁湴鍥惧奖鍍�
@@ -283,6 +289,7 @@
format: "image/jpeg",
tileMatrixSetID: "GoogleMapsCompatible",
}))
+
window.olBaseMapLayer = new TileLayer({
title: "楂樺痉鍦板浘",
source: new XYZ({
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 0d84642..f1f209e 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -1041,7 +1041,7 @@
var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(vm.yaw), 0, 0);
var matrix = Cesium.Transforms.headingPitchRollToFixedFrame(pos, hpr, Cesium.Ellipsoid.WGS84, converter);
tileset._root.transform = matrix;
- Viewer.flyTo(tileset);
+ // Viewer.flyTo(tileset);
},
tileSet(tileset, height) {
//3dtile妯″瀷鐨勮竟鐣岀悆浣�
@@ -1055,7 +1055,7 @@
var translation = Cesium.Cartesian3.subtract(Cartesian3_offset, Cartesian3_original, new Cesium.Cartesian3());
//淇敼妯″瀷鐭╅樀
tileset.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
- Viewer.flyTo(tileset);
+ // Viewer.flyTo(tileset);
},
setTreeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
diff --git a/src/views/Tools/maplayer.vue b/src/views/Tools/maplayer.vue
index b59da98..4afa171 100644
--- a/src/views/Tools/maplayer.vue
+++ b/src/views/Tools/maplayer.vue
@@ -11,8 +11,18 @@
:top="data.top || top + index * 42 + 'px'"
>
<div>
- <layer-tree />
+ <div
+ id="eagleMapContainer"
+ style="width:300px;height:400px;"
+ v-drag
+ @mousedown="dragEagle"
+ >
+ <layer-tree />
+ </div>
</div>
+ <!-- <div class="InfoPopupContianer">
+
+ </div> -->
</Popup>
</div>
</template>
@@ -35,9 +45,79 @@
top: 10,
};
},
+ directives: {
+ drag: {
+ inserted: function (el) {
+ const dragDom = el;
+ dragDom.style.cursor = "nwse-resize";
+ dragDom.onmousedown = (e) => {
+ // 榧犳爣鎸変笅锛岃绠楀綋鍓嶅厓绱犺窛绂诲彲瑙嗗尯鐨勮窛绂�
+ const disX = e.clientX;
+ const w = dragDom.clientWidth;
+ const minW = 300;
+ const maxW = 500;
+ const disY = e.clientY;
+ const h = dragDom.clientHeight;
+ const minH = 300;
+ const maxH = 700;
+ var nw, nh;
+ document.onmousemove = function (e) {
+ // 閫氳繃浜嬩欢濮旀墭锛岃绠楃Щ鍔ㄧ殑璺濈
+ const l = e.clientX - disX;
+ const r = e.clientY - disY;
+ // 鏀瑰彉褰撳墠鍏冪礌瀹藉害锛屼笉鍙秴杩囨渶灏忔渶澶у��
+ nw = w + l;
+ nw = nw < minW ? minW : nw;
+ nw = nw > maxW ? maxW : nw;
+ dragDom.style.width = `${nw}px`;
+ nh = h + r;
+ nh = nh < minH ? minH : nh;
+ nh = nh > maxH ? maxH : nh;
+ dragDom.style.height = `${nh}px`;
+ };
+
+ document.onmouseup = function (e) {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ };
+ };
+ },
+ },
+ },
computed: {},
- mounted() {},
+ mounted() { },
methods: {
+ dragEagle: function (e) {
+ var targetDiv = document.getElementById('eagleMapContainer');
+ //寰楀埌鐐瑰嚮鏃惰鍦板浘瀹瑰櫒鐨勫楂橈細
+ var targetDivHeight = targetDiv.offsetHeight;
+ var startX = e.clientX;
+ var startY = e.clientY;
+ var _this = this;
+ document.onmousemove = function (e) {
+ e.preventDefault();
+ //寰楀埌榧犳爣鎷栧姩鐨勫楂樿窛绂伙細鍙栫粷瀵瑰��
+ var distX = Math.abs(e.clientX - startX);
+ var distY = Math.abs(e.clientY - startY);
+ //寰�涓婃柟鎷栧姩锛�
+ if (e.clientY < startY) {
+ targetDiv.style.height = targetDivHeight + distY + 'px';
+ }
+ //寰�涓嬫柟鎷栧姩锛�
+ if (e.clientX < startX && e.clientY > startY) {
+ targetDiv.style.height = (targetDivHeight - distY) + 'px';
+ }
+ if (parseInt(targetDiv.style.height) >= 300) {
+ targetDiv.style.height = 300 + 'px';
+ }
+ if (parseInt(targetDiv.style.height) <= 150) {
+ targetDiv.style.height = 150 + 'px';
+ }
+ }
+ document.onmouseup = function () {
+ document.onmousemove = null;
+ }
+ },
// 鍏抽棴鎵�鏈�
closeAll() {
this.PopupData.forEach((item) => {
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 1490915..7d394db 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -69,6 +69,7 @@
size="small"
>
<el-select
+ ref="multiSelect"
:popper-append-to-body="false"
v-model="formInline.dirName"
:disabled="tableData.length == 0 ? false : true"
@@ -1689,6 +1690,7 @@
},
watch: {},
methods: {
+
setRestMetaData() {
this.fromQueryMeta.name = "";
this.listMetaData.name = this.fromQueryMeta.name;
@@ -3074,6 +3076,9 @@
this.formInline.dirid = node.data.id;
this.formInline.dirName = node.data.name;
this.getselectVerByDirid();
+ setTimeout(() => {
+ this.$refs.multiSelect.blur()
+ }, 100)
},
//Tabsq鍒囨崲
handleTabClick(tab, event) {
diff --git a/src/views/datamanage/layerManagement.vue b/src/views/datamanage/layerManagement.vue
index 3177157..3cbc504 100644
--- a/src/views/datamanage/layerManagement.vue
+++ b/src/views/datamanage/layerManagement.vue
@@ -640,11 +640,13 @@
// 寰幆鎵�鏈夐」
let branchArr = cloneData.filter((child) => father.id == child.pid);
if (branchArr.length > 0) {
+
branchArr.sort(function (a, b) {
- return a.orderNum - b.orderNum
+ return b.orderNum - a.orderNum
})
}
+
branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
// 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭ｄ箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭ｄ箞 a.c.d 涔熸槸=2锛�
// 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋�
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index c7840f4..5f2bf53 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -623,7 +623,7 @@
detailsDialogVisible: false,
itemdetail: {},
insertDialogVisible: false,
- insertLayer: { name: '', number: null, min: 4, max: 18 },
+ insertLayer: { name: '', number: null, min: 4, max: 18, noData: '0' },
loadDialogVisible: false,
options: [],
isFullscreen: false,
@@ -700,7 +700,8 @@
max: max,
name: name,
ids: std,
- type: this.formInline.type
+ type: this.formInline.type,
+ noData: this.insertLayer.noData
}
this.loadDialogVisible = true
this.insertDialogVisible = false;
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index 8fb2db0..0ddb6d9 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -107,12 +107,13 @@
<template slot-scope="scope">
<span v-if="scope.row.type == 1">World妯℃澘 </span>
<span v-else-if="scope.row.type == 2">Excel妯℃澘</span>
+ <span v-else-if="scope.row.type == 3">Zip妯℃澘</span>
</template>
</el-table-column>
<el-table-column
align="center"
prop="code"
- :label="$t('common.domCode')"
+ :label="$t('common.templateType')"
:formatter="codeData"
/>
<!-- <el-table-column
@@ -201,25 +202,7 @@
v-model=" editForm.name"
></el-input>
</el-form-item>
- <el-form-item :label="$t('common.fileType')">
- <el-select
- :popper-append-to-body="false"
- v-model="editForm.type"
- @change="selFileTypeChange"
- placeholder="璇烽�夋嫨娲诲姩鍖哄煙"
- style="width:85%"
- >
- <el-option
- label="World妯℃澘"
- value="1"
- ></el-option>
- <el-option
- label="Excel妯℃澘"
- value="2"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item :label="$t('common.domCode')">
+ <el-form-item :label="$t('common.templateType')">
<!-- <el-input
style="width:100%"
v-model=" editForm.code"
@@ -227,8 +210,9 @@
<el-select
:popper-append-to-body="false"
style="width:85%"
+ @change="selFileCodeChange"
v-model="editForm.code"
- placeholder="璇烽�夋嫨"
+ placeholder="璇烽�夋嫨鏂囦欢绫诲瀷"
>
<el-option
v-for="item in options"
@@ -239,6 +223,36 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item :label="$t('common.fileType')">
+ <el-select
+ :popper-append-to-body="false"
+ v-model="editForm.type"
+ @change="selFileTypeChange"
+ placeholder="璇烽�夋嫨妯℃澘绫诲瀷"
+ style="width:85%"
+ >
+ <el-option
+ v-for="item in typeOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ <!-- <el-option
+ label="World妯℃澘"
+ value="1"
+ ></el-option>
+ <el-option
+ label="Excel妯℃澘"
+ value="2"
+ ></el-option>
+ <el-option
+ label="Zip妯℃澘"
+ value="3"
+ ></el-option> -->
+ </el-select>
+ </el-form-item>
+
<el-form-item :label="$t('common.filePath')">
<div class="BoxFlex">
<div class="BoxFlexinput">
@@ -347,7 +361,7 @@
</p>
<el-divider></el-divider>
<p>
- <label> {{ $t('common.domCode') }}:</label>
+ <label> {{ $t('common.templateType') }}:</label>
<label class="boxlabel">{{ itemdetail.code }}</label>
</p>
<el-divider></el-divider>
@@ -418,8 +432,20 @@
label: "鏈嶅姟璋冪敤閲忕粺璁�",
},
{
- value: "countOperates ",
+ value: "countOperates",
label: "鐢ㄦ埛娴侀噺缁熻",
+ },
+ {
+ value: "dataTable",
+ label: "涓婁紶鏁版嵁琛ㄦ牸妯℃澘",
+ },
+ {
+ value: "uploadDir",
+ label: "涓婁紶鐩綍缁撴瀯妯℃澘",
+ },
+ {
+ value: "dirFolder",
+ label: "鐩綍缁撴瀯鏂囦欢澶规ā鏉�",
},
],
itemdetail: {},
@@ -459,6 +485,7 @@
styleVar: {
height: "calc(100% - 109px)",
},
+ typeOption: [],
};
},
created() {
@@ -529,14 +556,26 @@
this.itemdetail.fileType = "World妯℃澘";
} else if (parseInt(row.type) == 2) {
this.itemdetail.fileType = "Excel妯℃澘";
+ } else if (parseInt(row.type) == 3) {
+ this.itemdetail.fileType = "Zip妯℃澘";
}
- if (row.code.indexOf("countSizes") != -1) {
- this.itemdetail.code = "鏁版嵁閲忕粺璁�";
- } else if (row.code.indexOf("countServices") != -1) {
- this.itemdetail.code = "鏈嶅姟璋冪敤閲忕粺璁�";
- } else if (row.code.indexOf("countOperates") != -1) {
- this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻";
- }
+ var val = this.options.filter(res => {
+ if (res.value == row.code) {
+ return res
+ }
+ })
+ this.itemdetail.code = val[0].label;
+ // if (row.code.indexOf("countSizes") != -1) {
+ // this.itemdetail.code = "鏁版嵁閲忕粺璁�";
+ // } else if (row.code.indexOf("countServices") != -1) {
+ // this.itemdetail.code = "鏈嶅姟璋冪敤閲忕粺璁�";
+ // } else if (row.code.indexOf("countOperates") != -1) {
+ // this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻";
+ // } else if (row.code.indexOf("countOperates") != -1) {
+ // this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻";
+ // } else if (row.code.indexOf("countOperates") != -1) {
+ // this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻";
+ // }
this.itemdetail.cTime = this.format(row.createTime);
if (row.updateTime) {
@@ -575,8 +614,46 @@
this.selectFileType = ".docx";
} else if (parseInt(val) == 2) {
this.selectFileType = ".xlsx";
+ } else if (parseInt(val) == 3) {
+ this.selectFileType = ".zip";
}
},
+ selFileCodeChange(res) {
+ var name;
+ for (var i in this.options) {
+ if (this.options[i].value == res) {
+ name = this.options[i].label
+ break;
+ }
+ }
+
+ if (name.indexOf('缁熻') > -1) {
+ this.typeOption = [{
+ label: "World妯℃澘",
+ value: "1"
+ }, {
+ label: "Excel妯℃澘",
+ value: "2"
+ }]
+
+ } else {
+ this.typeOption = [{
+ label: "World妯℃澘",
+ value: "1"
+ }, {
+ label: "Excel妯℃澘",
+ value: "2"
+ }, {
+ label: "Zip妯℃澘",
+ value: "3"
+ }]
+ }
+ this.editForm.type = this.typeOption[0].value
+ },
+
+
+
+
//淇敼
handleEdit(index, row) {
this.behavior = "淇敼";
@@ -734,8 +811,44 @@
handleSelectionChange(val) {
this.multipleSelection = val;
},
+
+ editFormStart() {
+ this.editForm.code = "countSizes";
+ var name;
+ for (var i in this.options) {
+ if (this.options[i].value == this.editForm.code) {
+ name = this.options[i].label
+ break;
+ }
+ }
+
+ if (name.indexOf('缁熻') > -1) {
+ this.typeOption = [{
+ label: "World妯℃澘",
+ value: "1"
+ }, {
+ label: "Excel妯℃澘",
+ value: "2"
+ }]
+
+ } else {
+ this.typeOption = [{
+ label: "World妯℃澘",
+ value: "1"
+ }, {
+ label: "Excel妯℃澘",
+ value: "2"
+ }, {
+ label: "Zip妯℃澘",
+ value: "3"
+ }]
+ }
+ this.editForm.type = this.typeOption[0].value
+ },
+
//鏂板寮圭獥
setTableInsert() {
+ this.editFormStart();
this.behavior = "鏂板";
this.dialogVisible = true;
},
--
Gitblit v1.9.3