Browse Source

调整UI

master
DIAMOND 11 months ago
parent
commit
ca1f0b7482
  1. 4
      src/components/earthMap/Toolbar.vue
  2. 27
      src/views/military/modules/earthMap/msMapLine/components/MsMapLineForm.vue

4
src/components/earthMap/Toolbar.vue

@ -1190,11 +1190,11 @@
};
//
Object.assign(objConfig, objConf);
console.log("objConfig",objConfig);
// console.log("objConfig",objConfig);
//
currentModel.xbsjFromJSON(objConfig);
console.log('currentModel', currentModel);
// console.log('currentModel', currentModel);
// ui
const earthUI = window.$uia;

27
src/views/military/modules/earthMap/msMapLine/components/MsMapLineForm.vue

@ -58,13 +58,23 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="绘制区域">
<div class="centerText"><img :src="locationPng" class="dwImg" @click="mapShow" /></div>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="位置" v-bind="validateInfos.positions">
<a-textarea v-model:value="formData.positions" :rows="4" placeholder="请输入位置" :disabled="disabled" />
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.materialType == 1">
<a-form-item label="间隔颜色" v-bind="validateInfos.intervalColor">
<!-- <a-input v-model:value="formData.intervalColor" placeholder="请输入间隔颜色" :disabled="disabled"></a-input> -->
<ColorPicker v-model:pureColor="intervalColor" v-model:gradientColor="gradientColorIntervalColor"
v-on:pureColorChange="pureColorChangeIntervalColor" style="width: 80%;" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" v-if="formData.materialType == 1">
<a-form-item label="虚线长度" v-bind="validateInfos.dashLength">
<a-input-number v-model:value="formData.dashLength" placeholder="请输入虚线长度" style="width: 100%"
:disabled="disabled" />
@ -76,22 +86,13 @@
:disabled="disabled" />
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-col :span="12" v-if="formData.materialType == 3">
<a-form-item label="循环周期(帧)" v-bind="validateInfos.cycleFrame">
<a-input-number v-model:value="formData.cycleFrame" placeholder="请输入循环周期(帧)" style="width: 100%"
:disabled="disabled" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="绘制区域">
<div class="centerText"><img :src="locationPng" class="dwImg" @click="mapShow" /></div>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="位置" v-bind="validateInfos.positions">
<a-textarea v-model:value="formData.positions" :rows="4" placeholder="请输入位置" :disabled="disabled" />
</a-form-item>
</a-col>
</a-row>
</a-form>
@ -225,7 +226,7 @@ function pureColorChangeIntervalColor(color: any) {
* @return {array} [1,2,3,4]
*/
function rgba2arr(color, normalized = true) {
console.log("color", color);
// console.log("color", color);
let ret: any = [];
let colorStr = new RegExp(/(?<=\()\S+(?=\))/).exec(color);
// console.log("colorStr",colorStr);

Loading…
Cancel
Save