Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/AppMarket.vue

@@ -9,12 +9,9 @@
         @click="handleUpload"
         >上传配置文件</a-button
       >
-      <a-tab-pane key="/appmarket/terminalapp" tab="终端应用">
-        <!-- <TerminalApp></TerminalApp> -->
-      </a-tab-pane>
-      <a-tab-pane key="/appmarket/moveapp" tab="移动端应用" force-render>
-        <!-- <MoveApp></MoveApp> -->
-      </a-tab-pane>
+      <a-tab-pane key="/appmarket/terminalapp" tab="终端应用"> </a-tab-pane>
+      <a-tab-pane key="/appmarket/moveapp" tab="移动端应用"> </a-tab-pane>
+      <a-tab-pane key="/appmarket/blackapp" tab="应用黑名单"> </a-tab-pane>
     </a-tabs>
     <div class="app-out-box flex1">
       <router-view></router-view>

base-manager-ui/admin/src/pages/basicset/appmarket/modal/DevToBlack.vue

+<template>
+  <div>
+    <a-modal
+      v-model="Visible"
+      :maskClosable="false"
+      title="新增应用黑名单"
+      @cancel="handleClose"
+      destroyOnClose
+      centered
+    >
+      <template slot="footer">
+        <a-button @click="handleReset">重置</a-button>
+        <a-button type="primary" @click="handleOk">确定</a-button>
+      </template>
+      <a-form-model
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :label-col="{ span: 4 }"
+        :wrapper-col="{ span: 20 }"
+      >
+        <a-form-model-item label="应用" prop="appId">
+          <a-select
+            @change="handleChange"
+            labelInValue
+            placeholder="请选择应用"
+            v-model="selectInfo"
+          >
+            <a-select-option v-for="v in appList" :key="v.id" :value="v.id">
+              {{ v.appName }}
+            </a-select-option>
+          </a-select>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+      
+<script>
+import { saveBlackApp, getAppList } from "@/services/market";
+export default {
+  props: {
+    addVisile: {
+      type: Boolean,
+      require: true,
+      default: false,
+    },
+  },
+  components: {},
+  data() {
+    return {
+      selectInfo: undefined,
+      form: {
+        siteId: "", // 站点id
+        deviceId: "", // 设备id
+        deviceCode: "", // 设备编码
+        deviceName: "", // 设备名称
+        appId: "", // 应用id
+        appName: "", // 应用名称
+        appCode: "", // 应用编码
+      },
+      appList: [], // app列表
+      devList: [], // 设备列表
+      rules: {
+        appId: [{ required: true, message: "请选择应用", trigger: "change" }],
+      },
+    };
+  },
+  computed: {
+    Visible: {
+      get() {
+        return this.addVisile;
+      },
+      set(val) {
+        this.$emit("update:addVisile", val);
+      },
+    },
+  },
+  created() {
+    this.getAppList();
+  },
+  methods: {
+    // 获取应用列表
+    async getAppList() {
+      let res = await getAppList({
+        page: 1,
+        size: -1,
+        type: 1,
+      });
+      if (res.data.code == 1) {
+        let { data } = res.data.data;
+        this.appList = data;
+      }
+    },
+    // 切换选择
+    handleChange(row) {
+      this.form.appId = row.key;
+      this.form.appName = row.label;
+    },
+    // 新增
+    onAdd(row) {
+      this.form.siteId = row.siteId;
+      this.form.deviceId = row.id;
+      this.form.deviceCode = row.deviceCode;
+      this.form.deviceName = row.deviceName;
+    },
+
+    // 关闭弹窗
+    handleClose() {
+      this.selectInfo = undefined;
+      this.$refs.form.resetFields();
+      this.Visible = false;
+    },
+    // 保存
+    handleOk() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let res = await saveBlackApp(this.form);
+          let { code, msg } = res.data;
+          if (code == 1) {
+            this.$message.success(msg);
+            this.$emit("addSuccess");
+            this.handleClose();
+          }
+        }
+      });
+    },
+    // 重置
+    handleReset() {
+      this.selectInfo = undefined;
+      this.$refs.form.resetFields();
+    },
+  },
+};
+</script>
+      
+  <style lang="less" scoped>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/site/website.vue

@@ -27,7 +27,7 @@
                   <a-button type="primary" @click="editSiteInfo(item)"
                     >编辑</a-button
                   >
