Merge branch 'dev-yjl' into 'shenzhen-dev'

云联万物项目-项目新增字段、设备中台视频-新增字段

See merge request !126

public/js/config.js

@@ -1,4 +1,4 @@
-var COMPANY = ''; //通用
+// var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -8,6 +8,7 @@ var COMPANY = ''; //通用
 // COMPANY = 'henan' // 河南春笋
 // COMPANY = 'xingxuan'
 // COMPANY = 'hengtong'//瑞士恒通
+COMPANY = 'yunlian'//云联万物
 
 
 

src/assets/js/http.js

@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@@ -75,6 +75,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
   // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
   // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'

src/views/equipmentCenter/videoManage/videoConfig.vue

@@ -584,26 +584,7 @@
               :placeholder="$t('message.videoManage.placeholder')"
             ></el-input>
           </el-form-item>
-          <!-- 视频封面 -->
-          <el-form-item :label="$t('message.videoManage.videoCover')">
-            <el-upload
-              class="avatar-uploader"
-              :action="$store.state.UPLOADURL"
-              :show-file-list="false"
-              :before-upload="beforeAvatarUpload"
-              :on-success="handleUploadSuccess"
-              name="files"
-            >
-              <div v-if="currentVideoTypeDetail.coverUrl" class="imgBox">
-                <img :src="currentVideoTypeDetail.coverUrl" class="avatar" />
-                <i
-                  class="el-icon-error redText"
-                  @click.stop="currentVideoTypeDetail.coverUrl = ''"
-                ></i>
-              </div>
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
+
           <!-- 报警推送人 -->
           <el-form-item
             :label="$t('message.videoManage.alarmPusher')"
@@ -656,7 +637,89 @@
             </el-select>
             <!-- <el-input
             v-model="currentVideoTypeDetail.nvrId"
-                                  :placeholder="$t('message.videoManage.placeholder')"></el-input> -->
+            :placeholder="$t('message.videoManage.placeholder')">-->
+          </el-form-item>
+          <!-- 云联万物项目字段 -->
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="监控点编号（结构化数据）"
+            prop="monitoringPointCode"
+          >
+            <el-input
+              v-model="currentVideoTypeDetail.monitoringPointCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="监控点位置（结构化数据）"
+            prop="monitoringPointLocation"
+          >
+            <el-select
+              v-model="currentVideoTypeDetail.monitoringPointLocation"
+              placeholder="请选择"
+              :clearable="true"
+            >
+              <el-option
+                v-for="item in monitorinList"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <!-- 经度 -->
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="经度位置"
+            prop="longitude"
+          >
+            <el-input disabled v-model="currentVideoTypeDetail.longitude">
+              <template slot="append">
+                <el-link type="primary" @click="toGetLocalFn">
+                  {{
+                    $t(
+                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
+                    )
+                  }}
+                </el-link>
+              </template>
+            </el-input>
+          </el-form-item>
+
+          <!-- 纬度 -->
+          <el-form-item
+            v-if="COMPANY == 'yunlian'"
+            label="纬度位置"
+            prop="latitude"
+          >
+            <el-input
+              v-model="currentVideoTypeDetail.latitude"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <!-- 视频封面 -->
+          <el-form-item :label="$t('message.videoManage.videoCover')">
+            <el-upload
+              class="avatar-uploader"
+              :action="$store.state.UPLOADURL"
+              :show-file-list="false"
+              :before-upload="beforeAvatarUpload"
+              :on-success="handleUploadSuccess"
+              name="files"
+            >
+              <div v-if="currentVideoTypeDetail.coverUrl" class="imgBox">
+                <img :src="currentVideoTypeDetail.coverUrl" class="avatar" />
+                <i
+                  class="el-icon-error redText"
+                  @click.stop="currentVideoTypeDetail.coverUrl = ''"
+                ></i>
+              </div>
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </el-form-item>
         </el-form>
         <div class="dialog-footer">
@@ -947,9 +1010,17 @@
         </el-form>
       </div>
     </el-dialog>
+    <!--高德地图-->
+    <gd-map
+      v-if="showMap"
+      :addProjectForm="addProjectForm"
+      @closeMap="closeMap"
+      @save="getLngLat"
+    ></gd-map>
   </div>
 </template>
 <script>
