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

back/src/router/index.js

@@ -105,7 +105,6 @@ router.beforeEach((to, from, next) => {
       return next({ name: 'login' })
     }
     window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
-    debugger
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {
@@ -138,7 +137,6 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
  */
 function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
   var temp = []
-  debugger
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].children && menuList[i].children.length >= 1) {
       temp = temp.concat(menuList[i].children)

back/src/views/modules/ability/shipinziyuan.vue

@@ -0,0 +1,356 @@
+<template>
+  <div>
+    <div  class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item label="资源名称">
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="yunadd('add',null)"
+            >上架</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('ability:bsabilityai:delete')"
+            type="danger"
+            @click="reset"
+            >{{ $t('deleteBatch') }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList1"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="摄像头名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="摄像头编号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="位置"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="提供地市"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('update',scope.row)"
+              >修改</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >删除</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >设置标签</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(10)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+ 
+    <!--新增-->
+    <el-dialog title="视频资源" :visible.sync="yunshow" width="720px" class="status_change">
+      <el-form :inline="true" label-width="120px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="摄像头名称：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="摄像头编号：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="位置：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="提供部门：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="提供地市：">
+                <el-input v-model="yunaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            
+          </el-row>
+         
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
+</div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      yunaddForm: {
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g:"",
+        h:"",
+        i:"",
+        j:"",
+      },
+     
+      total: 10,
+      choose: 1,
+      yunshow: false,
+      wangshow:false,
+      dataList1: [ 
+        {
+            "a": "市北区顺昌路改造项目大门",
+            "b": "101_37020201581314000511",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "青城建设蚌埠路以北宁乡路以西门",
+            "b": "101_37020201581314000514",
+            "c": "青城建设蚌埠路以北宁乡路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "青房建安幸福家园三期现场",
+            "b": "101_37020201581314000518",
+            "c": "青房建安幸福家园",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "青岛一建青岛公共卫生中心大门",
+            "b": "101_37020201581314000519",
+             "c": "青岛一建青岛公共卫生中心",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "中建筑港中国钢研院一钢一研塔吊",
+            "b": "101_37020201581314000529",
+             "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "现场",
+            "b": "101_37020201581314001008",
+             "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "高位1",
+            "b": "101_37020201581314001037",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "门口洗车",
+            "b": "101_37020201581314001038",
+             "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "大门口",
+            "b": "101_37020201581314001039",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        },
+        {
+            "a": "中青建安隆德花园现场",
+            "b": "101_37020201581314001359",
+            "c": "市北区顺昌路",
+            "d": "市住房城乡建设局",
+            "e": "市南区"
+        }
+    ],
+      dataForm: {
+        name: "",
+      },
+    };
+  },
+  watch: {},
+  components: {},
+  created() {},
+  mounted() {},
+  methods: {
+    handleChose(index) {
+      this.choose = index;
+    },
+    reset() {},
+    query() {},
+    //云资源新增
+    yunadd(type,row) {
+      if(type=='add'){
+        this.yunaddForm.a="" 
+        this.yunaddForm.b=""
+        this.yunaddForm.c=""
+        this.yunaddForm.d=""
+        this.yunaddForm.e=""
+        this.yunaddForm.f=""
+        this.yunaddForm.g=""
+      }else{
+        this.yunaddForm.a=row.a
+        this.yunaddForm.b=row.b
+        this.yunaddForm.c=row.c
+        this.yunaddForm.d=row.d
+        this.yunaddForm.e=row.e
+        this.yunaddForm.f=row.f
+        this.yunaddForm.g=row.g
+      }
+      this.yunshow = true;
+    },
+   
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#0058e1;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: white;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
+.form-minwidth-style {
+  width: 660px;
+}
+.second-title {
+  border-radius: 2px;
+  margin-top: 10px;
+  margin-bottom: 22px;
+  font-size: 18px;
+  cursor: pointer;
+  text-align: center;
+  background: #ebe5e5;
+  width: 200px;
+  height: 30px;
+  line-height: 30px;
+  display: table;
+}
+
+.departmentStyle {
+  display: table-cell;
+  width: 50%;
+  color: #fff;
+  background-color: #0058e1;
+  font-weight: bolder;
+}
+.departmentStyle1 {
+  display: table-cell;
+  width: 50%;
+}
+.el-tooltip__popper {
+  max-width: 50%;
+}
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>

back/src/views/modules/ability/shujuziyuan.vue

@@ -0,0 +1,384 @@
+<template>
+  <div>
+    <div  class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item label="资源名称">
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="yunadd('add',null)"
+            >上架</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('ability:bsabilityai:delete')"
+            type="danger"
+            @click="reset"
+            >{{ $t('deleteBatch') }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList1"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="数据名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="数据代码"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="数据描述"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="创建时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('update',scope.row)"
+              >修改</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >删除</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="reset"
+              >设置标签</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(10)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+ 
+    <!--新增-->
+    <el-dialog title="数据资源" :visible.sync="yunshow" width="720px" class="status_change">
+      <el-form :inline="true" label-width="120px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="数据名称：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数据代码：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="数据描述：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数据存储方式：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="数据量：">
+                <el-input v-model="yunaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="提供方式：">
+                <el-input v-model="yunaddForm.e"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="服务地址：">
+                <el-input v-model="yunaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="提供部门：">
+                <el-input v-model="yunaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="联系人：">
+                <el-input v-model="yunaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系方式：">
+                <el-input v-model="yunaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
+</div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      yunaddForm: {
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g:"",
+        h:"",
+        i:"",
+        j:"",
+      },
+     
+      total: 10,
+      choose: 1,
+      yunshow: false,
+      wangshow:false,
+      dataList1: [
+        {
+            "a": "供水营业网点信息",
+            "b": "307013109015000204",
+            "c": "供水营业网点信息",
+            "d": "青岛西海岸新区城市管理局（区水务局）",
+            "e ": "2022-10-28"
+        },
+        {
+            "a": "新建体育公园、笼式场地",
+            "b": "307013100673000036",
+            "c": "新建体育公园、笼式场地",
+            "d": "青岛市体育局",
+            "e ": "2022-10-28"
+        },
+        {
+            "a": "西海岸新区供水领域自然人欠费信息",
+            "b": "307013109015000211",
+            "c": "西海岸新区供水领域自然人欠费信息",
+            "d": "青岛西海岸新区城市管理局（区水务局）",
+            "e ": "2022-10-28"
+        },
+        {
+            "a": "青岛西海岸新区交通运输局",
+            "b": "307013109071000108",
+            "c": "公交站点查询",
+            "d": "青岛西海岸新区交通运输局",
+            "e ": "2022-10-27"
+        },
+        {
+            "a": "全市主要经济指标",
+            "b": "307013107004000062",
+            "c": "胶州市国民经济分行业数据",
+            "d": "胶州市统计局",
+            "e ": "2022-10-13"
+        },
+        {
+            "a": "乡村之星信息",
+            "b": "307013100000000187",
+            "c": "乡村之星信息",
+            "d": "青岛市农业农村局",
+            "e ": "2022-10-13"
+        },
+        {
+            "a": "建设项目环境影响评价审批信息",
+            "b": "307013107777000033",
+            "c": "建设单位、建设项目、审批文号",
+            "d": "青岛市生态环境局胶州分局",
+            "e ": "2022-10-13"
+        },
+        {
+            "a": "新时代文明实践阵地信息表",
+            "b": "307013108760000022",
+            "c": "镇街、阵地名称、专管员、联系电话",
+            "d": "莱西市夏格庄镇人民政府",
+            "e ": "2022-09-29"
+        },
+        {
+            "a": "泊里镇非物质文化遗产信息",
+            "b": "307013109000000067",
+            "c": "泊里镇非物质文化遗产的名称、简介等信息",
+            "d": "青岛市黄岛区泊里镇人民政府",
+            "e ": "2022-10-11"
+        },
+        {
+            "a": "人才住房建设情况",
+            "b": "307013100482000025",
+            "c": "人才住房项目数量、人才住房房屋套数、人才住房面积、人才住房目标任务房屋套数、人才住房房屋总面积",
+            "d": "青岛市住房和城乡建设局",
+            "e ": "2022-09-18"
+        }
+    ],
+       
+      dataForm: {
+        name: "",
+      },
+    };
+  },
+  watch: {},
+  components: {},
+  created() {},
+  mounted() {},
+  methods: {
+    handleChose(index) {
+      this.choose = index;
+    },
+    reset() {},
+    query() {},
+    //云资源新增
+    yunadd(type,row) {
+      if(type=='add'){
+        this.yunaddForm.a="" 
+        this.yunaddForm.b=""
+        this.yunaddForm.c=""
+        this.yunaddForm.d=""
+        this.yunaddForm.e=""
+        this.yunaddForm.f=""
+        this.yunaddForm.g=""
+      }else{
+        this.yunaddForm.a=row.a
+        this.yunaddForm.b=row.b
+        this.yunaddForm.c=row.c
+        this.yunaddForm.d=row.d
+        this.yunaddForm.e=row.e
+        this.yunaddForm.f=row.f
+        this.yunaddForm.g=row.g
+      }
+      this.yunshow = true;
+    },
+   
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#0058e1;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: white;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
+.form-minwidth-style {
+  width: 660px;
+}
+.second-title {
+  border-radius: 2px;
+  margin-top: 10px;
+  margin-bottom: 22px;
+  font-size: 18px;
+  cursor: pointer;
+  text-align: center;
+  background: #ebe5e5;
+  width: 200px;
+  height: 30px;
+  line-height: 30px;
+  display: table;
+}
+
+.departmentStyle {
+  display: table-cell;
+  width: 50%;
+  color: #fff;
+  background-color: #0058e1;
+  font-weight: bolder;
+}
+.departmentStyle1 {
+  display: table-cell;
+  width: 50%;
+}
+.el-tooltip__popper {
+  max-width: 50%;
+}
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>

back/src/views/modules/ability/yunandwang.vue

@@ -0,0 +1,662 @@
+<template>
+  <div>
+    <div class="second-title">
+      <div
+        style="margin-right: 30px"
+        :class="[choose === 1 ? 'departmentStyle' : 'departmentStyle1']"
+        @click="handleChose(1)"
+      >
+        云资源
+      </div>
+      <div
+        :class="[choose === 2 ? 'departmentStyle' : 'departmentStyle1']"
+        @click="handleChose(2)"
+      >
+        网络资源
+      </div>
+    </div>
+    <div v-if="choose === 1" class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="yunadd('add',null)">新增</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList1"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="项目名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="主机名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="用途"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="网络区域"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="配置"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="f"
+          label="系统盘"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="g"
+          label="数据盘"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="yunadd('update',scope.row)"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(10)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+    <div v-if="choose === 2" class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入资源名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="query(dataForm.name)">{{
+            $t("query")
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="wangadd('add',null)"
+            >新增</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList2"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        height="650px"
+      >
+        <el-table-column
+          prop="a"
+          label="项目名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="b"
+          label="网络名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="c"
+          label="用途"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="d"
+          label="网络区域"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="e"
+          label="网络类型"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="f"
+          label="宽带峰值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="g"
+          label="IP"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="wangadd('detail',scope.row)"
+              >详情</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="wangadd('update',scope.row)"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="Number(total)"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </div>
+
+    <!--云资源新增-->
+    <el-dialog title="云资源" :visible.sync="yunshow" width="640px" class="status_change">
+      <el-form :inline="true" label-width="100px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="项目名称：">
+                <el-input v-model="yunaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="主机名称：">
+                <el-input v-model="yunaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="用途：">
+                <el-input v-model="yunaddForm.c"   style="width:490px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络区域：">
+                <el-input v-model="yunaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="配置：">
+                <el-input v-model="yunaddForm.e"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络盘：">
+                <el-input v-model="yunaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="数据盘：">
+                <el-input v-model="yunaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+
+ <!--网资源新增-->
+ <el-dialog title="网络资源" :visible.sync="wangshow" width="640px" class="status_change">
+      <el-form :inline="true" label-width="100px">
+        <div class="form-minwidth-style">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="项目名称：">
+                <el-input v-model="wangaddForm.a"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="网络名称：">
+                <el-input v-model="wangaddForm.b"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="用途：">
+                <el-input v-model="wangaddForm.c"   style="width:490px;"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络区域：">
+                <el-input v-model="wangaddForm.d"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="网络类型：">
+                <el-input v-model="wangaddForm.e"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="宽带峰值：">
+                <el-input v-model="wangaddForm.f"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="IP：">
+                <el-input v-model="wangaddForm.g"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="yunshow = false">取 消</el-button>
+            <el-button type="primary" @click="yunshow = false">确 定</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-dialog>
+</div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      yunaddForm: {
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g:"",
+      },
+      wangaddForm:{
+        a: "",
+        b: "",
+        c: "",
+        d: "",
+        e: "",
+        f: "",
+        g: "",
+      },
+      total: 10,
+      choose: 1,
+      yunshow: false,
+      wangshow:false,
+      dataList1: [
+      {
+            "a": "数字底座",
+            "b": "数字底座数据库服务器",
+            "c": "数据库服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:15G",
+            "f": "50G",
+            "g": "150G"
+        },
+        {
+            "a": "数字底座",
+            "b": "数字底座应用服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:16G",
+            "f": "30G",
+            "g": "100G"
+        },
+        {
+            "a": "数字底座",
+            "b": "算法仓01服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:15G",
+            "f": "40G",
+            "g": "170G"
+        },
+        {
+            "a": "数字底座",
+            "b": "算法仓02服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:16核；内存:32G",
+            "f": "80G",
+            "g": "600G"
+        },
+        {
+            "a": "数字底座",
+            "b": "算法仓03服务器",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:32核；内存:64G",
+            "f": "120G",
+            "g": "1024G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化api服务器2",
+            "c": "应用服务器",
+            "d": "金宏网",
+            "e": "CPU:2核；内存:4G",
+            "f": "150G",
+            "g": "400G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化api服务器1",
+            "c": "应用服务器",
+            "d": "金宏网",
+            "e": "CPU:1核；内存:2G",
+            "f": "130G",
+            "g": "200G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化管理节点服务器1",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:8核；内存:16G",
+            "f": "200G",
+            "g": "600G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化管理节点服务器2",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:4核；内存:8G",
+            "f": "50G",
+            "g": "500G"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "一体化管理节点服务器3",
+            "c": "应用服务器",
+            "d": "政务外网公共服务域",
+            "e": "CPU:16核；内存:32G",
+            "f": "160G",
+            "g": "500G"
+        }
+      ],
+      dataList2: [
+      {
+            "a": "数字底座",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1600MB/s",
+            "g": "15.72.183.90"
+        },
+        {
+            "a": "数字底座",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "2100MB/s",
+            "g": "15.72.183.91"
+        },
+        {
+            "a": "填报系统",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "800MB/s",
+            "g": "15.72.184.9"
+        },
+        {
+            "a": "领导驾驶舱",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1600MB/s",
+            "g": "15.72.184.10"
+        },
+        {
+            "a": "区市指挥室",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1200MB/s",
+            "g": "15.72.184.11"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1200MB/s",
+            "g": "15.72.184.12"
+        },
+        {
+            "a": "消防一览",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1064MB/s",
+            "g": "15.72.182.107"
+        },
+        {
+            "a": "政务云系统",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1200MB/s",
+            "g": "15.72.182.108"
+        },
+        {
+            "a": "数字监控平台",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "1064MB/s",
+            "g": "15.72.182.109"
+        },
+        {
+            "a": "应急一体化综合指挥平台",
+            "b": "金宏网",
+            "c": "",
+            "d": "内网",
+            "e": "专线",
+            "f": "800MB/s",
+            "g": "15.72.182.110"
+        }
+      ],
+      dataForm: {
+        name: "",
+      },
+    };
+  },
+  watch: {},
+  components: {},
+  created() {},
+  mounted() {},
+  methods: {
+    handleChose(index) {
+      this.choose = index;
+    },
+    reset() {},
+    query() {},
+    //云资源新增
+    yunadd(type,row) {
+      if(type=='add'){
+        this.yunaddForm.a="" 
+        this.yunaddForm.b=""
+        this.yunaddForm.c=""
+        this.yunaddForm.d=""
+        this.yunaddForm.e=""
+        this.yunaddForm.f=""
+        this.yunaddForm.g=""
+      }else{
+        this.yunaddForm.a=row.a
+        this.yunaddForm.b=row.b
+        this.yunaddForm.c=row.c
+        this.yunaddForm.d=row.d
+        this.yunaddForm.e=row.e
+        this.yunaddForm.f=row.f
+        this.yunaddForm.g=row.g
+      }
+      this.yunshow = true;
+    },
+    //网资源新增
+    wangadd(type,row) {
+      if(type=='add'){
+        this.wangaddForm.a="" 
+        this.wangaddForm.b=""
+        this.wangaddForm.c=""
+        this.wangaddForm.d=""
+        this.wangaddForm.e=""
+        this.wangaddForm.f=""
+        this.wangaddForm.g=""
+      }else{
+        this.wangaddForm.a=row.a
+        this.wangaddForm.b=row.b
+        this.wangaddForm.c=row.c
+        this.wangaddForm.d=row.d
+        this.wangaddForm.e=row.e
+        this.wangaddForm.f=row.f
+        this.wangaddForm.g=row.g
+      }
+      this.wangshow = true;
+    },
+ 
+  
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.status_change {
+  ::v-deep  .el-dialog__header{
+    background-color:#0058e1;
+    padding: 10px 10px 10px;
+    .el-dialog__title,.el-dialog__headerbtn i{
+      color: white;
+    }
+    
+  }
+  .dialog-footer{
+    text-align: center;
+  }
+}
+.form-minwidth-style {
+  width: 600px;
+}
+.second-title {
+  border-radius: 2px;
+  margin-top: 10px;
+  margin-bottom: 22px;
+  font-size: 18px;
+  cursor: pointer;
+  text-align: center;
+  background: #ebe5e5;
+  width: 200px;
+  height: 30px;
+  line-height: 30px;
+  display: table;
+}
+
+.departmentStyle {
+  display: table-cell;
+  width: 50%;
+  color: #fff;
+  background-color: #0058e1;
+  font-weight: bolder;
+}
+.departmentStyle1 {
+  display: table-cell;
+  width: 50%;
+}
+.el-tooltip__popper {
+  max-width: 50%;
+}
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>

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

@@ -161,7 +161,7 @@
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
+            <el-table-column prop="hys" label="会客厅" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -321,7 +321,7 @@ export default {
         { name: '基础设施', key: 3 },
         { name: '数据资源', key: 4 },
         { name: '知识库', key: 5 },
-        { name: '会议室', value: 6 }
+        { name: '会客厅', value: 6 }
       ],
       tableData: [],
       tableDataClone: [],
@@ -347,9 +347,9 @@ export default {
         { name: '开发组件', value: 3 },
         { name: '业务组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会议室', value: 6 }
+        { name: '会客厅', value: 6 }
       ], // 类型备选列表
-      typeOptions1: [// 能力上架隐藏会议室
+      typeOptions1: [// 能力上架隐藏会客厅
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
         { name: '开发组件', value: 3 },

front/public/static/config/basicConfig.js

@@ -2,18 +2,18 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-24 11:50:52
+ * @LastEditTime: 2022-10-27 16:04:46
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  version: 'dev', // 西海岸
+  // version: 'xihaian', // 西海岸
-  // version: 'qingdao', // 开发
+  version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
-  vNum: 'v0.8.14.2',
+  vNum: 'v0.8.15.2',
   configData: {
     // 青岛市大数据局
     qingdao: {

front/src/views/home/apply.vue

@@ -311,6 +311,7 @@
       const apiURL = window.SITE_CONFIG.apiURL
 
       if (!applyAll) {
+        debugger
         list.value.map((item) => {
           item.arr.map((val) => {
             let obj = item.children

front/src/views/home/detailsPageconetentTree.vue

@@ -185,31 +185,32 @@
             treeData.value.sort((a, b) => {
               return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
             })
-            let deptId=user.value.deptId
+            //根据不同的权限展示不同的能力超市左侧树
-            treeData.value.forEach((child) => {
+          //  let deptId=user.value.deptId
-              let childern=child.children
+        //     treeData.value.forEach((child) => {
-              childern.forEach((childs) => {//第一层：市级
+        //       let childern=child.children
-           if(childs.key==deptId ){
+        //       childern.forEach((childs) => {//第一层：市级
-             childs.show=true
+        //    if(childs.key==deptId ){
-             child.show=true
+        //      childs.show=true
-             mybus.emit('paramsGetResources', [childs.key])
+        //      child.show=true
-              selectId.value =childs.key
+        //      mybus.emit('paramsGetResources', [childs.key])
-           }
+        //       selectId.value =childs.key
-           if(childs.children && childs.children.length>0){//第二层 区级
+        //    }
-            let qu=childs.children
+        //    if(childs.children && childs.children.length>0){//第二层 区级
-            qu.forEach((qu) => {
+        //     let qu=childs.children
-           if(qu.key==deptId ){
+        //     qu.forEach((qu) => {
-             qu.show=true
+        //    if(qu.key==deptId ){
-             childs.show=true
+        //      qu.show=true
-             child.show=true
+        //      childs.show=true
-              mybus.emit('paramsGetResources', [qu.key])
+        //      child.show=true
-              selectId.value = qu.key
+        //       mybus.emit('paramsGetResources', [qu.key])
-           }
+        //       selectId.value = qu.key
-           })
+        //    }
-           }
+        //    })
-         })
+        //    }
+        //  })
           
-          })
+        //   })
             console.log('左侧树结构数据======================>', treeData.value)
         
             showKey.value++