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

西海岸bug修复
2022-11-24 16:11:37 +08:00 · 2022-11-24 16:11:34 +08:00
5 changed files with 192 additions and 199 deletions
--- a/back/src/views/modules/assetReport/index.vue
+++ b/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"
@ -237,98 +230,98 @@ import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {

-  data() {
+  data () {
    return {
-      exportExcelCondition:'',
-        token: Cookies.get('ucsToken'),
-        //导出全部
+      exportExcelCondition: '',
+      token: Cookies.get('ucsToken'),
+      // 导出全部
      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/processForm/tabilityapplication/exportFundStatementTable',
      saveMoney: 0.0,
      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: [],//时间
+      dateList: [], // 时间
      dataForm: {
        // date: '',
-        startDate: "",
-        endDate: "",
-        provideDept: "",
-        applyDept: "",
-        resourceType: "",
-        resourceName: "",
-        applyResult:"通过",
-        pageNum:1,
-        pageSize:10,
+        startDate: '',
+        endDate: '',
+        provideDept: '',
+        applyDept: '',
+        resourceType: '',
+        resourceName: '',
+        applyResult: '通过',
+        pageNum: 1,
+        pageSize: 10
      },
      currentPage: 1,
      pageSize: 10,
-      total: 0,
-    };
+      total: 0
+    }
  },
  methods: {
-    init() {
+    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;
+      this.dataForm.pageNum = this.currentPage
+      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.saveMoney=price.toFixed(1)
-          this.total=Number(res.data.data.total);
+          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.exportExcelCondition = qs.stringify(this.dataForm)
-    })
-  },
-    handleCurrentChange(val) {
-      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();
+    handleCurrentChange (val) {
+      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()
+    }
  },
