应用列表操作优化

src/views/regionSection/applicationManage/applicationManage.vue

@@ -55,20 +55,26 @@
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
         <template slot-scope="{ row }" slot="enabled">
-          <div v-if="row.belong === 1">
+          <div
+            v-if="
+              row.createid === userInfo.adminid ||
+              row.regionid === powerParams.objectid
+            "
+          >
+            <i-switch
+              size="large"
+              v-model="row.enabled"
+              :true-value="1"
+              :false-value="2"
+              @on-change="enabledChange(row)"
+            >
+              <span slot="open">启用</span>
+              <span slot="close">禁用</span>
+            </i-switch>
+          </div>
+          <div v-else>
             {{ row.enabled === 1 ? "启用" : "禁用" }}
           </div>
-          <i-switch
-            v-if="row.belong === 2"
-            size="large"
-            v-model="row.enabled"
-            :true-value="1"
-            :false-value="2"
-            @on-change="enabledChange(row)"
-          >
-            <span slot="open">启用</span>
-            <span slot="close">禁用</span>
-          </i-switch>
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
@@ -91,8 +97,25 @@
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div @click="toEdit(row)">编辑</div>
-            <div class="action_del" @click="toDel(row)">删除</div>
+            <div
+              v-if="
+                row.createid === userInfo.adminid ||
+                row.regionid === powerParams.objectid
+              "
+              @click="toEdit(row)"
+            >
+              编辑
+            </div>
+            <div
+              v-if="
+                row.createid === userInfo.adminid ||
+                row.regionid === powerParams.objectid
+              "
+              class="action_del"
+              @click="toDel(row)"
+            >
+              删除
+            </div>
           </div>
         </template>
       </Table>
@@ -966,6 +989,8 @@ export default {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
     ).content;
+    console.log(this.userInfo.adminid);
+    console.log(this.powerParams.objectid);
     this.init();
     this.searchList();
   },

src/views/regionSection/networkManage/whitelist.vue

@@ -32,14 +32,19 @@
             <div v-if="row.whiteType === 1" @click="toView(row)">查看</div>
             <div
               v-if="
-                row.whiteType === 1 && row.regionid === powerParams.objectid
+                row.whiteType === 1 &&
+                (row.createid === userInfo.adminid ||
+                  row.regionid === powerParams.objectid)
               "
               @click="toEdit(row)"
             >
               编辑
             </div>
             <div
-              v-if="row.regionid === powerParams.objectid"
+              v-if="
+                row.createid === userInfo.adminid ||
+                row.regionid === powerParams.objectid
+              "
               class="action_del"
               @click="toDel(row)"
             >

src/views/regionSection/search/allApps.vue

@@ -41,20 +41,9 @@
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
         <template slot-scope="{ row }" slot="enabled">
-          <div v-if="row.belong === 1">
+          <div>
             {{ row.enabled === 1 ? "启用" : "禁用" }}
           </div>
-          <i-switch
-            size="large"
-            v-if="row.belong === 2"
-            v-model="row.enabled"
-            :true-value="1"
-            :false-value="2"
-            @on-change="enabledChange(row)"
-          >
-            <span slot="open">启用</span>
-            <span slot="close">禁用</span>
-          </i-switch>
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
@@ -78,7 +67,6 @@
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div class="action_del" @click="toDel(row)">删除</div>
           </div>
         </template>
       </Table>
@@ -339,11 +327,8 @@
 <script>
 import { search_list_app } from "@/api/region";
 import {
-  app_delete,
   app_detail,
   app_detail_history,
-  app_edit_enable,
-  app_edit_unenable,
   app_install_statistic
 } from "@/api/appgroup";
 import QRCode from "qrcodejs2";
@@ -540,24 +525,6 @@ export default {
         }
       });
     },
-    enabledChange(row) {
-      let api = row.enabled === 1 ? app_edit_enable : app_edit_unenable;
-      this.showLoading = true;
-      api({
-        rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        appid: row.appid,
-        rversion: row.rversion
-      }).then((data) => {
-        this.showLoading = false;
-        this.searchList();
-        if (data.code === 0) {
-          this.$Message.success(data.msg);
-        } else {
-          this.$Message.error(data.msg);
-        }
-      });
-    },
     installChange() {
       //安装统计切换版本
       let obj = this.installInfo.apphistorys.filter(
@@ -714,31 +681,6 @@ export default {
         }
       });
     },
-    // 删除
-    toDel(row) {
-      this.$Modal.confirm({
-        title: "提示",
-        content: "您确定删除选中数据吗？",
-        onOk: () => {
-          this.showLoading = true;
-          app_delete({
-            rtype: this.powerParams.rtype,
-            objectid: this.powerParams.objectid,
-            appid: row.appid,
-            rversion: row.rversion
-          }).then((res) => {
-            this.showLoading = false;
-            if (res.code === 0) {
-              this.$Message.success(res.msg);
-              this.searchList();
-            } else {
-              this.$Message.error(res.msg);
-            }
-          });
-        },
-        onCancel: () => {}
-      });
-    },
     // 搜索
     searchList() {
       this.searchForm.page = 1;

src/views/schoolSection/applicationManage/applicationList.vue

@@ -71,20 +71,27 @@
           <div>{{ row.appType === 1 ? "推荐应用" : "必装应用" }}</div>
         </template>
         <template slot-scope="{ row }" slot="enabled">
-          <div v-if="row.belong === 1">
+          <div
+            v-if="
+              row.createid === userInfo.adminid ||
+              row.schoolid === powerParams.objectid
+            "
+          >
+            <i-switch
+              v-if="row.belong === 2"
+              size="large"
+              v-model="row.enabled"
+              :true-value="1"
+              :false-value="2"
+              @on-change="enabledChange(row)"
+            >
+              <span slot="open">启用</span>
+              <span slot="close">禁用</span>
+            </i-switch>
+          </div>
+          <div v-else>
             {{ row.enabled === 1 ? "启用" : "禁用" }}
           </div>
-          <i-switch
-            v-if="row.belong === 2"
-            size="large"
-            v-model="row.enabled"
-            :true-value="1"
-            :false-value="2"
-            @on-change="enabledChange(row)"
-          >
-            <span slot="open">启用</span>
-            <span slot="close">禁用</span>
-          </i-switch>
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
@@ -107,8 +114,23 @@
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div v-if="row.belong === 2" @click="toEdit(row)">编辑</div>
-            <div v-if="row.belong === 2" class="action_del" @click="toDel(row)">
+            <div
+              v-if="
+                row.createid === userInfo.adminid ||
+                row.schoolid === powerParams.objectid
+              "
+              @click="toEdit(row)"
+            >
+              编辑
+            </div>
+            <div
+              v-if="
+                row.createid === userInfo.adminid ||
+                row.schoolid === powerParams.objectid
+              "
+              class="action_del"
+              @click="toDel(row)"
+            >
               删除
             </div>
           </div>