Merge remote-tracking branch 'origin/gzb' into wzl

src/views/regionSection/applicationManage/applicationManage.vue

@@ -70,23 +70,14 @@
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
-            <div class="action_success">
-              {{ row.whited === 1 ? "是" : "否" }}
-            </div>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="trusted">
-          <div class="action_list">
-            <div class="action_error">
-              {{ row.trusted === 1 ? "是" : "否" }}
-            </div>
+            <div v-if="row.whited === 1" class="action_success">是</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="showico">
           <div class="action_list">
-            <div class="action_success">
-              {{ row.showico === 1 ? "是" : "否" }}
-            </div>
+            <div v-if="row.showico === 1" class="action_success">是</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="countSlot">
@@ -245,24 +236,13 @@
               <span>选择白名单例外则该应用访问网络不受网址白名单限制。</span>
             </div>
           </FormItem>
-          <FormItem label="可信任" style="width: 100%">
-            <div class="comm">
-              <RadioGroup v-model="wallpaperInfo.trusted">
-                <Radio :label="1">是</Radio>
-                <Radio :label="0">否</Radio>
-              </RadioGroup>
-              <span
-                >选择可信任时，应用申请权限不需要用户确认，防止用户取消。</span
-              >
-            </div>
-          </FormItem>
           <FormItem label="显示图标" style="width: 100%">
             <div class="comm">
               <RadioGroup v-model="wallpaperInfo.showico">
                 <Radio :label="1">是</Radio>
                 <Radio :label="0">否</Radio>
               </RadioGroup>
-              <span>显示图标时，设备安装应用后，桌面不显示应用图标。</span>
+              <span>显示图标时，设备安装应用后，桌面显示应用图标。</span>
             </div>
           </FormItem>
           <FormItem label="允许清空缓存" style="width: 100%">
@@ -610,10 +590,10 @@
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
             </div>
             <div class="view_item">
-              <span>可信任</span>{{ viewInfo.trusted === 0 ? "否" : "是" }}
+              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
             </div>
             <div class="view_item">
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
+              <span>应用大小</span>{{ viewInfo.appSize }}
             </div>
           </div>
           <div class="view_comm">
@@ -621,12 +601,10 @@
               <span>应用属性</span
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
             </div>
-            <div class="view_item">
-              <span>应用大小</span>{{ viewInfo.appSize }}
-            </div>
-            <div class="view_item">
+            <div class="view_item" style="width: 50%">
               <span>应用包名</span>{{ viewInfo.appPackage }}
             </div>
+            <div class="view_item"></div>
           </div>
           <div class="view_comm">
             <div class="view_item">