-                  <a-button type="danger" @click="deleteSite(item.id)"
+                  <a-button type="danger" @click="deleteSite(item.id, index)"
                     >删除</a-button
                   >
                 </div>
@@ -200,16 +200,10 @@
           </div>
           <div v-else class="empty-show">
             <a-empty description="暂无站点" />
-            <div class="btn_box" v-if="!siteData.length">
-              <div style="width: 200px">
-                <a-button block size="large" @click="addSiteAll"
-                  >新增站点</a-button
-                >
-              </div>
-            </div>
           </div>
+
           <!-- 切换站点 -->
-          <!-- <div class="cut-btn">
+          <div class="cut-btn flex aic jcb">
             <div>
               <a-icon
                 type="vertical-right"
@@ -217,6 +211,13 @@
                 @click="changePage(-1)"
               />
             </div>
+            <div class="btn_box">
+              <div style="width: 200px">
+                <a-button block size="large" @click="addSiteAll"
+                  >新增站点</a-button
+                >
+              </div>
+            </div>
             <div>
               <a-icon
                 type="vertical-left"
@@ -224,7 +225,7 @@
                 @click="changePage(1)"
               />
             </div>
-        </div> -->
+          </div>
         </div>
       </a-spin>
     </div>
@@ -323,7 +324,7 @@ export default {
     },
 
     // 删除
-    deleteSite(val) {
+    deleteSite(val, index) {
       let _this = this;
       this.$confirm({
         title: "系统提示",
@@ -339,7 +340,11 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             _this.$message.success(msg);
-            _this.getSiteList({ areaID: _this.areaID });
+            _this.siteData.splice(index, 1);
+            if (index > 0) {
+              _this.active -= 1;
+            }
+            // _this.getSiteList({ areaID: _this.areaID });
           }
         },
         onCancel() {
@@ -431,6 +436,7 @@ export default {
       height: 100%;
       padding-left: 20px;
       display: flex;
+      flex-direction: column;
       justify-content: center;
       align-items: center;
       .rigth-content {
@@ -438,6 +444,7 @@ export default {
         height: 100%;
       }
       .cut-btn {
+        width: 100%;
         margin-top: 30px;
         display: flex;
         justify-content: space-between;

base-manager-ui/admin/src/router/config.js

@@ -256,6 +256,14 @@ const options = {
                     // keepAlive: true,
                   },
                 },
+                {
+                  path: "blackapp",
+                  component: () =>
+                    import("@/pages/basicset/appmarket/components/BlackApp"),
+                  meta: {
+                    invisible: true,
+                  },
+                },
               ],
             },
             {

base-manager-ui/admin/src/services/basicsetApi.js

@@ -355,4 +355,14 @@ module.exports = {
     batchSave: `${BASE_URL}/base/window/hall/batchSave`,
     delete: `${BASE_URL}/base/window/hall/delete`,
   },
+  // 设备
+  device: {
+    list: `${BASE_URL}/base/device/list`,
+  },
+  // 应用黑名单
+  blackapp: {
+    list: `${BASE_URL}/base/device/blackapp/list`,
+    save: `${BASE_URL}/base/device/blackapp/save`,
+    delete: `${BASE_URL}/base/device/blackapp/delete`,
+  },
 };

base-manager-ui/admin/src/services/market.js

@@ -4,6 +4,8 @@ import {
   appField,
   templete,
   version,
+  device,
+  blackapp,
 } from "@/services/basicsetApi";
 
 import { request, METHOD } from "@/utils/request";
@@ -136,3 +138,29 @@ export async function usedVersion(data) {
 export async function previewVersion(data) {
   return request(version.preview, METHOD.GET, data);
 }
+
+/**
+ *  设备列表
+ */
+export async function getDeviceList(data) {
+  return request(device.list, METHOD.POST, data);
+}
+
+/**
+ *  设备应用黑名单
+ */
+
+// 获取应用黑名单列表
+export async function getBlackAppList(data) {
+  return request(blackapp.list, METHOD.POST, data);
+}
+
+// 保存
+export async function saveBlackApp(data) {
+  return request(blackapp.save, METHOD.POST, data);
+}
+
+// 删除
+export async function deleteBlackapp(data) {
+  return request(blackapp.delete, METHOD.GET, data);
+}