-  mounted() {
-    this.init();
+  mounted () {
+    this.init()
  },
-  created() {
-    this.$http.get("/sys/dept/all").then((res) => {
-      this.applyDepartSelects = [];
-      this.offerDepartSelects = [];
+  created () {
+    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>
-  
--- a/front/public/static/config/basicConfig.js
+++ b/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', // 测试环境
--- a/front/public/static/config/mapConfig.js
+++ b/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: {
--- a/front/src/api/file.js
+++ b/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'
@ -10,161 +10,162 @@ import axios from 'axios'
 import store from '@/store'

 const config = {
-    headers: {
-        token: store.getters['user/accessToken'],
-        'Content-Type': 'multipart/form-data',
-    },
+  headers: {
+    token: store.getters['user/accessToken'],
+    'Content-Type': 'multipart/form-data',
+  },
 }
 const config2 = {
-    headers: {
-        'Content-Type': 'application/json; charset-utf-8',
-    },
+  headers: {
+    'Content-Type': 'application/json; charset-utf-8',
+  },
 }
 export function getDevelopmentFile(params) {
-    return request({
-        url: '/developmentGuide/getDevelopmentFile',
-        method: 'get',
-        params,
-    })
+  return request({
+    url: '/developmentGuide/getDevelopmentFile',
+    method: 'get',
+    params,
+  })
 }
 export function updateDevelopmentFile(params) {
-    return axios.post(
-        window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
-        params,
-        config
-    )
+  return axios.post(
+    window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
+    params,
+    config
+  )
 }
 export function test() {
-    return axios.post(
-        'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
-        config2
-    )
+  return axios.post(
+    'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
+    config2
+  )
 }
 export function correct(params) {
-    return axios.post('http://15.72.183.90:7008/correct', params, config2)
+  return axios.post('http://15.72.183.90:7008/correct', params, config2)
 }
 export function paddleocr(params) {
-    return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
+  return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
 }
 // 算法总接口
 export function algo(params) {
-    return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
+  return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
 }

 // 能力云图-数据资源
 export function count() {
-    return axios.post(
-        'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
-        config2
-    )
+  return axios.post(
+    'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
+    config2
+  )
 }
 export function getVideoList(params) {
-    return axios.get(
-        'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
-        params.name +
-        '&pageNo=' +
-        params.pageNo +
-        '&pageSize=' +
-        params.pageSize,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
+      params.name +
+      '&pageNo=' +
+      params.pageNo +
+      '&pageSize=' +
+      params.pageSize,
+    config2
+  )
 }
 // 能力云图-数据资源-总数据数
 export function getRecord(params) {
-    return axios.get(
-        'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
-        params.serviceName +
-        '&orderField=' +
-        params.orderField +
-        '&orderType=' +
-        params.orderType +
-        '&pageNum=' +
-        params.pageNum +
-        '&pageSize=' +
-        params.pageSize +
-        '&serviceType=' +
-        params.serviceType,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
+      params.serviceName +
+      '&orderField=' +
+      params.orderField +
+      '&orderType=' +
+      params.orderType +
+      '&pageNum=' +
+      params.pageNum +
+      '&pageSize=' +
+      params.pageSize +
+      '&serviceType=' +
+      params.serviceType,
+    config2
+  )
 }

 export function getHls(params) {
-    return axios.get(
-        'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
-        params.cameraId +
-        '&protocol=' +
-        params.protocol,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
+      params.cameraId +
+      '&protocol=' +
+      params.protocol,
+    config2
+  )
 }
 // 西海岸 POI搜索
 export function getListForPOI(params) {
-    return axios.get(
-        'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
-        params.keywords,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
+      params.keywords,
+    config2
+  )
 }

 //西海岸 获取左侧标签树
 export function getPlaceType() {
-    return axios.get(
-        `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`,
-        config2
-    )
+  return axios.get(
+    `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`,
+    config2
+  )
 }

 //西海岸 根据标签树查询视频列表
 export function CameraConditionPlaceType(params) {
-    return axios.post(
-        `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
-        params,
-        config2
-    )
+  return axios.post(
+    `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
+    params,
+    config2
+  )
 }

 // 西海岸视频wss流获取
 export function getCameraLiveStream(params) {
-    return axios.get(
-        `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
-        params.channelId +
-        '&protocol=' +
-        'wss' + '&transmode=1&streamType=1',
-        config2
-    )
+  return axios.get(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
+      params.channelId +
+      '&protocol=' +
+      'wss' +
+      '&transmode=1&streamType=1',
+    config2
+  )
 }
 // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
 let _cameraUrl =
-    (_global &&
-        _global.config &&
-        _global.config.camreaInfo &&
-        _global.config.camreaInfo.cameraUrl) ||
-    '10.134.135.92:9537'
-    //能力集市基础设施-左侧列表
+  (_global &&
+    _global.config &&
+    _global.config.camreaInfo &&
+    _global.config.camreaInfo.cameraUrl) ||
+  '10.134.135.92:9537'
+//能力集市基础设施-左侧列表
 export function getCameraInfoByAreaId(params) {
-    return axios.get(
-        `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
-        config2
-    )
+  return axios.get(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
+    config2
+  )
 }
 //能力集市基础设施-摄像头
 export function getCameraByCondition(params) {
-    return axios.post(
-        `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
-        params,
-        config2
-    )
+  return axios.post(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
+    params,
+    config2
+  )
 }

 export function initiateMeet(data) {
-    // return request({
-    //   url: '/enke/initiateMeet',
-    //   method: 'post',
-    //   data: data,
-    // })
-    return axios.post(
-        'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
-        data,
-        config2
-    )
+  // return request({
+  //   url: '/enke/initiateMeet',
+  //   method: 'post',
+  //   data: data,
+  // })
+  return axios.post(
+    'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
+    data,
+    config2
+  )
 }
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/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',
              })
            }
Author	SHA1	Message	Date
wuhongjian	32573971ae	Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-11-24 16:11:37 +08:00
wuhongjian	a7998206f2	西海岸bug修复	2022-11-24 16:11:34 +08:00