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

back/src/views/main-sidebar.vue

@@ -73,7 +73,7 @@ export default {
                 // 西海岸 v2  市局v3
                 children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
                 daibanNum = Number(daibanNum) + Number(children.total)
-              } if (children.id == '1559376285703081986') { // 会议室审核
+              } if (children.id == '1559376285703081986') { // 会客厅审核
                 children.total = Number(this.numObject.meetingroom_book)
                 daibanNum = Number(daibanNum) + Number(children.total)
               } if (children.id == '1545292602084827138') { // 能力资源上架
@@ -88,7 +88,7 @@ export default {
               } if (children.id == '1545313754106699777') { // 评论审核
                 children.total = Number(this.numObject.comment_review)
                 daibanNum = Number(daibanNum) + Number(children.total)
-              } if (children.id == '1554294862931562498') { // 会议室 暂无
+              } if (children.id == '1554294862931562498') { // 会客厅 暂无
                 children.total = 0
                 daibanNum = Number(daibanNum) + Number(children.total)
               }

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

@@ -69,14 +69,15 @@
           </el-select>
         </el-form-item>
         <!--资源名称 仅明细添加-->
-        
+
         <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <!-- <span v-if="this.departmentId === 2 || this.departmentId === 4">资源名称：</span> -->
           <el-input  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
         </el-form-item>
-
+      </el-form>
-        <!--操作按钮查询-->
+      <el-form :inline="true" style="display: flex;justify-content: end;margin-right: 40px;">
-        <el-form-item>
+         <!--操作按钮查询-->
+         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!--操作按钮重置-->
@@ -235,7 +236,7 @@ import Template from '../devtools/template.vue'
 // })
 export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template },
