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

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

@@ -1,209 +1,92 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
-      <el-form
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="getDataList()"
-      >
         <el-form-item>
-          <el-input
+          <el-input v-model="dataForm.username" placeholder="用户名" clearable></el-input>
-            v-model="dataForm.username"
-            placeholder="用户名"
-            clearable
-          ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input
+          <el-input v-model="dataForm.real_name" placeholder="真实姓名" clearable></el-input>
-            v-model="dataForm.real_name"
-            placeholder="真实姓名"
-            clearable
-          ></el-input>
         </el-form-item>
         <el-form-item>
-          <ren-select
+          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
-            v-model="dataForm.gender"
-            dict-type="gender"
-            :placeholder="$t('user.gender')"
-          ></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-select
+          <el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
-            v-model="dataForm.postId"
+            <el-option :label="data.postName" v-for="data in postList" :key="data.id" :value="data.id">{{ data.postName
-            :placeholder="$t('user.postIdList')"
+            }}</el-option>
-            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>
-          <ren-dept-tree
+          <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true" ref="renDeptTree">
-            v-model="dataForm.deptId"
+          </ren-dept-tree>
-            :placeholder="$t('dept.title')"
-            :query="true"
-          ></ren-dept-tree>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{
-            $t('query')
+          $t('query')
           }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
-            v-if="$hasPermission('sys:user:save')"
+          </el-button>
-            type="primary"
-            @click="addOrUpdateHandle()"
-            >{{ $t('add') }}</el-button
-          >
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch')
-            v-if="$hasPermission('sys:user:delete')"
+          }}</el-button>
-            type="danger"
-            @click="deleteHandle()"
-            >{{ $t('deleteBatch') }}</el-button
-          >
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}
-            v-if="$hasPermission('sys:user:export')"
+          </el-button>
-            type="info"
-            @click="exportHandle()"
-            >{{ $t('export') }}</el-button
-          >
         </el-form-item>
         <el-form-item>
           <el-button @click="reset()">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
