|
@@ -207,25 +207,6 @@
|
|
|
<input type="text" class="form-control" id="edit-person">
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="form-group">
|
|
|
- <label class="col-sm-3 control-label">数据类型</label>
|
|
|
- <div class="col-sm-5">
|
|
|
- <select class="form-control selectpicker" id="dataTypeSelect" title="请选择"></select>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="form-group">
|
|
|
- <label class="col-sm-3 control-label"></label>
|
|
|
- <div class="col-sm-5">
|
|
|
- <span type="text" id="dataTypeStr" style="font-size: 10px;text-align: center;white-space: normal;word-wrap: break-word;"></span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="form-group">
|
|
|
- <label class="col-sm-3 control-label">选择标注字段</label>
|
|
|
- <div class="col-sm-5">
|
|
|
- <select class="form-control selectpicker" multiple
|
|
|
- id="markFieldSelect"></select>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
</div>
|
|
|
</form>
|
|
|
</div>
|
|
@@ -344,8 +325,6 @@
|
|
|
|
|
|
let stype = "coll";
|
|
|
let fields = {{ .T.fields }}
|
|
|
- let dataTypeArr = {{ .T.dataTypeArr }}
|
|
|
- let dataTypeMap = {{ .T.dataTypeMap }}
|
|
|
let projectmap = {}
|
|
|
let existName = false
|
|
|
|
|
@@ -478,21 +457,6 @@
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- for (let i in dataTypeArr) {
|
|
|
- let opt = document.createElement('option');
|
|
|
- opt.innerText = dataTypeArr[i];
|
|
|
- opt.value = dataTypeArr[i];
|
|
|
- $('#dataTypeSelect')[0].appendChild(opt)
|
|
|
- }
|
|
|
- $("#dataTypeSelect").selectpicker("refresh");
|
|
|
- for (let k in fields) {
|
|
|
- let opt = document.createElement('option');
|
|
|
- opt.innerText = fields[k];
|
|
|
- opt.value = k;
|
|
|
- $('#markFieldSelect')[0].appendChild(opt)
|
|
|
- }
|
|
|
- $("#markFieldSelect").selectpicker("refresh");
|
|
|
-
|
|
|
$("#company-name").typeahead({
|
|
|
source: function (query, process) {
|
|
|
return $.ajax({
|
|
@@ -508,9 +472,6 @@
|
|
|
$('#statusSelect').on('changed.bs.select', function () {
|
|
|
ttable.api().ajax.reload();
|
|
|
})
|
|
|
- $('#dataTypeSelect').on('changed.bs.select', function () {
|
|
|
- $("#dataTypeStr").html(dataTypeMap[$(this).val()].toString())
|
|
|
- })
|
|
|
});
|
|
|
|
|
|
function createPro() {
|
|
@@ -615,30 +576,6 @@
|
|
|
$('#rule-edit-name').val(projectmap["s_rulename"])
|
|
|
$('#dpart-edit-name').val(projectmap["s_departname"])
|
|
|
$('#edit-person').val(projectmap["s_personname"])
|
|
|
- $("#markFieldSelect").selectpicker("deselectAll");
|
|
|
- if (projectmap.v_fields_diy !== undefined) {
|
|
|
- $('#markFieldSelect option').each(function(){
|
|
|
- let v = $(this).val()
|
|
|
- if (projectmap.v_fields_diy[v] !== undefined) {
|
|
|
- $(this)[0].selected = true
|
|
|
- }
|
|
|
- })
|
|
|
- $("#markFieldSelect").selectpicker("refresh");
|
|
|
- }else {
|
|
|
- $("#markFieldSelect").selectpicker("deselectAll");
|
|
|
- }
|
|
|
- if (projectmap.s_datatype !== undefined) {
|
|
|
- $('#dataTypeSelect option').each(function(){
|
|
|
- let v = $(this).val()
|
|
|
- if (projectmap.s_datatype === v) {
|
|
|
- $(this)[0].selected = true
|
|
|
- }
|
|
|
- })
|
|
|
- $("#dataTypeSelect").selectpicker("refresh");
|
|
|
- $("#dataTypeStr").html(dataTypeMap[projectmap.s_datatype].toString())
|
|
|
- }else {
|
|
|
- $("#dataTypeSelect").selectpicker("deselectAll");
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
function saveData() {
|
|
@@ -649,30 +586,6 @@
|
|
|
tmp["s_rulename"] = $('#rule-edit-name').val()
|
|
|
tmp["s_personname"] = $('#edit-person').val()
|
|
|
|
|
|
- let type = $('#dataTypeSelect').val();
|
|
|
- if (type === "") {
|
|
|
- showTip("请选择数据类型")
|
|
|
- return
|
|
|
- }
|
|
|
- tmp["s_datatype"] = type
|
|
|
- let fieldArr = $('#markFieldSelect').val();
|
|
|
- let m = {}
|
|
|
- let m1 = {}
|
|
|
- let arr = dataTypeMap[type]
|
|
|
- for (const k in fields) {
|
|
|
- if (fieldArr.indexOf(k) > -1) {
|
|
|
- m[k] = fields[k]
|
|
|
- // m1[fields[i]["s_code"]] = fields[i]["s_name"]
|
|
|
- }else {
|
|
|
- // if (arr.indexOf(fields[i]["s_code"]) > -1) {
|
|
|
- // m1[fields[i]["s_code"]] = fields[i]["s_name"]
|
|
|
- // }
|
|
|
- }
|
|
|
- }
|
|
|
- console.log(m)
|
|
|
- // console.log(m1)
|
|
|
- tmp["v_fields_diy"] = JSON.stringify(m)
|
|
|
- // tmp["v_fields"] = JSON.stringify(m1)
|
|
|
if (s1 === JSON.stringify(tmp)) {
|
|
|
showTip("未做修改");
|
|
|
} else {
|
|
@@ -680,8 +593,7 @@
|
|
|
url: "/front/project/save",
|
|
|
type: 'POST',
|
|
|
data: {"s_type": stype, "s_departname": tmp["s_departname"], "s_personname": tmp["s_personname"],
|
|
|
- "s_rulename": tmp["s_rulename"], "v_fields_diy": tmp["v_fields_diy"], "s_name": tmp["s_name"],
|
|
|
- "s_datatype": type},
|
|
|
+ "s_rulename": tmp["s_rulename"], "s_name": tmp["s_name"]},
|
|
|
success: function (r) {
|
|
|
if (r.success) {
|
|
|
showTip("保存成功", 500)
|