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

@@ -2,7 +2,7 @@
  * @Author: hisense.guoyue
  * @LastEditors: hisense.guoyue
  * @LastEditTime: 2022-09-27 14:23:29
- * @Description: 设备审批
+ * @Description: 资金报表
 -->
 <template>
   <el-card shadow="never" class="aui-card--fill" style="position: relative">
@@ -10,9 +10,10 @@
       <div
         style="
           text-align: center;
-          font-size: 26px;
+          font-size: 24px;
           font-weight: bold;
           margin-bottom: 14px;
+          color:#0058e1;
         "
       >
         累计节省财政资金约{{ saveMoney }}万元
@@ -20,8 +21,8 @@
       <div
         style="
           text-align: center;
-          font-size: 14px;
-          font-weight: bold;
+          font-size: 12px;
+     
           margin-bottom: 14px;
         "
       >
@@ -32,7 +33,7 @@
       <el-form-item>
         <span>日期：</span>
         <el-date-picker
-          v-model="dataList"
+          v-model="dateList"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
@@ -43,11 +44,11 @@
         </el-date-picker>
       </el-form-item>
 
-      <!--提供部门-->
+      <!--提供部门 传id-->
       <el-form-item>
         <span>提供部门：</span>
         <el-select
-          v-model="dataForm.offerDepartment"
+          v-model="dataForm.provideDept"
           placeholder="请选择提供部门"
           filterable
           clearable
@@ -55,19 +56,19 @@
           <el-option label="全部" value=""></el-option>
           <el-option
             v-for="item in offerDepartSelects"
-            :key="item.label"
+            :key="item.value"
             :label="item.label"
             :value="item.value"
-            v-bind="item"
+            v-bind="item"全部
           ></el-option>
         </el-select>
       </el-form-item>
 
-      <!--申请部门-->
+      <!--申请部门 传汉字-->
       <el-form-item>
         <span>申请部门：</span>
         <el-select
-          v-model="dataForm.applyDepartment"
+          v-model="dataForm.applyDept"
           placeholder="请选择申请部门"
           filterable
           clearable
@@ -88,8 +89,8 @@
         <span>类型：</span>
         <el-select
           @change="changeIiem"
-          v-model="dataForm.type"
-          placeholder="请选择类型"
+          v-model="dataForm.resourceType"
+          placeholder="请选择资源类型"
           clearable
         >
           <el-option label="全部" value=""></el-option>
@@ -108,7 +109,7 @@
         <span>名称：</span>
         <el-input
           style="width: 80%"
-          v-model="dataForm.name"
+          v-model="dataForm.resourceName"
           placeholder="请输入资源名称"
           clearable
         ></el-input>
@@ -127,14 +128,12 @@
           $t("reset")
         }}</el-button>
       </el-form-item>
-      <!-- 导出 -->
       <a
         class="export"
         :href="
           exportExcel +
-          exportExcelType +
           '?' +
-          exportExcelCondition +
+          dataForm +
           '&token=' +
           token
         "
@@ -144,68 +143,63 @@
 
     <div class="mod-activiti__process">
       <el-table
-        :data="dataList"
+        :data="tableData"
         :header-cell-style="{ textAlign: 'center', height: '40px' }"
         :cell-style="{ textAlign: 'center' }"
         style="width: 100%"
       >
+      <el-table-column   width="80px" label="序号" align="center">
+        <template slot-scope="scop">
+          {{scop.$index+1}}
+        </template>
+      </el-table-column>
         <el-table-column
-          prop="title"
-          label="序号"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="name"
+          prop="resourceName"
           label="资源名称"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="createDate"
-          label="类型"
+          prop="resourceType"
+          label="资源类型"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="auditTime"
+          prop="provideDept"
           label="提供部门"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="auditTime"
-          label="提供部门"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="auditTime"
+          prop="applyDept"
           label="申请部门"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="auditTime"
+          prop="applyDate"
           label="申请时间"
           header-align="center"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="auditTime"
+          prop="applyPrice"
           label="参考价格(元)"
           header-align="center"
           align="center"
         ></el-table-column>
       </el-table>