-        v-loading="dataListLoading"
+        @sort-change="dataListSortChangeHandle" style="width: 100%">
-        :data="dataList"
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        border
+        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center"
-        @selection-change="dataListSelectionChangeHandle"
+          align="center"></el-table-column>
-        @sort-change="dataListSortChangeHandle"
+        <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
-        style="width: 100%"
+        <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center">
-      >
+        </el-table-column>
-        <el-table-column
+        <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
-          type="selection"
+        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center"
-          header-align="center"
+          align="center"></el-table-column>
-          align="center"
+        <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center"
-          width="50"
+          align="center">
-        ></el-table-column>
-        <el-table-column
-          prop="username"
-          :label="$t('user.username')"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="realName"
-          label="真实姓名"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="deptName"
-          :label="$t('user.deptName')"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="email"
-          :label="$t('user.email')"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="mobile"
-          :label="$t('user.mobile')"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="gender"
-          :label="$t('user.gender')"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        >
           <template slot-scope="scope">
             {{ $getDictLabel('gender', scope.row.gender) }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center"
-          prop="status"
+          align="center">
-          :label="$t('user.status')"
-          sortable="custom"
-          header-align="center"
-          align="center"
-        >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
-              $t('user.status0')
+            $t('user.status0')
             }}</el-tag>
             <el-tag v-else size="small" type="success">{{
-              $t('user.status1')
+            $t('user.status1')
             }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center"
-          prop="createDate"
+          align="center" width="180"></el-table-column>
-          :label="$t('user.createDate')"
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          sortable="custom"
-          header-align="center"
-          align="center"
-          width="180"
-        ></el-table-column>
-        <el-table-column
-          :label="$t('handle')"
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="150"
-        >
           <template slot-scope="scope">
-            <el-button
+            <el-button v-if="$hasPermission('sys:user:update')" type="text" size="small"
-              v-if="$hasPermission('sys:user:update')"
+              @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-              type="text"
+            <el-button v-if="$hasPermission('sys:user:delete')" type="text" size="small"
-              size="small"
+              @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-              @click="addOrUpdateHandle(scope.row.id)"
-              >{{ $t('update') }}</el-button
-            >
-            <el-button
-              v-if="$hasPermission('sys:user:delete')"
-              type="text"
-              size="small"
-              @click="deleteHandle(scope.row.id)"
-              >{{ $t('delete') }}</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
-        :current-page="page"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
-        :page-sizes="[10, 20, 50, 100]"
+        @current-change="pageCurrentChangeHandle">
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
-      >
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-        v-if="addOrUpdateVisible"
-        ref="addOrUpdate"
-        @refreshDataList="getDataList"
-      ></add-or-update>
     </div>
   </el-card>
 </template>
@@ -214,7 +97,7 @@ import AddOrUpdate from './user-add-or-update'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/user/page',
@@ -235,30 +118,33 @@ export default {
   components: {
     AddOrUpdate
   },
-  created () {
+  created() {
     this.getPostList()
   },
   methods: {
-    reset () {
+    reset() {
+      this.dataForm.username = ''
+      this.dataForm.real_name = ''
+      this.dataForm.deptId = ''
+      this.dataForm.postId = ''
+      this.dataForm.gender = ''
+      if (this.$refs.renDeptTree) {
+        this.$refs.renDeptTree.showDeptName = '';
+      }
       this.$http
         .get(
           this.mixinViewModuleOptions.getDataListURL +
-            '?' +
+          '?' +
-            qs.stringify({
+          qs.stringify({
-              page: 1,
+            page: 1,
-              limit: 10,
+            limit: 10,
-              username: '',
+            username: '',
-              deptId: '',
+            deptId: '',
-              postId: '',
+            postId: '',
-              gender: ''
+            gender: ''
-            })
+          })
         )
         .then(({ data: res }) => {
-          this.dataForm.username = ''
-          this.dataForm.real_name = ''
-          this.dataForm.deptId = ''
-          this.dataForm.postId = ''
-          this.dataForm.gender = ''
           if (res.code !== 0) {
             this.dataList = []
             this.total = 0
@@ -279,7 +165,7 @@ export default {
           this.dataListLoading = false
         })
     },
-    getPostList () {
+    getPostList() {
       this.$http
         .get('/sys/post/list')
         .then(({ data: res }) => {
@@ -288,7 +174,7 @@ export default {
           }
           this.postList = res.data
         })
-        .catch(() => {})
+        .catch(() => { })
     }
   }
 }

front/public/static/config/basicConfig.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: Light
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-22 11:08:16
+ * @LastEditTime: 2022-10-24 11:50:52
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -13,7 +13,7 @@ var CONFIGITEM = {
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
-  vNum: 'v0.8.7.2',
+  vNum: 'v0.8.14.2',
   configData: {
     // 青岛市大数据局
     qingdao: {
@@ -27,8 +27,8 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      //apiURL: 'http://15.72.183.90:8000/renren-admin',
+      apiURL: 'http://15.72.183.90:8000/renren-admin',
-      // websocketURL: '15.72.183.90:8000/renren-admin',
+      websocketURL: '15.72.183.90:8000/renren-admin',
       // websocketURL: '192.168.124.233:8888/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
@@ -87,7 +87,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.254:8888/renren-admin',
       // websocketURL: '10.18.1.99:8889/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

front/src/api/personalCenter.js

@@ -308,4 +308,4 @@ export function getDeviceDetail(deviceId) {
     url: `/device/${deviceId}`,
     method: 'get',
   })
-}
+}

front/src/views/capacitySquare/components/algorithm.vue

@@ -53,9 +53,9 @@
   }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
-      if (val.dictLabel !== '其他') {
+      // if (val.dictLabel !== '其他') {
-        dictList.value.push(val.dictLabel)
+      dictList.value.push(val.dictLabel)
-      }
+      // }
     })
   })
   const params = {

front/src/views/capacitySquare/components/application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-09 09:31:25
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-09-19 10:19:02
+ * @LastEditTime: 2022-10-24 10:44:50
  * @Description: 应用资源
 -->
 <template>
@@ -74,9 +74,9 @@
   }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
-      if (val.dictLabel !== '其他') {
+      // if (val.dictLabel !== '其他') {
-        dictList.value.push(val.dictLabel)
+      dictList.value.push(val.dictLabel)
-      }
+      // }
     })
   })
   let dom = null

front/src/views/capacitySquare/components/layer.vue

@@ -53,9 +53,9 @@
   }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
-      if (val.dictLabel !== '其他') {
+      // if (val.dictLabel !== '其他') {
-        dictList.value.push(val.dictLabel)
+      dictList.value.push(val.dictLabel)
-      }
+      // }
     })
   })
   const params = {

front/src/views/home/infrastructurePage.vue

@@ -864,7 +864,7 @@
   })
   const videoList = ref([])
   const initMeeting = () => {
-    initiateMeet('一网统揽平台组/').then((res) => {
+    initiateMeet('青岛市一网统揽项目组/一网统揽平台组/').then((res) => {
       console.log('组会=========>', res)
     })
   }