-  data() {
+  data () {
     return {
       checked: false,
       departmentSelects: [],
@@ -347,7 +348,7 @@ export default {
       abilityType: '', // 能力
       beginTime: '', // 开始时间
       endTime: '', // 结束时间
-      resourceName:'',//资源名称
+      resourceName: '', // 资源名称
       typeOptions: [
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
@@ -369,7 +370,7 @@ export default {
       endDate: '' // 结束时间
     }
   },
-  created() {
+  created () {
     this.$http.get('/sys/dept/all').then(res => {
       // console.log('获取部门=========>', res)
       this.departmentSelects = []
@@ -390,7 +391,7 @@ export default {
     // const date2 = new Date(year2, month2, day2, 7)
     // this.value1.unshift(date2)
   },
-  mounted() {
+  mounted () {
     // this.getFirstTree()
     console.log('this.$route.query.Id;', this.$route.query.type)
     if (this.$route.query.type === 'use') {
@@ -410,7 +411,7 @@ export default {
     // ...mapState(['departmentSelects'])
   },
   methods: {
-    chagneCheckbox() {
+    chagneCheckbox () {
       if (this.checked) {
         this.tableData = this.tableDataClone.filter(val => val.count !== 0)
         this.total = this.tableData.length
@@ -419,7 +420,7 @@ export default {
         this.total = this.tableData.length
       }
     },
-    closeModal() {
+    closeModal () {
       this.detailsVisible = false
     },
     handleCurrentChange (val) {
@@ -439,7 +440,7 @@ export default {
       //   this.getReleaseTree(val)
       // }
     },
-    getTreeName(data) {
+    getTreeName (data) {
       this.$http
         .get('/census/center/v3/treeList/', {
           params: {
@@ -469,7 +470,7 @@ export default {
     //     },
 
     // 组件服务部门发布情况--改为能力上架统计
-    getFirstTree(page) {
+    getFirstTree (page) {
       if (this.examineStatus == '-1') {
         this.status = ''
       } else if (this.examineStatus == '0') {
@@ -531,12 +532,12 @@ export default {
             deptId: this.abilityDepartment,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName:this.resourceName
+            resourceName: this.resourceName
           })
         })
     },
     // 组件服务部门使用情况列表-改为能力使用统计
-    getSecondTree(page) {
+    getSecondTree (page) {
       if (this.examineStatus == '-1') {
         this.status = ''
       } else if (this.examineStatus == '0') {
@@ -598,13 +599,13 @@ export default {
             deptId: this.abilityDepartment,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName:this.resourceName
+            resourceName: this.resourceName
-          
+
           })
         })
     },
     // 点击查看详情
-    detailClick(row) {
+    detailClick (row) {
       this.detailParamss = {}
       const applyNumber = row.applyNumber
       if (this.departmentId == 3) { // 能力上架
@@ -646,7 +647,7 @@ export default {
       }
     },
     // 能力上架明细  能力上架统计
-    getOneDetail(page) {
+    getOneDetail (page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
@@ -669,7 +670,7 @@ export default {
             type: this.abilityType,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName:this.resourceName
+            resourceName: this.resourceName
           }
         })
         .then((res) => {
@@ -682,12 +683,12 @@ export default {
             deptId: this.abilityDepartment,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName:this.resourceName
+            resourceName: this.resourceName
           })
         })
     },
     // 能力使用明细 能力使用统计
-    getTwoDetail(page) {
+    getTwoDetail (page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
@@ -710,7 +711,7 @@ export default {
             type: this.abilityType,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName:this.resourceName
+            resourceName: this.resourceName
           }
         })
         .then((res) => {
@@ -722,11 +723,11 @@ export default {
             deptId: this.abilityDepartment,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName:this.resourceName
+            resourceName: this.resourceName
           })
         })
     },
-    getReleaseTree(page) {
+    getReleaseTree (page) {
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList/', {
           params: {
@@ -773,7 +774,7 @@ export default {
         })
     },
     // 应用资源部门使用情况列表
-    getUsedTree() {
+    getUsedTree () {
       this.$http
         .get('/census/center/v3/resourceReleaseDetails/', {
           params: {
@@ -787,7 +788,7 @@ export default {
           this.tableData = res.data.data.list
         })
     },
-    handleClick(row) {
+    handleClick (row) {
       if (this.choseId === 0) {
         if (this.departmentId === 1) {
           this.homeIsShow = false
@@ -808,7 +809,7 @@ export default {
       }
     },
     // 选择组件
-    choseBtn(index) {
+    choseBtn (index) {
       this.choseId = index
       this.handleChose(1)
     },
@@ -824,11 +825,11 @@ export default {
     //     }
     //   },
     // 选择发布or使用表格
-    handleChose(index) {
+    handleChose (index) {
       this.checked = false
       this.departmentId = index
-      this.currentPage=1
+      this.currentPage = 1
-      this.pageSize=10
+      this.pageSize = 10
       if (index === 1) {
         if (this.choseId === 0) {
           if (!this.detailFlag) {
@@ -868,32 +869,32 @@ export default {
       }
     },
     // 翻页
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
     },
-    closeChild() {
+    closeChild () {
       this.homeIsShow = true
       this.servicesIsShow = false
       this.handleCurrentChange(1)
     },
-    closeChild2() {
+    closeChild2 () {
       this.homeIsShow = true
       this.UsedIsShow = false
       this.handleCurrentChange(1)
     },
-    closeApplication() {
+    closeApplication () {
       this.homeIsShow = true
       this.resourcesIsShow = false
       this.handleCurrentChange(1)
     },
-    changeIiem(){
+    changeIiem () {
-      this.currentPage=1
+      this.currentPage = 1
-      this.pageSize=10
+      this.pageSize = 10
     },
     // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
     goToDetail () {
-      this.currentPage=1
+      this.currentPage = 1
-      this.pageSize=10
+      this.pageSize = 10
       this.detailFlag = !this.detailFlag
       if (this.departmentId === 1) {
         this.handleChose(3)
@@ -905,10 +906,10 @@ export default {
       }
     },
     // 返回按钮
-    goToBack() {
+    goToBack () {
       this.checked = false
-      this.currentPage=1,
+      this.currentPage = 1,
-      this.pageSize=10,
+      this.pageSize = 10,
       // departmentId 1，3  2，4 两个值共同判断
       this.detailFlag = !this.detailFlag
       if (this.departmentId === 3) {
@@ -921,7 +922,7 @@ export default {
       }
     },
     // 点击查询按钮查询数据
-    getDataList() {
+    getDataList () {
       if (this.value1 && this.value1.length > 0) {
         // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
         // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
@@ -954,7 +955,7 @@ export default {
       }
     },
     // 重置按钮查询数据
-    resetDataList() {
+    resetDataList () {
       this.value1 = []
       this.startDate = ''
       this.endDate = ''
@@ -967,7 +968,7 @@ export default {
         deptId: this.abilityDepartment,
         startDate: this.startDate,
         endDate: this.endDate,
-        resourceName:this.resourceName
+        resourceName: this.resourceName
       })
       if (this.departmentId === 1) {
         // if (this.detailFlag) {
@@ -993,7 +994,7 @@ export default {
       }
     },
     // 定义格式化函数：
-    handleTime(time, format) {
+    handleTime (time, format) {
       if (time == null || time == undefined || time == '') {
         return ''
       }

back/src/views/modules/activiti/RoomExamineAdmin.vue

@@ -4,7 +4,7 @@
       <el-input
         v-model="roomNameA"
         style="width: 160px"
-        placeholder="请输入会议室名称"
+        placeholder="请输入会客厅名称"
       ></el-input>
       <el-select
         v-model="value"
@@ -39,7 +39,7 @@
         >
         </el-table-column>
         <el-table-column
-          label="申请会议室"
+          label="申请会客厅"
           prop="roomName"
           header-align="center"
           align="center"

back/src/views/modules/myAgent/ConferenceRoom.vue

@@ -2,7 +2,7 @@
   <el-card shadow="never" class="roomBox">
     <div>
       <div slot="header" class="roomHeadSpan">
-        <span>会议室管理</span>
+        <span>会客厅管理</span>
         <el-button
           style="float: right; padding: 5px 5px"
           type="primary"
@@ -13,7 +13,7 @@
       </div>
       <el-table border style="width: 100%" :data="tableData">
         <el-table-column
-          label="会议室名称"
+          label="会客厅名称"
           prop="name"
           header-align="center"
           align="center"
@@ -70,10 +70,10 @@
         @close="outDialog"
         :title="
           flge === 'add'
-            ? '会议室新增'
+            ? '会客厅新增'
             : flge === 'look'
-            ? '会议室详情'
+            ? '会客厅详情'
-            : '会议室修改'
+            : '会客厅修改'
         "
         :visible.sync="dialogFormVisible"
       >
@@ -88,7 +88,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item
-                label="会议室名称"
+                label="会客厅名称"
                 prop="name"
                 :label-width="formLabelWidth"
               >
@@ -106,7 +106,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item
-                label="会议室面积(m²)"
+                label="会客厅面积(m²)"
                 prop="area"
                 :label-width="formLabelWidth"
               >
@@ -143,7 +143,7 @@
             </el-col>
             <el-col>
               <el-form-item
-                label="会议室图片"
+                label="会客厅图片"
                 prop="pic"
                 :label-width="formLabelWidth"
               >
@@ -241,11 +241,11 @@ export default {
       fileList: [],
       rules: {
         name: [
-          { required: true, message: '请输入会议室名称', trigger: 'blur' },
+          { required: true, message: '请输入会客厅名称', trigger: 'blur' },
           { min: 1, trigger: 'blur' }
         ],
         area: [
-          { required: true, message: '请输入会议室面积', trigger: 'blur' }
+          { required: true, message: '请输入会客厅面积', trigger: 'blur' }
           // { min: 1, message: '请输入数字', type: 'number', trigger: 'blur' }
         ],
         description: [
@@ -381,7 +381,7 @@ export default {
     },
     // 删除图片
     taskDelete (row) {
-      this.$confirm('此操作将永久删除该会议室, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该会客厅, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

back/src/views/modules/sys/user.vue

@@ -11,12 +11,12 @@
         <el-form-item>
           <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
             <el-option :label="data.postName" v-for="data in postList" :key="data.id" :value="data.id">{{ data.postName
             }}</el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true" ref="renDeptTree">
           </ren-dept-tree>

front/src/api/home.js

@@ -454,7 +454,7 @@ export function getDevelopDocTree(params) {
   })
 }
 
-//会议室查询接口
+//会客厅查询接口
 export function getRoomSearch(params) {
   return request({
     url: '/bookMeeting/list',

front/src/views/home/DetailsPageconetent.vue

@@ -763,7 +763,7 @@
       next()
     },
     setup() {
-      //会议室传的标识6
+      //会客厅传的标识6
       const flag = ref('')
       let componentTypeArray = ['组件类型', '应用领域']
       const handleAdd = (value) => {

front/src/views/home/infrastructurePage.vue

@@ -35,7 +35,7 @@
           @click="roomResults"
           :class="roomYuyue ? 'roomBackground' : 'nullBackground'"
         >
-          会议室预约
+          会客厅预约
         </div>
         <div
           class="leftBottom"
@@ -46,7 +46,7 @@
         </div>
       </div>
       <div class="roomSearch">
-        <span>会议室搜索</span>
+        <span>会客厅搜索</span>
         <div class="searchInput">
           <a-input-search
             v-model:value="roomInput"
@@ -65,7 +65,7 @@
       </div>
       <div v-if="roomYuyue">
         <div class="roomTableList">
-          <span>会议室列表</span>
+          <span>会客厅列表</span>
           <div class="roomTime">
             <span>可用时间查询</span>
             <a-space direction="vertical" class="roomSpace">
@@ -251,7 +251,7 @@
       </a-modal>
       <a-modal
         v-model:visible="appointmentRoom"
-        title="会议室预约"
+        title="会客厅预约"
         width="10rem"
         @ok="handleOk"
         :body-style="bodystyle"
@@ -289,7 +289,7 @@
               >
                 <div class="imgJinggao"></div>
                 <span style="color: #da2a13; font-size: 0.12rem">
-                  当日会议室可用时段：{{ roomDateList[0] }}
+                  当日会客厅可用时段：{{ roomDateList[0] }}
                 </span>
               </div>
             </a-col>
@@ -922,7 +922,7 @@
     showSizeChanger: true,
     pageSizeOptions: ['10', '30', '50', '100', '1000'], //每页中显示的数据
   })
-  //会议室变量区域=======
+  //会客厅变量区域=======
   const paginationRoom = ref({
     total: 0,
     current: 1,
@@ -1217,7 +1217,7 @@
   }
 
   init()
-  //点击会议室左侧切换
+  //点击会客厅左侧切换
   const result = () => {
     roomYuyue.value = false
     roomResult.value = true
@@ -1348,7 +1348,7 @@
       return seconds
     }
   }
-  // 时间选择器限制----会议室预约时段
+  // 时间选择器限制----会客厅预约时段
   //获取不可选择的小时
   const disabledTimeHours = () => {
     if (formState.endTime) {
@@ -1457,7 +1457,7 @@
   const handleChange = (i) => {
     let query = {
       date: i, //查询的riqi
-      roomId: dateId.value, //会议室主键
+      roomId: dateId.value, //会客厅主键
     }
     getDate(query).then(({ data: res }) => {
       roomDateList.value = res.data
@@ -1466,7 +1466,7 @@
 
   const columnsRomm = [
     {
-      title: '会议室名称',
+      title: '会客厅名称',
       dataIndex: 'roomName',
       align: 'center',
     },
@@ -1530,13 +1530,13 @@
         console.log('error', err)
       })
   }
-  //会议室查询接口
+  //会客厅查询接口
   const searchData = () => {
     let query = {
       bookDate: roomCerateDate.value, //	预约开始时间 年月日
       startTime: roomCreateTime.value, //预约开始时 间时分秒
       endTime: roomEndTime.value, //	预约结束时间
-      name: roomInput.value, //会议室名称
+      name: roomInput.value, //会客厅名称
       page: roomPage.value, //页码
       limit: roomLimit.value, //每页条数
     }

front/src/views/mynoticeView/components/NoticeList.vue

@@ -187,8 +187,8 @@ let typeObj = {
   7: '需求后台',
   8: '评论前台',
   9: '评论后台',
-  10: '会议室前台',
+  10: '会客厅前台',
-  11: '会议室后台',
+  11: '会客厅后台',
   12: '其他'
 }
 
@@ -214,7 +214,7 @@ let pageObj = {
     0: 'myAgent-CommentModeration',
     1: 'hasToDoTasks-CommentModeration',
   },
-  '会议室后台': {
+  '会客厅后台': {
     0: 'activiti-RoomExamineAdmin',
     1: 'activiti-RoomExamineAdmin',
   },
@@ -227,10 +227,10 @@ const tabTypeObj = {
   '下架前台': '能力下架',
   '需求前台': '需求评论',
   '评论前台': '需求评论',
-  '会议室前台': '会议室前台'
+  '会客厅前台': '会客厅前台'
 }
 
-// 会议室后台
+// 会客厅后台
 const goPage = (item) => {
   if (item.jumpUrl && item.type !== 12) {
     let typeText = typeObj[item.type];
@@ -259,7 +259,7 @@ const goPage = (item) => {
   //     let _page = pageObj[typeText][_applyState]
   //     window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`)
   //   } else if (typeText.indexOf('前台') !== -1) {
-  //     if (typeText == '会议室前台') {
+  //     if (typeText == '会客厅前台') {
   //       router.push({
   //         path: '/DetailsPageconetent',
   //         query: {