+      <div class="block" >
       <el-pagination
         @current-change="handleCurrentChange"
         layout="total, prev, pager, next, jumper"
-        :total="total"
+         :total="total"
         :page-size="pageSize"
         :current-page="currentPage"
       >
       </el-pagination>
+      </div>
     </div>
   </el-card>
 </template>
@@ -220,8 +214,9 @@ export default {
     return {
         token: Cookies.get('ucsToken'),
         //导出全部
-      exportExcelCondition: '',
-      exportExcelType: '',
+      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/processForm/tabilityapplication/exportFundStatementTable',
+
+
       saveMoney: 3243,
       offerDepartSelects: [],
       applyDepartSelects: [],
@@ -231,38 +226,48 @@ export default {
         { name: "开发组件", value: 3 },
         { name: "业务组件", value: 4 },
         { name: "应用资源", value: 5 },
+        { name: "会客厅", value: 5 },
       ], // 类型备选列表
-      dataList: [],
+      tableData: [],
+      dateList: [],//时间
       dataForm: {
         // date: '',
         startDate: "",
         endDate: "",
-        offerDepartment: "",
-        applyDepartment: "",
-        type: "",
-        name: "",
+        provideDept: "",
+        applyDept: "",
+        resourceType: "",
+        resourceName: "",
+        pageNum:1,
+        pageSize:10,
       },
       currentPage: 1,
       pageSize: 10,
-      total: null,
+      total: 0,
     };
   },
   methods: {
     init() {
-      if (this.value1 && this.value1.length > 0) {
-        this.dataForm.startDate = this.value1[0];
-        this.dataForm.endDate = this.value1[1];
+      if (this.dateList && this.dateList.length > 0) {
+        this.dataForm.startDate = this.dateList[0];
+        this.dataForm.endDate = this.dateList[1];
       } else {
         this.dataForm.startDate = "";
         this.dataForm.endDate = "";
       }
+ 
+     this.dataForm.pageNum=this.currentPage
       let params = this.dataForm;
       this.$http
-        .get("/census/center/v3/treeList/", {
+        .get("/processForm/tabilityapplication/getFundStatement/", {
           params,
         })
         .then((res) => {
-          this.tableData = res.data.data;
+          this.tableData = res.data.data.list;
+          let price=Number(res.data.data.totalPrice);
+          price=Math.round(price / 10000);
+          this.saveMoney=price.toFixed(1)
+          this.total=Number(res.data.data.total);
         });
     },
     handleCurrentChange(val) {
@@ -270,13 +275,13 @@ export default {
       this.init();
     },
     resetDataList() {
-      this.dataList = [];
+      this.dateList = [];
       this.dataForm.startDate = "";
       this.dataForm.endDate = "";
-      this.dataForm.type = "";
-      this.dataForm.name = "";
-      this.dataForm.applyDepartment = "";
-      this.dataForm.offerDepartment = "";
+      this.dataForm.resourceType = "";
+      this.dataForm.resourceName = "";
+      this.dataForm.applyDept = "";
+      this.dataForm.provideDept = "";
       this.currentPage = 1;
       this.init();
     },
@@ -289,7 +294,7 @@ export default {
       this.applyDepartSelects = [];
       this.offerDepartSelects = [];
       res.data.data.map((val) => {
-        this.applyDepartSelects.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 });
       });
     });

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

@@ -315,6 +315,9 @@ import { ElMessage } from 'element-plus'
           lng: item.location.x,
         }
         this.hiMapFun.mapFlyTo(latLng)
+        if(this.addressType=='2'){
+          mybus.emit('openOperationPopup', [item]);
+        }
       },
       //框选
       areaSelectResource(){
@@ -446,7 +449,7 @@ import { ElMessage } from 'element-plus'
             this.pointAllData = res.data.data;
             if(this.mapSearchParam.type!=0)
               this.addResourceTomap('videoMap', res.data.data)
-            
+
             else
             this.addResourceTomap('videoMap', [])  //查询全部时不打点}