添加空间数据库账号绑定；个人工作扫码排行榜优化

src/widgets/PbsManagement/Widget.ts

@@ -464,9 +464,9 @@ class PbsManageMent extends BaseWidget {
             } else {
                 buttons.push('<button type="button" data-level="' + item.alevel + '" data-type="node" class="btn btn-outline-primary">' + item.codeView + '</button>');
                 if (!item.connector || item.connector === "") {
-                    buttons.push('<select data-level="' + item.alevel + '" data-type="connector"><option selected>&nbsp;</option><option>-</option></select>');
+                    buttons.push('<select data-level="' + item.alevel + '" data-type="connector"><option selected>&nbsp;</option><option>.</option></select>');
                 } else {
-                    buttons.push('<select data-level="' + item.alevel + '" data-type="connector"><option>&nbsp;</option><option selected>-</option></select>');
+                    buttons.push('<select data-level="' + item.alevel + '" data-type="connector"><option>&nbsp;</option><option selected>.</option></select>');
                 }
             }
         })
@@ -1045,7 +1045,7 @@ class PbsManageMent extends BaseWidget {
             for (let i = 0; i < len; i++) {
                 levels.push({
                     alevel: i + 1,
-                    connector: i === len - 1 ? "" : "-",
+                    connector: i === len - 1 ? "" : ".",
                     pbsId: pbs.id,
                     levelName: "未定义级别",
                     contents: "",
@@ -1061,7 +1061,7 @@ class PbsManageMent extends BaseWidget {
                 } else {
                     levels.push({
                         alevel: i + 1,
-                        connector: i === len - 1 ? "" : "-",
+                        connector: i === len - 1 ? "" : ".",
                         pbsId: pbs.id,
                         levelName: "未定义级别",
                         contents: "",

src/widgets/ProjectResource/Widget.html

@@ -12,15 +12,15 @@
                 <button type="button" class="btn btn-default btn-primary btn_search">
                     <span class="" aria-hidden="true"></span>查询
                 </button>
-                <button type="button" class="btn btn-default btn-primary btn_add">
+                <!-- <button type="button" class="btn btn-default btn-primary btn_add">
                     <span class="" aria-hidden="true"></span>新增项目
-                </button>
+                </button> -->
                 <!--<button type="button" class="btn btn-default btn-primary btn_update">
                     <span class="" aria-hidden="true"></span>修改单位
                 </button>-->
-                <button type="button" class="btn btn-default btn-danger btn_delete">
+                <!-- <button type="button" class="btn btn-default btn-danger btn_delete">
                     <span class="" aria-hidden="true"></span>删除项目
-                </button>
+                </button> -->
                 <button type="button" class="btn btn-default btn-danger btn_prjSync">
                     <span class="" aria-hidden="true"></span>项目同步
                 </button>
@@ -33,6 +33,9 @@
                 <button type="button" class="btn btn-default btn-danger btn_processconfig">
                     <span class="" aria-hidden="true"></span>工艺配置
                 </button>
+                <button type="button" class="btn btn-default btn-danger btn_orgprj">
+                    <span class="" aria-hidden="true"></span>区域绑定
+                </button>
             </div>
         </div>
         <div class="djinfo panel-content">
@@ -181,6 +184,13 @@ $$
                             required data-bv-notempty-message="不能为空" placeholder="相机高度(米)" autocomplete="off"/>
         </div>
     </div>
+    <div class="form-inline addInput">
+        <label class=" control-label font_style"><span><span style="color:red;position: initial;">* </span>空间数据库：</span></label>
+        <div class="form-group">
+            <input value="" type="text" class="form-control control-width dataUser" name="code" data-bv-trigger="blur" data-bv-message="The title is not valid"
+                            required data-bv-notempty-message="不能为空" placeholder="空间数据库账号" autocomplete="off"/>
+        </div>
+    </div>
 </div>
 $$
 <div id="widget-serviceSort" class="form-horizontal">
@@ -228,4 +238,15 @@ $$
             <div class="form-control control-width processSelect" >无</div>
         </div>
     </div>
+</div>
+$$
+<!--区域绑定-->
+<div class="widget-OrgPrj">
+    <div class="form-inline">
+        <label class=" control-label font_style"><span>区域总部：</span></label>
+        <div class="form-group">
+            <select class="form-control control-width orgSelect">
+        </select>
+        </div>
+    </div>
 </div>

src/widgets/ProjectResource/Widget.ts

@@ -136,6 +136,7 @@ class ProjectResource extends BaseWidget {
             var Obj = this.popup.show("项目初始位置", this.template.split('$$')[3]);
             const targetPrj = this.vueObject.serchVue.dataList[this.opeartionItme[0]];
             const position = targetPrj["geo_info"];
+            const dataUser=targetPrj["dataUser"];
             if (!position) {
                 Obj.domObj.find('.lon').val(china.lon);
                 Obj.domObj.find('.lat').val(china.lat);
@@ -152,21 +153,28 @@ class ProjectResource extends BaseWidget {
                     Obj.domObj.find('.height').val(china.height);
                 }
             }
+            Obj.domObj.find('.dataUser').val(dataUser);
             Obj.submitObj.off("click").on("click", function (e) {
                 const lon = Obj.domObj.find('.lon').val();
                 const lat = Obj.domObj.find('.lat').val();
                 const height = Obj.domObj.find('.height').val();
+                const dataUserVal=Obj.domObj.find('.dataUser').val().toString().trim();
                 if (isNaN(lon) || isNaN(lat) || isNaN(height)) {
                     this.toast.show('请填写坐标信息');
                     return;
                 }
+                if (!dataUserVal||dataUserVal==="") {
+                    this.toast.show('请填写空间库账号');
+                    return;
+                }
                 const data = {
                     id: targetPrj.id,
                     geo_info: JSON.stringify({
                         lon: lon,
                         lat: lat,
                         height: height
-                    })
+                    }),
+                    dataUser:dataUserVal
                 }
                 const url = that.config.setAreaCompany;
                 that.baseAjaxSend.sendAjax(that, data, url, 'PUT', e => {
@@ -285,6 +293,57 @@ class ProjectResource extends BaseWidget {
                 })
             })
         }.bind(this));
+        //区域绑定
+        this.domObj.find('.btn_orgprj').off('click').on("click", function (e) {
+            this.getCheckItem();
+            if (this.opeartionItme.length == 0) {
+                this.toast.show("请选择一行数据进行区域绑定");
+                return;
+            }
+            if (this.opeartionItme.length > 1) {
+                this.toast.show("最多选择一行数据进行区域绑定");
+                return;
+            }
+            let datas = this.vueObject.serchVue.dataList[this.opeartionItme[0]];
+            var that = this;
+            this.popup.setSize(400, 400);
+            var Obj = this.popup.show("区域总部绑定", this.template.split('$$')[6]);
+            // Obj.conObj.find('.projectName').val(datas.name + "(" + datas.code + ")")
+            //分组查询
+            
+            const groupUrl = "/tofly-sxgk/org/page";
+            this.baseAjaxSend.sendAjax(this, {}, groupUrl, "GET", function (results) {
+                let html = "";
+                results.result.records.forEach(item => {
+                    if (html == "") {
+                        html += "<option selected >选择区域</option>"
+                        html += "<option  value='" + item.id + "'>" + item.orgName + "</option>"
+                    } else {
+                        html += "<option value='" + item.id + "'>" + item.orgName + "</option>"
+                    }
+                })
+                let dom = Obj.conObj.find('.orgSelect');
+                dom.empty().append(html);
+            }.bind(this));
+            var checkString;
+            Obj.submitObj.off("click").on("click", function (e) {
+                const orgid=Obj.conObj.find('.orgSelect').val().toString();
+                console.log(checkString)
+                let setData = {
+                    prjId: datas.id,
+                    orgId: orgid
+                };
+                const setUrl = "/tofly-sxgk/orgprj";
+                that.baseAjaxSend.sendAjax(that, setData, setUrl, "POST", function (results) {
+                    if (results.code != 1){
+                        this.toast.show("区域绑定失败");
+                        return;
+                    }
+                    this.toast.show("区域绑定成功");
+                    this.popup.close()
+                })
+            })
+        }.bind(this));
     }
 
     /**

src/widgets/ProjectResource/css/style.scss

@@ -323,7 +323,7 @@
             width: 280px !important;
         }
         label {
-            width: 100px;
+            width: 115px;
             position: relative;
             span {
                 position: absolute;