Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/assetReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: hisense.guoyue
- * @LastEditors: hisense.guoyue
- * @LastEditTime: 2022-09-27 14:23:29
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-24 10:07:57
  * @Description: 资金报表
 -->
 <template>
@@ -94,13 +94,8 @@
         </el-select>
       </el-form-item>
 
-     
-    
-  
-      
       </el-form>
 
-
       <el-form :inline="true">
         <!--资源类型-->
         <el-form-item>
@@ -160,8 +155,6 @@
 
     </el-form>
 
-    
-
     <div class="mod-activiti__process">
       <el-table
         :data="tableData"
@@ -247,88 +240,88 @@ export default {
       offerDepartSelects: [],
       applyDepartSelects: [],
       typeOptions: [
-        { name: "智能算法", value: 1 },
-        { name: "图层服务", value: 2 },
-        { name: "开发组件", value: 3 },
-        { name: "业务组件", value: 4 },
-        { name: "应用资源", value: 5 },
-        { name: "会客厅", value: 6 },
+        { name: '智能算法', value: 1 },
+        { name: '图层服务', value: 2 },
+        { name: '开发组件', value: 3 },
+        { name: '业务组件', value: 4 },
+        { name: '应用资源', value: 5 },
+        { name: '会客厅', value: 6 }
       ], // 类型备选列表
       tableData: [],
       dateList: [], // 时间
       dataForm: {
         // date: '',
-        startDate: "",
-        endDate: "",
-        provideDept: "",
-        applyDept: "",
-        resourceType: "",
-        resourceName: "",
-        applyResult:"通过",
+        startDate: '',
+        endDate: '',
+        provideDept: '',
+        applyDept: '',
+        resourceType: '',
+        resourceName: '',
+        applyResult: '通过',
         pageNum: 1,
-        pageSize:10,
+        pageSize: 10
       },
       currentPage: 1,
       pageSize: 10,
-      total: 0,
-    };
+      total: 0
+    }
   },
   methods: {
     init () {
       if (this.dateList && this.dateList.length > 0) {
-        this.dataForm.startDate = this.dateList[0];
-        this.dataForm.endDate = this.dateList[1];
+        this.dataForm.startDate = this.dateList[0]
+        this.dataForm.endDate = this.dateList[1]
       } else {
-        this.dataForm.startDate = "";
-        this.dataForm.endDate = "";
+        this.dataForm.startDate = ''
+        this.dataForm.endDate = ''
       }
 
       this.dataForm.pageNum = this.currentPage
-      let params = this.dataForm;
+      const params = this.dataForm
       this.$http
-        .get("/processForm/tabilityapplication/getFundStatement/", {
-          params,
+        .get('/processForm/tabilityapplication/getFundStatement/', {
+          params
         })
         .then((res) => {
-          this.tableData = res.data.data.list;
-          let price=Number(res.data.data.totalPrice);
-          price=price/ 10000;
+          this.tableData = res.data.data.list
+          let price = Number(res.data.data.totalPrice)
+          price = price / 10000
           this.saveMoney = price.toFixed(1)
-          this.total=Number(res.data.data.total);
+          this.total = Number(res.data.data.total)
           this.exportExcelCondition = qs.stringify(this.dataForm)
         })
     },
     handleCurrentChange (val) {
-      this.currentPage = val;
-      this.init();
+      this.currentPage = val
+      this.init()
     },
     resetDataList () {
-      this.dateList = [];
-      this.dataForm.startDate = "";
-      this.dataForm.endDate = "";
-      this.dataForm.resourceType = "";
-      this.dataForm.resourceName = "";
-      this.dataForm.applyDept = "";
-      this.dataForm.provideDept = "";
-      this.dataForm.applyResult="";
-      this.currentPage = 1;
-      this.init();
-    },
+      this.dateList = []
+      this.dataForm.startDate = ''
+      this.dataForm.endDate = ''
+      this.dataForm.resourceType = ''
+      this.dataForm.resourceName = ''
+      this.dataForm.applyDept = ''
+      this.dataForm.provideDept = ''
+      this.dataForm.applyResult = ''
+      this.currentPage = 1
+      this.init()
+    }
   },
   mounted () {
-    this.init();
+    this.init()
   },
   created () {
-    this.$http.get("/sys/dept/all").then((res) => {
-      this.applyDepartSelects = [];
-      this.offerDepartSelects = [];
+    this.$http.get('/sys/dept/all').then((res) => {
+      this.applyDepartSelects = []
+      this.offerDepartSelects = []
       res.data.data.map((val) => {
-        this.applyDepartSelects.push({ label: val.name, value: val.name });
-        this.offerDepartSelects.push({ label: val.name, value: val.id });
-      });
-    });
-  },
-};
+        this.applyDepartSelects.push({ label: val.name, value: val.name })
+        this.offerDepartSelects.push({ label: val.name, value: val.id })
+      })
+    })
+  }
+}
 </script>
 <style scoped>
 .demand-text {
@@ -365,4 +358,3 @@ export default {
   color: #fff;
 }
 </style>
-  

front/public/static/config/basicConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-22 14:37:59
+ * @LastEditTime: 2022-11-24 15:54:56
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -68,8 +68,8 @@ var CONFIGITEM = {
         cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
-      // apiURL: 'http://10.134.135.92:8888/renren-admin',
-      apiURL: 'http://192.168.124.233:8888/ucs-admin',
+      apiURL: 'http://10.134.135.92:8888/renren-admin',
+      // apiURL: 'http://192.168.124.233:8888/ucs-admin',
       previewUrl: 'http://10.134.135.9:9796/',
       // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
       // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境

front/public/static/config/mapConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-21 20:41:44
+ * @LastEditTime: 2022-11-24 16:01:04
  * @Description: 地图静态参数配置
  */
 var _mapConfig = {}
@@ -19,10 +19,10 @@ var _mapConfig = {}
       base: 'xihaian',
       CURRENT_MAP_OPTIONS: {
         // crs: CRS_4490,
-        center: [36.17, 120.13],
+        center: [36.017043, 119.922772],
         maxZoom: 17,
         minZoom: 0,
-        zoom: 5,
+        zoom: 10,
       },
     },
     qingdao: {

front/src/api/file.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
- * @LastEditors: Light
- * @LastEditTime: 2022-11-21 10:51:25
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-24 14:32:50
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -129,7 +129,8 @@ export function getCameraLiveStream(params) {
     `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
       params.channelId +
       '&protocol=' +
-        'wss' + '&transmode=1&streamType=1',
+      'wss' +
+      '&transmode=1&streamType=1',
     config2
   )
 }

front/src/views/home/videoSurveillance/index.vue

@@ -32,8 +32,8 @@
         </el-autocomplete> -->
         <!-- 第二版 -->
         <el-select class="input-with-select" v-model="addressType" style="width: 115px" @change="address=''">
-          <el-option label="兴趣点" value="1" />
-          <el-option label="点位" value="2" />
+          <el-option label="地点名称" value="1" />
+          <el-option label="监控名称" value="2" />
         </el-select>
         <el-autocomplete
           v-if="addressType==1"
@@ -260,7 +260,7 @@ import { ElMessage } from 'element-plus'
             }else{
               ElMessage({
                 showClose: true,
-                message: '未查询到兴趣点！',
+                message: '未查询到相关地点！',
                 type: 'warning',
               })
             }