位置

public/hitch-screen/point.html

@@ -90,7 +90,7 @@
       var data = {id: id, zjm:xx, jbdh: yy}
       $.ajax({
         type: "PUT",
-        url: "/api/sb/infos/" + id,
+        url: "/api/sb/infos/position/" + id,
         headers: getHeader(),
         data: JSON.stringify(data),
         success: function(response) {

src/api/sb/info.js

@@ -244,6 +244,21 @@ export function updateSbInfo (parameter) {
   })
 }
 
+
+/**
+ * update func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function updateSbInfoPosition (parameter) {
+  return axios({
+    url: '/sb/infos/position/' + parameter.id,
+    method: 'PUT',
+    data: parameter
+  })
+}
+
 /**
  * update func
  * parameter: { }

src/views/sb/info/modules/BaseForm.vue

@@ -119,8 +119,6 @@
             </a-select>
           </a-form-item>
         </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="设备等级"
@@ -153,8 +151,6 @@
               v-decorator="['initialValue']" />
           </a-form-item>
         </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="设备类型"
@@ -189,9 +185,6 @@
             </a-select>
           </a-form-item>
         </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="状态"
@@ -246,9 +239,6 @@
               v-decorator="['zzh']" />
           </a-form-item>
         </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="生产商"
@@ -259,7 +249,24 @@
               v-decorator="['producerId']" />
           </a-form-item>
         </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="电力线路"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['baoyangTimes', {rules: [{required: false, message: '不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in lineMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
       </a-row>
+      <title-divider title="数字地图配置" width="150px"></title-divider>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
@@ -273,7 +280,7 @@
               :treeData="treeData"
               :treeNodeFilterProp="'title'"
               :showSearch="true"
-              v-decorator="['positionId', {rules: [{required: false, message: '上层位置不能为空'}]}]"
+              v-decorator="['positionId', {rules: [{required: true, message: '上层位置不能为空'}]}]"
               placeholder="请选择"
             >
             </a-tree-select>
@@ -281,23 +288,7 @@
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="电力线路"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['baoyangTimes', {rules: [{required: false, message: '不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in lineMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <!--        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="是否显示"
+            label="是否在数字地图显示"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -310,9 +301,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </a-col>-->
-      </a-row>
-      <!--      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="水平位置"
@@ -343,18 +332,9 @@
             <a-button style="width: 30%" type="primary" @click="handlePoint">设置预览</a-button>
           </a-form-item>
         </a-col>
-      </a-row>-->
+      </a-row>
+      <title-divider title="其他数据" width="150px"></title-divider>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-        <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item
-            label="备注"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['remark', {rules: [{required: false, message: '备注不能为空'}]}]" />
-          </a-form-item>
-        </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="使用人员"
@@ -437,6 +417,16 @@
               v-decorator="['usePosition', {rules: [{required: false, message: '单位内部使用地点不能为空'}]}]" />
           </a-form-item>
         </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="备注"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['remark', {rules: [{required: false, message: '备注不能为空'}]}]" />
+          </a-form-item>
+        </a-col>
       </a-row>
       <!--      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
@@ -1640,8 +1630,12 @@ export default {
       const { form: { getFieldValue } } = this
       const zjm = getFieldValue('zjm')
       const jbdh = getFieldValue('jbdh')
+      const positionId = getFieldValue('positionId')
+      if(positionId == null){
+        this.$message.error('请先设置资产位置')
+      }
       const a = document.createElement('a')
-      a.href = '/hitch-screen/point.html?id=' + this.id + '&zjm=' + zjm + '&jbdh=' + jbdh
+      a.href = '/hitch-screen/point.html?id=' + this.id + '&positionId=' + positionId + '&zjm=' + zjm + '&jbdh=' + jbdh
       a.target = '_blank'
       a.click()
     },