@@ -774,8 +752,7 @@ export default {
         appType: 1,
         forced: 0,
         whited: 1,
-        trusted: 1,
-        showico: 0,
+        showico: 1,
         cached: 1,
         strategy: 1,
         apkPath: "",
@@ -801,7 +778,6 @@ export default {
         appType: 1,
         forced: 1,
         whited: 1,
-        trusted: 1,
         showico: 1,
         cached: 1,
         strategy: 1,
@@ -949,11 +925,6 @@ export default {
           align: "center",
           width: 140
         },
-        {
-          title: "可信任",
-          slot: "trusted",
-          align: "center"
-        },
         {
           title: "操作时间",
           key: "updatetime",
@@ -1026,7 +997,6 @@ export default {
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
-            trusted: res.obj.trusted,
             showico: res.obj.showico,
             cached: res.obj.cached,
             strategy: res.obj.strategy,
@@ -1463,8 +1433,7 @@ export default {
         appType: 1,
         forced: 0,
         whited: 1,
-        trusted: 1,
-        showico: 0,
+        showico: 1,
         cached: 1,
         strategy: 1,
         apkPath: "",
@@ -1540,7 +1509,6 @@ export default {
             appType: this.wallpaperInfo.appType,
             forced: this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
-            trusted: this.wallpaperInfo.trusted,
             showico: this.wallpaperInfo.showico,
             strategy: this.wallpaperInfo.strategy,
             cached: this.wallpaperInfo.cached,
@@ -1620,7 +1588,6 @@ export default {
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
-            trusted: res.obj.trusted,
             showico: res.obj.showico,
             cached: res.obj.cached,
             strategy: res.obj.strategy,

src/views/regionSection/search/allApps.vue

@@ -44,7 +44,7 @@
           </div>
           <i-switch
             size="large"
-            v-if="row.belong === 1"
+            v-if="row.belong === 2"
             v-model="row.enabled"
             :true-value="1"
             :false-value="2"
@@ -56,23 +56,14 @@
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
-            <div class="action_success">
-              {{ row.whited === 1 ? "是" : "否" }}
-            </div>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="trusted">
-          <div class="action_list">
-            <div class="action_error">
-              {{ row.trusted === 1 ? "是" : "否" }}
-            </div>
+            <div v-if="row.whited === 1" class="action_success">是</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="showico">
           <div class="action_list">
-            <div class="action_success">
-              {{ row.showico === 1 ? "是" : "否" }}
-            </div>
+            <div v-if="row.showico === 1" class="action_success">是</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
 
@@ -254,168 +245,22 @@
             <div class="view_item">
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
             </div>
-            <div class="view_item">
-              <span>可信任</span>{{ viewInfo.trusted === 0 ? "否" : "是" }}
-            </div>
             <div class="view_item">
               <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
             </div>
-          </div>
-          <div class="view_comm">
-            <div class="view_item">
-              <span>应用属性</span
-              >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
-            </div>
             <div class="view_item">
               <span>应用大小</span>{{ viewInfo.appSize }}
             </div>
-            <div class="view_item">
-              <span>应用包名</span>{{ viewInfo.appPackage }}
-            </div>
-          </div>
-          <div class="view_comm">
-            <div class="view_item">
-              <span style="width: 120px">网址白名单例外</span
-              >{{ viewInfo.whited === 0 ? "否" : "是" }}
-            </div>
-            <div class="view_item">
-              <span style="width: 120px">允许清空缓存</span
-              >{{ viewInfo.cached === 0 ? "否" : "是" }}
-            </div>
-            <div class="view_item">
-              <span style="width: 120px">添加到已有策略</span
-              >{{ viewInfo.strategy === 0 ? "否" : "是" }}
-            </div>
-          </div>
-          <div class="view_com">
-            <div class="view_t">应用截图</div>
-            <div class="view_img">
-              <img
-                v-for="img in viewInfo.appImg"
-                :key="img"
-                :src="$api.showImageUrl + img"
-              />
-            </div>
-          </div>
-          <div class="view_com">
-            <div class="view_t">应用简介</div>
-            <div>{{ viewInfo.appAbbr }}</div>
-          </div>
-          <div class="view_com">
-            <div class="view_t">更新</div>
-            <div>{{ viewInfo.appRenew }}</div>
-          </div>
-          <div class="view_com">
-            <div class="view_t">授权型号</div>
-            <div class="view_devices">
-              <div
-                class="view_list"
-                v-for="item in viewInfo.devices"
-                :key="item.dgroupid"
-              >
-                <div class="dgname" style="line-height: 40px">
-                  {{ item.dgname }}
-                </div>
-                <div class="devices">
-                  <span v-for="sitem in item.devices" :key="sitem.deviceid">{{
-                    sitem.deviceModel
-                  }}</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="view_com">
-            <div class="view_t">选择学校</div>
-            <div class="view_devices">
-              <div class="devices">
-                <span v-for="item in viewInfo.schools" :key="item.schoolid">{{
-                  item.schoolName
-                }}</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div slot="footer" style="text-align: center">
-        <Button @click="viewInfo.show = false">关闭</Button>
-      </div>
-    </Modal>
-    <!-- 查看 -->
-    <Modal
-      class="modal1"
-      :mask-closable="false"
-      v-model="viewInfo.show"
-      title="查看"
-    >
-      <div class="view_conten" v-if="viewInfo.show">
-        <div class="view_logo">
-          <div>
-            <img
-              v-if="viewInfo.appIcon"
-              :src="$api.showImageUrl + viewInfo.appIcon"
-            />
-          </div>
-          <div class="appIcon" @click="download(viewInfo.appIcon)">
-            <Icon type="md-download" />下载
-          </div>
-        </div>
-        <div class="view_conter">
-          <div class="view_comm">
-            <div class="view_titles">
-              {{ viewInfo.appName
-              }}<span v-if="viewInfo.enabled === 1" class="qy">启用</span>
-            </div>
-            <div class="view_item">
-              <span>版本号码</span>
-              <Select
-                :transfer="true"
-                v-model="viewInfo.versionName"
-                @on-change="viewInfoChange()"
-                style="width: 120px"
-              >
-                <Option
-                  v-for="item in viewInfo.apphistorys"
-                  :value="item.versionName"
-                  :key="item.versionName"
-                  >{{ item.versionName }}</Option
-                >
-              </Select>
-            </div>
-          </div>
-          <div class="view_comm">
-            <div class="view_item">
-              <span>版本名称</span>{{ viewInfo.versionName }}
-            </div>
-            <div class="view_item">
-              <span>分组</span>{{ viewInfo.appgroupName }}
-            </div>
-            <div class="view_item">
-              <span>开发者</span>{{ viewInfo.appDeveloper }}
-            </div>
-          </div>
-          <div class="view_comm">
-            <div class="view_item">
-              <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
-            </div>
-            <div class="view_item">
-              <span>可信任</span>{{ viewInfo.trusted === 0 ? "否" : "是" }}
-            </div>
-            <div class="view_item">
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
-            </div>
           </div>
           <div class="view_comm">
             <div class="view_item">
               <span>应用属性</span
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
             </div>
-            <div class="view_item">
-              <span>应用大小</span>{{ viewInfo.appSize }}
-            </div>
-            <div class="view_item">
+            <div class="view_item" style="width: 50%">
               <span>应用包名</span>{{ viewInfo.appPackage }}
             </div>
+            <div class="view_item"></div>
           </div>
           <div class="view_comm">
             <div class="view_item">
@@ -526,7 +371,6 @@ export default {
         appType: 1,
         forced: 1,
         whited: 1,
-        trusted: 1,
         showico: 1,
         cached: 1,
         strategy: 1,
@@ -846,7 +690,6 @@ export default {
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
-            trusted: res.obj.trusted,
             showico: res.obj.showico,
             cached: res.obj.cached,
             strategy: res.obj.strategy,
@@ -864,6 +707,7 @@ export default {
             devices: res.obj.devices,
             schools: res.obj.schools
           };
+          console.log(this.viewInfo)
         } else {
           this.$Message.error(res.msg);
         }

src/views/schoolSection/applicationManage/applicationList.vue

@@ -86,23 +86,14 @@
         </template>
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
-            <div class="action_success">
-              {{ row.whited === 1 ? "是" : "否" }}
-            </div>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="trusted">
-          <div class="action_list">
-            <div class="action_error">
-              {{ row.trusted === 1 ? "是" : "否" }}
-            </div>
+            <div v-if="row.whited === 1" class="action_success">是</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="showico">
           <div class="action_list">
-            <div class="action_success">
-              {{ row.showico === 1 ? "是" : "否" }}
-            </div>
+            <div v-if="row.showico === 1" class="action_success">是</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="countSlot">
@@ -224,24 +215,13 @@
               <span>选择白名单例外则该应用访问网络不受网址白名单限制。</span>
             </div>
           </FormItem>
-          <FormItem label="可信任" style="width: 100%">
-            <div class="comm">
-              <RadioGroup v-model="wallpaperInfo.trusted">
-                <Radio :label="1">是</Radio>
-                <Radio :label="0">否</Radio>
-              </RadioGroup>
-              <span
-                >选择可信任时，应用申请权限不需要用户确认，防止用户取消。</span
-              >
-            </div>
-          </FormItem>
           <FormItem label="显示图标" style="width: 100%">
             <div class="comm">
               <RadioGroup v-model="wallpaperInfo.showico">
                 <Radio :label="1">是</Radio>
                 <Radio :label="0">否</Radio>
               </RadioGroup>
-              <span>显示图标时，设备安装应用后，桌面不显示应用图标。</span>
+              <span>显示图标时，设备安装应用后，桌面显示应用图标。</span>
             </div>
           </FormItem>
           <FormItem label="允许清空缓存" style="width: 100%">
@@ -544,10 +524,10 @@
               <span>强制安装</span>{{ viewInfo.forced === 0 ? "否" : "是" }}
             </div>
             <div class="view_item">
-              <span>可信任</span>{{ viewInfo.trusted === 0 ? "否" : "是" }}
+              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
             </div>
             <div class="view_item">
-              <span>显示图标</span>{{ viewInfo.showico === 0 ? "否" : "是" }}
+              <span>应用大小</span>{{ viewInfo.appSize }}
             </div>
           </div>
           <div class="view_comm">
@@ -555,12 +535,10 @@
               <span>应用属性</span
               >{{ viewInfo.appType === 1 ? "推荐应用" : "必装应用" }}
             </div>
-            <div class="view_item">
-              <span>应用大小</span>{{ viewInfo.appSize }}
-            </div>
-            <div class="view_item">
+            <div class="view_item" style="width: 50%">
               <span>应用包名</span>{{ viewInfo.appPackage }}
             </div>
+            <div class="view_item"></div>
           </div>
           <div class="view_comm">
             <div class="view_item">
@@ -741,8 +719,7 @@ export default {
         appType: 1,
         forced: 0,
         whited: 1,
-        trusted: 1,
-        showico: 0,
+        showico: 1,
         cached: 1,
         strategy: 1,
         apkPath: "",
@@ -768,7 +745,6 @@ export default {
         appType: 1,
         forced: 1,
         whited: 1,
-        trusted: 1,
         showico: 1,
         cached: 1,
         strategy: 1,
@@ -916,11 +892,6 @@ export default {
           align: "center",
           width: 140
         },
-        {
-          title: "可信任",
-          slot: "trusted",
-          align: "center"
-        },
         {
           title: "操作时间",
           key: "updatetime",
@@ -993,7 +964,6 @@ export default {
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
-            trusted: res.obj.trusted,
             showico: res.obj.showico,
             cached: res.obj.cached,
             strategy: res.obj.strategy,
@@ -1373,8 +1343,7 @@ export default {
         appType: 1,
         forced: 0,
         whited: 1,
-        trusted: 1,
-        showico: 0,
+        showico: 1,
         cached: 1,
         strategy: 1,
         apkPath: "",
@@ -1433,7 +1402,6 @@ export default {
             appType: this.wallpaperInfo.appType,
             forced: this.wallpaperInfo.forced,
             whited: this.wallpaperInfo.whited,
-            trusted: this.wallpaperInfo.trusted,
             showico: this.wallpaperInfo.showico,
             strategy: this.wallpaperInfo.strategy,
             cached: this.wallpaperInfo.cached,
@@ -1492,7 +1460,6 @@ export default {
             appType: res.obj.appType,
             forced: res.obj.forced,
             whited: res.obj.whited,
-            trusted: res.obj.trusted,
             showico: res.obj.showico,
             cached: res.obj.cached,
             strategy: res.obj.strategy,