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

back/src/utils/location.js

@@ -6,7 +6,8 @@
  * @Description: 告诉大家这是什么
  */
 const returnLocationStr = () => {
-  return 'qingdao'
+  // return 'qingdao'
+  return 'xihaian'
 }
 
 export default returnLocationStr

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

@@ -9,22 +9,31 @@
           <el-input v-model="dataForm.postName" :placeholder="$t('post.postName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <ren-select v-model="dataForm.status" dict-type="post_status" :placeholder="$t('post.status')" ></ren-select>
+          <ren-select v-model="dataForm.status" dict-type="post_status" :placeholder="$t('post.status')"></ren-select>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:post:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:post:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:post:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:post:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch')
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:post:reset')" type="primary" @click="resetHandle()">{{ $t('reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="postCode" :label="$t('post.postCode')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="postCode" :label="$t('post.postCode')" header-align="center" align="center">
-        <el-table-column prop="postName" :label="$t('post.postName')" header-align="center" align="center"></el-table-column>
+        </el-table-column>
+        <el-table-column prop="postName" :label="$t('post.postName')" header-align="center" align="center">
+        </el-table-column>
         <el-table-column prop="sort" :label="$t('post.sort')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="status" :label="$t('post.status')" header-align="center" align="center">
           <template slot-scope="scope">
@@ -33,18 +42,15 @@
         </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:post:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:post:update')" type="text" size="small"
-            <el-button v-if="$hasPermission('sys:post:delete')" type="text" 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:post: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]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -58,7 +64,7 @@ import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './post-add-or-update'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/post/page',
@@ -77,6 +83,14 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    resetHandle() {
+      Object.keys(this.dataForm).map(v => this.dataForm[v] = '')
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
   }
 }
 </script>

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

@@ -9,11 +9,14 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermispsion('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:role:reset')" type="primary" @click="resetHandle()">{{ $t('reset') }}</el-button>
+        </el-form-item>
       </el-form>
       <el-table
         v-loading="dataListLoading"
@@ -68,6 +71,14 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    resetHandle() {
+      this.dataForm.name = '';
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
   }
 }
 </script>

front/public/static/config/basicConfig.js

@@ -9,8 +9,8 @@ var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  version: 'dev', // 开发
+  // version: 'dev', // 开发
-  // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
+  version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   //version: 'test', // 测试
   //version: 'frp', // 内网穿透
   vNum: 'v0.8.7.2',
@@ -32,6 +32,25 @@ var CONFIGITEM = {
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
+    // 研发展厅
+    zhanTingDev: {
+      loginInfo: {
+        // 视频平台登陆信息
+        loginIp: '10.132.191.3',
+        loginPort: '8320',
+        userName: 'ynszdz',
+        userPwd: 'Admin@123',
+      },
+      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',
+      // websocketURL: '10.16.5.146:8888/renren-admin', // 姜永超
+      websocketURL: '10.18.1.99:8889/renren-admin',
+      // websocketURL: '10.16.5.35:8888/renren-admin',
+      POI_URL:
+        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+    },
     // 西海岸大数据局
     xihaian: {
       loginInfo: {

front/public/static/config/location.js

@@ -26,6 +26,10 @@ const footerDataList = {}
 // qingdao
 if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
   whoShow.itShowQingDao = true
+  if (newLocation == 'zhanTingDev' || newLocation == 'dev') {
+    whoShow.itShowZhanTingDev = true
+  }
+  
   infrastructure.deptName = '青岛市大数据发展管理局'
   infrastructure.deptId = '1067246875800000066'
   navListManagement.navList = [
@@ -527,4 +531,4 @@ else if (newLocation === 'xihaian') {
       },
     ],
   }
-}
+}

front/src/views/home/DetailsPageconetent.vue