+import gdMap from '@/components/map/gd-map.vue'
 import {
   addVideoItemApi,
   editVideoItemApi,
@@ -1107,7 +1178,9 @@ export default {
         groupId: '',
         ip: '',
         nvrId: '',
-        aiFunctionType: 0
+        aiFunctionType: 0,
+        latitude: '', //纬度
+        longitude: '' //经度
         // appSecret: '0a5836c68a7edabcc78e6a18f05bb317'
       },
       isCreateNewUser: [
@@ -1121,7 +1194,36 @@ export default {
             message: this.$t('message.videoManage.required'),
             trigger: 'blur'
           } // 必填
+        ],
+        latitude: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
+        ],
+        longitude: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
+        ],
+        monitoringPointCode: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
+        ],
+        monitoringPointLocation: [
+          {
+            required: true,
+            message: this.$t('message.videoManage.required'),
+            trigger: 'blur'
+          } // 必填
         ]
+
         // ip:[
         //     { required: true, message: this.$t('message.videoManage.required'), trigger: 'blur' }, // 必填
         // ],
@@ -1150,7 +1252,72 @@ export default {
           } // 必填
         ]
       },
-      projectSn: ''
+      projectSn: '',
+      monitorinList: [
+        {
+          label: '作业面',
+          value: 'JKDWZ001'
+        },
+        {
+          label: '料场',
+          value: 'JKDWZ002'
+        },
+        {
+          label: '车辆出入口',
+          value: 'JKDWZ003'
+        },
+        {
+          label: '人员出入口',
+          value: 'JKDWZ004'
+        },
+        {
+          label: '洗轮机',
+          value: 'JKDWZ00'
+        },
+        {
+          label: '围墙',
+          value: 'JKDWZ006'
+        },
+        {
+          label: '塔吊',
+          value: 'JKDWZ007'
+        },
+        {
+          label: '其他',
+          value: 'JKDWZ008'
+        }
+      ], //监控点位置（结构化数据）
+      showMap: false,
+      addProjectForm: {
+        placeCode: '',
+        areaCode: '',
+        buildingNum: '',
+        bulidStatus: '',
+        cityCode: '',
+        companySn: '',
+        constructionStage: '',
+        engineeringPurpose: '',
+        households: '',
+        latitude: '',
+        layoutImage: '',
+        longitude: '',
+        projectAcreage: '',
+        projectAddress: '',
+        projectName: '',
+        projectNumber: '',
+        projectType: '',
+        provincesCode: '',
+        saleAcreage: '',
+        startWorkDate: '',
+        structureType: '',
+        projectManage: '',
+        projectTel: '',
+        majorProjectType: 0,
+        constructionPermit: '',
+        streetTownshipTownCode: '',
+        streetTownshipTown: ''
+      },
+      COMPANY: COMPANY
     }
   },
   created() {
@@ -1160,8 +1327,26 @@ export default {
     this.getVideoGroup()
     this.getAll()
   },
-  components: { cameraList, cameraListLc },
+  components: { cameraList, cameraListLc, gdMap },
   methods: {
+    getLngLat(v) {
+      this.showMap = false
+      if (this.Popup.newVideo) {
+        this.currentVideoTypeDetail.longitude = v.lng
+        this.currentVideoTypeDetail.latitude = v.lat
+      } else {
+        this.addProjectForm.longitude = v.lng
+        this.addProjectForm.latitude = v.lat
+      }
+    },
+    closeMap(val) {
+      this.showMap = val
+      console.log('打印子组件', val)
+    },
+    //打开地图
+    toGetLocalFn() {
+      this.showMap = true
+    },
     // nvr设备管理弹窗
     nvrDeviceManage() {
       this.nvrDevice = true
@@ -1606,7 +1791,12 @@ export default {
         sortNum: this.currentVideoTypeDetail.sortNum,
         aiFunctionType: this.currentVideoTypeDetail.aiFunctionType,
         ip: this.currentVideoTypeDetail.ip,
-        nvrId: this.currentVideoTypeDetail.nvrId
+        nvrId: this.currentVideoTypeDetail.nvrId,
+        monitoringPointCode: this.currentVideoTypeDetail.monitoringPointCode,
+        monitoringPointLocation:
+          this.currentVideoTypeDetail.monitoringPointLocation,
+        latitude: this.currentVideoTypeDetail.latitude,
+        longitude: this.currentVideoTypeDetail.longitude
       }
       console.log('传入的参数', params)
       console.log(this.currentVideoTypeDetail.aiFunctionType)
@@ -1906,4 +2096,11 @@ export default {
   display: flex;
   align-items: center;
 }
+::v-deep .el-form-item__label {
+  width: 110px !important;
+  text-align: center !important;
+}
+::v-deep .el-input-number .el-input-number--medium {
+  margin-left: -10px !important;
+}
 </style>