@@ -450,17 +450,6 @@ import {
 } from './constantData/showData.js'
 
 export default defineComponent({
-  beforeRouteEnter(to, from, next) {
-    console.log('to---DetailsPageconetent--beforeRouteEnter------->', to)
-    console.log('from---DetailsPageconetent--beforeRouteEnter------->', from)
-    console.log('next---DetailsPageconetent--beforeRouteEnter------->', next)
-    // 返回按钮，刷新页面，所以from.name为undefined
-    // if (from.name || from.name !== 'details') {
-    //   console.log('清空------------>')
-    //   localStorage.removeItem('DetailsPageconetent')
-    // }
-    next()
-  },
   beforeRouteLeave(to, from, next) {
     console.log('to---DetailsPageconetent--beforeRouteLeave------->', to)
     console.log('from---DetailsPageconetent--beforeRouteLeave------->', from)
@@ -473,7 +462,7 @@ export default defineComponent({
   setup() {
     //会议室传的标识6
     const flag = ref('')
-
+    let componentTypeArray = ['组件类型', '应用领域']
     const handleAdd = (value) => {
       flag.value = value
     }
@@ -642,19 +631,41 @@ export default defineComponent({
       paramsGetResources.pageNum = 1
       currentPage.value = 1
       console.log('点击筛选条件=================>', tag, checked, name)
+      // 智能算法 特殊处理
+      if (tag.dict_label == '智能算法' && checked) {
+        ListContent.records.splice(2, 1, ListContentCopy.value[2])
+      } else {
+        if (name == '组件类型') {
+          ListContent.records.splice(2, 1)
+          paramsGetResources.infoList = paramsGetResources.infoList.filter(
+            (item) => componentTypeArray.includes(item.attrType)
+          )
+        }
+      }
+
       ListContent.records.forEach((val) => {
+        
+        if (!val) {
+          return;
+        }
         if (val.name === name) {
           paramsGetResources.infoList = paramsGetResources.infoList.filter(
             (item) => item.attrType !== name
           )
-          if (val.selectedTags.indexOf(tag.dict_label) == -1) {
+          if (val.selectedTags && val.selectedTags.indexOf(tag.dict_label) == -1) {
             val.selectedTags = [tag.dict_label]
             paramsGetResources.infoList.push({
               attrType: name,
               attrValue: tag.dict_label,
             })
           } else {
-            val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1)
+            val.selectedTags && val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1)
+          }
+          // 
+          if ((val.selectedTags.length == 0 && tag.dict_label == '智能算法' && !checked) || (tag.dict_label !== '智能算法' && name == '组件类型')) {
+            if (ListContentCopy.value[2]) {
+              ListContentCopy.value[2].selectedTags = []
+            }
           }
         }
       })
@@ -670,13 +681,12 @@ export default defineComponent({
       }
       selectDicStoreAll(params).then((res) => {
         console.log('selectDicStoreAll============>', res)
-        const { data } = res.data
+        const { data } = res.data;
-        ListContent.records = []
+        let dataCopy = data
-        ListContent.records = data
         tecHnosphere = router.currentRoute.value.query.tecHnosphere
         appLiCation = router.currentRoute.value.query.appLiCation
         mybus.emit('getDeptList')
-        ListContent.records.forEach((val) => {
+        dataCopy.forEach((val) => {
           val.selectedTags = []
           if (val.name == '应用领域' && appLiCation) {
             val.selectedTags[0] = []
@@ -720,16 +730,27 @@ export default defineComponent({
             val.shrinkFlag = true
           }
 
-          // todo--赋值
           if (storageSearchInfo) {
-            // name
             let obj =
               (storageSearchInfo.infoList || []).find(
                 (x) => x.attrType === val.name
-              ) || {}
+              );
-            val.selectedTags = obj.attrValue || []
+            if (obj) {
+              val.selectedTags = [obj.attrValue] || []
+            }
           }
         })
+        ListContentCopy.value = []
+        ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy));
+        ListContent.records = []
+        ListContent.records = JSON.parse(JSON.stringify(dataCopy));
+
+        // 智能算法-特殊处理
+        if (!storageSearchInfo) {
+          let _tag_list = dataCopy.filter(v => componentTypeArray.includes(v.name))
+          ListContent.records = _tag_list
+        }
+
         listKey.value++
         listKey2.value++
       })
@@ -739,6 +760,7 @@ export default defineComponent({
     let ListContent = reactive({
       records: [],
     })
+    let ListContentCopy = ref([])
     const resourceList = reactive({ data: [] })
     const videoList = reactive({ data: [] })
     const resourceTotal = ref('')
@@ -870,32 +892,18 @@ export default defineComponent({
               pageSize: paramsGetResources.pageSize, //分页大小
             }
             getDataResource(dataResourceParams).then((res) => {
+              loading.value = false
+              console.log('res.data.data----874-------->', res.data.data);
               if (whoShow1.value.itShowQingDao) {
-                res.data.data.data.forEach((val) => {
+                if (whoShow1.value.itShowZhanTingDev) {
-                  val.id = val.guid // id
+                  // 注意：！！！！！itShowZhanTingDev: 研发环境除数据资源用西海岸，其他配置跟青岛市局一样
-                  val.name = val.zyname // 名字
+                  console.log('999----->', res.data.data.list)
-                  val.sjlCount = val.sjcczl // 数据量
+                  getXiHaiAn(res)
-                  val.applyCount = val.syqk // 申请量
+                } else {
-                  val.deptName = val.TGBM // 部门
+                  getQingDao(res)
-                  val.createDate = val.fbrq // 发布时间
+                }
-                  val.description = val.xgxt // 描述
-                })
-                resourceList.data = res.data.data.data || []
-                resourceTotal.value = res.data.data.rows || ''
-                loading.value = false
               } else if (whoShow1.value.itShowXiHaiAn) {
-                res.data.data.list.forEach((val) => {
+                getXiHaiAn(res)
-                  val.id = val.serviceId // id
-                  val.name = val.serviceName // 名字
-                  val.sjlCount = val.requestQuantity // 数据量
-                  val.applyCount = val.requestCount // 申请量
-                  val.deptName = val.departmentName // 部门
-                  val.createTime = val.createTime.split('.')[0]
-                  val.createDate = val.createTime // 发布时间
-                })
-                resourceList.data = res.data.data.list || []
-                resourceTotal.value = res.data.data.total || ''
-                loading.value = false
               }
             })
           } else if (
@@ -958,31 +966,16 @@ export default defineComponent({
             pageSize: paramsGetResources.pageSize, //分页大小
           }
           getDataResource(dataResourceParams).then((res) => {
+            loading.value = false
+            console.log('res.data.data----982-------->', res.data.data);
             if (whoShow1.value.itShowQingDao) {
-              (res.data && res.data.data && res.data.data.data || []).forEach((val) => {
+              if (whoShow1.value.itShowZhanTingDev) {
-                val.id = val.guid // id
+                getXiHaiAn(res)
-                val.name = val.zyname // 名字
+              } else {
-                val.sjlCount = val.sjcczl // 数据量
+                getQingDao(res)
-                val.applyCount = val.syqk // 申请量
+              }
-                val.deptName = val.TGBM // 部门
-                val.createDate = val.fbrq // 发布时间
-                val.description = val.xgxt // 描述
-              })
-              resourceList.data = res.data.data.data || []
-              resourceTotal.value = res.data.data.rows || ''
-              loading.value = false
             } else if (whoShow1.value.itShowXiHaiAn) {
-              (res.data && res.data.data && res.data.data.list || []).forEach((val) => {
+              getXiHaiAn(res)
-                val.id = val.serviceId // id
-                val.name = val.serviceName // 名字
-                val.sjlCount = val.requestQuantity // 数据量
-                val.applyCount = val.requestCount // 申请量
-                val.deptName = val.departmentName // 部门
-                val.createTime = val.createTime.split('.')[0]
-                val.createDate = val.createTime // 发布时间
-              })
-              resourceList.data = res.data.data.list || []
-              resourceTotal.value = res.data.data.total || ''
               loading.value = false
             }
           })
@@ -1020,6 +1013,35 @@ export default defineComponent({
       }
     }
 
+    // 青岛-数据处理
+    const getQingDao = (res) => {
+      (res.data && res.data.data && res.data.data.data || []).forEach((val) => {
+        val.id = val.guid // id
+        val.name = val.zyname // 名字
+        val.sjlCount = val.sjcczl // 数据量
+        val.applyCount = val.syqk // 申请量
+        val.deptName = val.TGBM // 部门
+        val.createDate = val.fbrq // 发布时间
+        val.description = val.xgxt // 描述
+      })
+      resourceList.data = res.data.data.data || []
+      resourceTotal.value = res.data.data.rows || ''
+    }
+    // 青岛-西海岸处理
+    const getXiHaiAn = (res) => {
+      (res.data && res.data.data && res.data.data.list || []).forEach((val) => {
+        val.id = val.serviceId // id
+        val.name = val.serviceName // 名字
+        val.sjlCount = val.requestQuantity // 数据量
+        val.applyCount = val.requestCount // 申请量
+        val.deptName = val.departmentName // 部门
+        val.createTime = val.createTime.split('.')[0]
+        val.createDate = val.createTime // 发布时间
+      })
+      resourceList.data = res.data.data.list || []
+      resourceTotal.value = res.data.data.total || ''
+    }
+
     let shoppingCartList = ref([])
     // 获取申购车列表
     const getShoppingCartList = (list) => {
@@ -1274,7 +1296,6 @@ export default defineComponent({
       saveSearchCodition,
       searchResultListDom,
       handleSetSearchData, // todo
-      // refreshList,
     }
   },
   components: {
@@ -1645,7 +1666,7 @@ export default defineComponent({
           margin-top: 0.05rem;
 
           .ant-tag-checkable {
-            width: 0.83rem;
+            width: 1rem;
             height: 0.25rem;
             display: flex;
             justify-content: center;
@@ -1670,7 +1691,8 @@ export default defineComponent({
 
           .ant-tag-checkable:active,
           .ant-tag-checkable-checked {
-            width: 0.85rem;
+            // width: 0.85rem;
+            width: 1rem;
             font-family: 'Alibaba PuHuiTi';
             font-weight: 500;
             background-color: #0087ff;
@@ -1855,14 +1877,14 @@ export default defineComponent({
     }
 
     .leixingsum {
-      width: 0.93rem;
+      // width: 1rem;
       display: inline-block;
       cursor: pointer;
       text-align: center;
       margin-top: 0.05rem;
 
       .ant-tag-checkable {
-        width: 0.85rem;
+        width: 1rem;
         height: 0.25rem;
         display: flex;
         justify-content: center;

front/src/views/home/apply.vue

@@ -224,6 +224,11 @@
       HomeHeader,
       AbilityToApplyFor,
     },
+    beforeRouteLeave(from, to, next) {
+      console.log('from, to, next------------>', from, to, next);
+      localStorage.removeItem('integrationServicesItemInfo')
+      next()
+    },
     setup() {
       const router = useRouter()
       const disabled = ref(false)
@@ -238,7 +243,6 @@
         'integrationServicesItemInfo------------>',
         integrationServicesItemInfo
       )
-
       const applyAll = router.currentRoute.value.query.applyAll
       const num = ref(0)
       if (!applyAll) {
@@ -372,6 +376,7 @@
       //退出返回上一页
       const resetFields = () => {
         window.history.go(-1)
+        localStorage.removeItem('integrationServicesItemInfo')
       }
 
       // 跳转到能力集市
@@ -805,9 +810,11 @@
         updateIntegrationServices(_data)
           .then((res) => {
             console.log('res---更新--------->', res)
+            localStorage.removeItem('integrationServicesItemInfo')
           })
           .catch((err) => {
             console.log('err----更新-------->', err)
+            localStorage.removeItem('integrationServicesItemInfo')
           })
       }
       return {