Merge branch 'V0.0.8' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.8

src/components/orgSelect/index.vue

@@ -14,7 +14,7 @@
     </div>
 
 
-    <el-dialog
+    <DialogCom
       :title="title"
       :visible.sync="visible"
       width="80%"
@@ -186,7 +186,7 @@
       <el-button @click="visible = false">关闭</el-button>
       <el-button type="primary" @click="onOK">确定</el-button>
     </span>
-    </el-dialog>
+    </DialogCom>
 
 
   </div>

src/views/core/reportForms/serviceBankReport.vue

@@ -1,118 +1,105 @@
 <template>
-    <div class="app-container">
-      <div class="main-search-box">
-          <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
-          v-show="showSearch">
+  <div class="app-container">
+    <div class="main-search-box">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true"
+               v-show="showSearch">
+        <el-form-item label="组织机构">
+          <org-tree
+            v-model="queryParams.orgId"
+            @defaultOrg="getDefaultOrg"
+            @checkChange="checkChange"
+            @click="clickTreeNode"
+            hangsheTree
+            ref="orgTree"
+            :showCheckSub="false"
+          ></org-tree>
+        </el-form-item>
 
-            <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
-            <tree-select
-              v-model="queryParams.orgId"
-              :options="deptOptions"
-              :show-count="true"
-              :normalizer="tenantIdnormalizer"
-              :props="{ checkStrictly: true, label: 'name' }"
-              placeholder="请选择归属机构"
-              clearValueText="清除"
-              :noChildrenText="''"
-              noOptionsText="没有数据"
-              noResultsText="没有搜索结果"
-            />
-          </el-form-item> -->
-          <el-form-item label="组织机构">
-                  <org-tree
-                    v-model="queryParams.orgId"
-                    @defaultOrg="getDefaultOrg"
-                    @checkChange="checkChange"
-                    @click="clickTreeNode"
-                    hangsheTree
-                  ref="orgTree"
-                  :showCheckSub="false"
-                  ></org-tree>
-              </el-form-item>
+        <el-form-item label="时间" prop="searchTime">
+          <el-date-picker value-format='yyyy-MM' v-model="queryParams.searchTime"
+                          align="right" type="month" placeholder="请选择查询时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
 
-              <el-form-item label="时间" prop="searchTime">
-              <el-date-picker   value-format='yyyy-MM' v-model="queryParams.searchTime"
-                                align="right" type="month" placeholder="请选择查询时间">
-                </el-date-picker>
-              </el-form-item>
-          </el-form>
+      <el-row :gutter="10">
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                     v-hasPermi="['core:resumptionReport:export']">导出数据
+          </el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:resumptionReport:export']">导出数据
-              </el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </el-row>
-
-          </div>
-      <div class="main-search-box" style="margin-bottom: 0;">
-        <h1 style="text-align:center;">{{ this.title}}</h1>
-      </div>
+    </div>
+    <div class="main-search-box" style="margin-bottom: 0;">
+      <h1 style="text-align:center;">{{ this.title }}</h1>
+    </div>
 
-      <el-table
-            border
-            height="616"
-            size="small"
-            v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      height="616"
+      size="small"
+      v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
 
-            <el-table-column label="序号" align="center" min-width="50">
-              <template v-slot:default="scope">
-                <span v-text="getPageIndex(scope.$index)"> </span>
-              </template>
-            </el-table-column>
-            <el-table-column label="地区" align="center" prop="city" />
-            <el-table-column label="单位名称" align="center" prop="orgName" width="340"/>
-            <el-table-column label="网点数量" align="center" prop="networkNumber"/>
-            <el-table-column label="应履职次数" align="center" prop="planNumber"/>
-            <el-table-column label="已履职次数" align="center" prop="realityNumber"/>
-            <el-table-column label="履职完成率" align="center" prop="realityRate"/>
-            <el-table-column label="隐患数量" align="center" prop="abnormalNumber"/>
-            <el-table-column label="已整改数量" align="center" prop="realityRectificationNumber"/>
-            <el-table-column label="整改完成率" align="center" prop="realityRectificationRate"/>
-          </el-table>
-          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                      :limit.sync="queryParams.pageSize"
-                      @pagination="getList"/>
+      <el-table-column label="序号" align="center" min-width="50">
+        <template v-slot:default="scope">
+          <span v-text="getPageIndex(scope.$index)"> </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="地区" align="center" prop="city"/>
+      <el-table-column label="单位名称" align="center" prop="orgName" width="280"/>
+      <el-table-column v-if="!showLhOrgName" label="离行式机构数量" align="center" prop="networkNumber"/>
+      <el-table-column v-if="showLhOrgName" label="离行式机构名称" align="center" prop="lhOrgName"/>
+      <el-table-column label="应履职次数" align="center" prop="planNumber"/>
+      <el-table-column label="已履职次数" align="center" prop="realityNumber"/>
+      <el-table-column label="履职完成率" align="center" prop="realityRate"/>
+      <el-table-column label="隐患数量" align="center" prop="abnormalNumber"/>
+      <el-table-column label="已整改数量" align="center" prop="realityRectificationNumber"/>
+      <el-table-column label="整改完成率" align="center" prop="realityRectificationRate"/>
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
 
-    </div>
-  </template>
+  </div>
+</template>
 
-  <script>
-  import {mapGetters} from "vuex";
-    import tableList from '@/mixins/tableList'
-    import {listServiceBankReport} from "@/api/core/reportForms/resumptionReport";
-    import treeselect from '@riophae/vue-treeselect'
-    import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-    import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
-       //import orgTree from "@/components/orgTree";
+<script>
+import {mapGetters} from "vuex";
+import tableList from '@/mixins/tableList'
+import {listServiceBankReport} from "@/api/core/reportForms/resumptionReport";
+import treeselect from '@riophae/vue-treeselect'
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {deptTreeSelect, businessTreeSelect} from "@/api/system/public";
+//import orgTree from "@/components/orgTree";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
-    import { defineComponent } from 'vue';
+import {defineComponent} from 'vue';
+
 export default {
-  dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
+  dicts: ['sys_normal_disable', 'sys_org_type', 'repot_cycle'],
   name: "Check",
 
   /** 引入基础minxins*/
   mixins: [tableList],
 
-  components: {treeselect,OrgTree},
+  components: {treeselect, OrgTree},
 
   data() {
     return {
-        startDatepickerOptions: {
-    disabledDate(time) {
-      const date = new Date();
-      date.setTime(date.getTime());
-      return time.getTime() < date;
-    },
-  },
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime());
+          return time.getTime() < date;
+        },
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -128,10 +115,8 @@ export default {
       showSearch: true,
       //区域
       roleOptions: [],
-       //全部检查机构
-  orgOptions: [],
-      //搜索tree
-      deptName: null,
+      //全部检查机构
+      orgOptions: [],
       // 部门树选项
       deptOptions: [],
       // 总条数
@@ -144,6 +129,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      showLhOrgName: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -151,15 +137,12 @@ export default {
         checkName: null,
         areaId: null,
         orgId: null,
-        searchTime:new Date()
+        searchTime: new Date()
       },
-      orgName:null,
+      orgName: null,
       // 表单参数
       form: {},
       // 表单校验
-      checkList: [],
-      roleOptions: [],
-      defaultKeys: [],
       //是否关联下级
       checked: false,
       defaultProps: {
@@ -191,8 +174,7 @@ export default {
   },
 
   created() {
-   // this.getDeptTree();
-  this. getList();
+    this.getList();
   },
   computed: {
     ...mapGetters(["orgId"]),
@@ -201,35 +183,46 @@ export default {
     getDefaultOrg(node) {
       this.queryParams.orgId = node.id;
       this.selectedOrgName = node.shortName;
+      this.checkIsShowOrgName(node);
       this.getList();
     },
-        //单选框状态改变
-        checkChange(state) {
+    //单选框状态改变
+    checkChange(state) {
       this.queryParams.checkSub = state;
       this.getList();
     },
-            // 节点单击事件
-            clickTreeNode(data) {
-      if(data==null){
+    // 节点单击事件
+    clickTreeNode(data) {
+      if (data == null) {
         return;
       }
+      this.checkIsShowOrgName(data);
       this.queryParams.orgId = data.id;
       this.selectedOrgName = data.shortName;
       this.getList();
     },
+    //根据选中机构来决定列表展示机构名称还是机构数量
+    checkIsShowOrgName(org) {
+      if (org.type < 3 || org.type == 9) {
+        this.showLhOrgName = false;
+      }
+      if (org.type == 3) {
+        this.showLhOrgName = true;
+      }
+    },
 
 
     /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
-  if (node.children && !node.children.length) {
-    delete node.children;
-  }
-  return {
-    id: node.id,
-    label: node.shortName,
-    children: node.children,
-  };
-},
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.shortName,
+        children: node.children,
+      };
+    },
     getPageIndex($index) {
       //表格序号
       return (
@@ -237,26 +230,26 @@ export default {
       );
     },
     handleExport() {
-  this.download('core/resumptionReport/serviceBankExport', {
-    ...this.queryParams
-  }, `${this.orgName+'-离行式自助银行巡检情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
-},
+      this.download('core/resumptionReport/serviceBankExport', {
+        ...this.queryParams
+      }, `${this.orgName + '-离行式自助银行巡检情况表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+    },
 
 
     getList() {
       this.loading = true;
       listServiceBankReport(this.queryParams).then(response => {
         this.checkList = response.data;
-        this.title=response.title;
-        this.orgName=response.orgName;
+        this.title = response.title;
+        this.orgName = response.orgName;
         this.loading = false;
       });
     },
     getAllOrg() {
       selectAllOrg().then(response => {
-    this.orgOptions = response.data;
-  })
-},
+        this.orgOptions = response.data;
+      })
+    },
 
 
     // 取消按钮
@@ -288,9 +281,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.orgId=this.orgId;
+      this.queryParams.orgId = this.orgId;
       this.handleQuery();
-    //  this.getDeptTree();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -305,9 +297,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep.formTreeItem {
-    .el-form-item__content {
-      width: 264px;
-    }
+::v-deep.formTreeItem {
+  .el-form-item__content {
+    width: 264px;
   }
-  </style>
+}
+</style>

src/views/iot/videoDiagnosis/index.vue

@@ -145,15 +145,15 @@
           align="center"
           label="组织机构"
           prop="orgName"
-          min-width="200"
+          min-width="160"
         ></el-table-column>
         <!--        <el-table-column :show-overflow-tooltip="true" align="center" label="设备名称" prop="reasons"/>-->
-        <!-- <el-table-column
+         <el-table-column
           :show-overflow-tooltip="true"
           align="center"
           label="主机名称"
           prop="hostName"
-        ></el-table-column> -->
+        ></el-table-column>
          <el-table-column
           :show-overflow-tooltip="true"
           align="center"

src/views/system/dept/extend.vue

@@ -222,7 +222,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item label="大堂式设备" 
+            <el-descriptions-item label="大堂式设备"
                                   labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="lobbyEquipment"
@@ -254,7 +254,7 @@
             </el-descriptions-item>
           </el-descriptions> -->
 
-          <el-descriptions class="margin-top" :column="3" v-if="type === org_type.yewd" size="medium" border>
+          <el-descriptions class="margin-top" :column="3" v-if="(type === org_type.yewd || type === org_type.zxywk)" size="medium" border>
             <el-descriptions-item label="是否设立网点业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-radio-group v-model="businessLibrary">
                 <el-radio :label="1">是</el-radio>
@@ -362,30 +362,31 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖摄像头总路数">
+            <el-descriptions-item v-if="type === org_type.jkzx" :contentStyle='contentStyle' :labelStyle='labelStyle'
+                                  labelClassName="info_label_required" label="可远程控制和实时授权出入口数量(离行式)">
               <el-input-number
-                v-model="totalCameraCount"
+                v-model="cashAddingRoomControlCount"
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
-                :max="999999"
+                :max="cashAddingRoom"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖高清摄像头路数">
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖摄像头总路数">
               <el-input-number
-                v-model="hdCameraCount"
+                v-model="totalCameraCount"
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
                 :max="999999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item label="出入口远程控制与授权"  v-if="(type === org_type.jkzx)" labelClassName="info_label_required" >
+<!--            <el-descriptions-item label="出入口远程控制与授权"  v-if="(type === org_type.jkzx)" labelClassName="info_label_required" >
               <el-radio-group v-model="remoteControl">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
-            </el-descriptions-item>
+            </el-descriptions-item>-->
             <el-descriptions-item label="业务库防控隔离门出入口数量" v-if="type === org_type.jkzx" labelClassName="info_label_required" >
               <el-input-number
                 v-model="remoteCount"
@@ -395,6 +396,24 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
+            <el-descriptions-item label="可远程控制和实时授权出入口数量(业务库)" v-if="type === org_type.jkzx" labelClassName="info_label_required" >
+              <el-input-number
+                v-model="remoteControlCount"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="remoteCount"
+              ></el-input-number>
+            </el-descriptions-item>
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖高清摄像头路数">
+              <el-input-number
+                v-model="hdCameraCount"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="999999"
+              ></el-input-number>
+            </el-descriptions-item>
           </el-descriptions>
 
         </div>
@@ -441,7 +460,7 @@
             clearable
           >
             <el-option
-              v-for="dict in getGA38TypeByOrgType"          
+              v-for="dict in getGA38TypeByOrgType"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -641,7 +660,9 @@ export default {
       outsideCount: 0,
       safeBox: null,
       remoteCount: 0,
+      remoteControlCount: 0,
       cashAddingRoom: 0,
+      cashAddingRoomControlCount: 0,
       type: null,
       isLock: null,
       dataInfo: [],
@@ -656,7 +677,7 @@ export default {
       businessLibrary: null,
       businessLibraryType: null,
       dutyMode: null,
-      remoteControl: null,
+      //remoteControl: null,
       selfServiceBank: null,
       lobbyEquipment: 0,
       wallPenetratingEquipment: 0,
@@ -771,14 +792,14 @@ export default {
     },
     getGA38TypeByOrgType() {
       let tempArry = [];
-     
+
         // 上传GA38的机构的机构类型是 营业网点
         if(this.type=="4")
         {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 1 || x.value == 2 || x.value == 5 || x.value == 6) {
               tempArry.push(x);
-            }  
+            }
           });
         }
         // 上传GA38的机构的机构类型是 离行自助银行
@@ -787,7 +808,7 @@ export default {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 3) {
               tempArry.push(x);
-            }  
+            }
           });
         }
         // 上传GA38的机构的机构类型是 中心业务库
@@ -796,7 +817,7 @@ export default {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 4) {
               tempArry.push(x);
-            }  
+            }
           });
         }
          // 上传GA38的机构的机构类型是 监控中心
@@ -805,13 +826,13 @@ export default {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 7) {
               tempArry.push(x);
-            }  
+            }
           });
         }
         else{
           tempArry=this.dict.type.org_extend_type;
         }
-       
+
       // console.log("computed getUserOrgType",tempArry);
       return tempArry;
     },
@@ -1021,14 +1042,16 @@ export default {
           this.innerCount = data.data.innerCount;
           this.outsideCount = data.data.outsideCount;
           this.cashAddingRoom = data.data.cashAddingRoom;
+          this.cashAddingRoomControlCount = data.data.cashAddingRoomControlCount;
           this.remoteCount = data.data.remoteCount;
+          this.remoteControlCount = data.data.remoteControlCount;
           this.orgType = data.data.orgType;
           this.weatherAreaCode = data.data.weatherAreaCode;
           this.premisesArea = data.data.premisesArea;
           this.ownership = data.data.ownership;
           this.outsideArea = data.data.outsideArea;
           this.askari = data.data.askari;
-          this.remoteControl = data.data.remoteControl;
+          //this.remoteControl = data.data.remoteControl;
           this.selfServiceBank = data.data.selfServiceBank;
           this.businessLibrary = data.data.businessLibrary;
           this.lobbyEquipment = data.data.lobbyEquipment;
@@ -1554,8 +1577,10 @@ export default {
         innerCount: this.innerCount,
         outsideCount: this.outsideCount,
         cashAddingRoom: this.cashAddingRoom,
+        cashAddingRoomControlCount: this.cashAddingRoomControlCount,
         orgType: this.orgType,
         remoteCount: this.remoteCount,
+        remoteControlCount: this.remoteControlCount,
         weatherAreaCode: this.weatherAreaCode,
         askariCertificate:this.askariCertificate,
           // this.imgs.length > 0
@@ -1567,7 +1592,7 @@ export default {
         askari: this.askari ? 1 : 0,
         businessLibraryType: this.businessLibraryType,
         dutyMode: this.dutyMode,
-        remoteControl: this.remoteControl ? 1 : 0,
+        //remoteControl: this.remoteControl ? 1 : 0,
         selfServiceBank: this.selfServiceBank ? 1 : 0,
         businessLibrary: this.businessLibrary ? 1 : 0,
         lobbyEquipment: this.lobbyEquipment,
@@ -1632,26 +1657,34 @@ export default {
         this.$modal.msgError("大堂设备数量不能为空，请输入大堂设备数量");
         return false;
       }
-      if (this.type === this.org_type.yewd &&this.businessLibrary==null) {
+      if ((this.type === this.org_type.yewd || this.type === this.org_type.zxywk) &&this.businessLibrary==null) {
         this.$modal.msgError("是否设立网点业务库不能为空，请设置是否设立网点业务库");
         return false;
       }
-      if (this.type === this.org_type.yewd && this.businessLibrary===1&&this.businessLibraryType==null) {
+      if ((this.type === this.org_type.yewd || this.type === this.org_type.zxywk) && this.businessLibrary===1&&this.businessLibraryType==null) {
         this.$modal.msgError("业务库类型不能为空，请选择业务库类型");
         return false;
       }
-      if ((this.type === this.org_type.jkzx)&&this.businessLibrary===1&&this.remoteControl==null) {
-        this.$modal.msgError("出入口远程控制与授权不能为空，请选择出入口远程控制与授权");
-        return false;
-      }
+      // if ((this.type === this.org_type.jkzx)&&this.businessLibrary===1&&this.remoteControl==null) {
+      //   this.$modal.msgError("出入口远程控制与授权不能为空，请选择出入口远程控制与授权");
+      //   return false;
+      // }
       if ((this.type === this.org_type.jkzx)&&this.cashAddingRoom==null) {
         this.$modal.msgError("离行式加钞间出入口数量不能为空，请输入离行式加钞间出入口数量");
         return false;
       }
+      if ((this.type === this.org_type.jkzx)&&this.cashAddingRoomControlCount==null) {
+        this.$modal.msgError("可远程控制和实时授权出入口数量(离行式)不能为空，请输入可远程控制和实时授权出入口数量(离行式)");
+        return false;
+      }
       if ((this.type === this.org_type.jkzx || this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&&this.businessLibrary==1&&this.remoteCount==null) {
         this.$modal.msgError("业务库防控隔离门出入口数量不能为空，请输入业务库防控隔离门出入口数量");
         return false;
       }
+      if ((this.type === this.org_type.jkzx || this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&&this.businessLibrary==1&&this.remoteControlCount==null) {
+        this.$modal.msgError("可远程控制和实时授权出入口数量(业务库)不能为空，请输入可远程控制和实时授权出入口数量(业务库)");
+        return false;
+      }
       if ((this.type === this.org_type.yewd)&&this.askari==null) {
         this.$modal.msgError("是否配备保安人员不能为空，请选择是否配备保安人员");
         return false;
@@ -1713,7 +1746,7 @@ export default {
 <style scoped lang="scss">
 
 
- 
+
 
 /*.org-extend{
   background-color: #fff;

src/views/system/version/index.vue

@@ -111,9 +111,9 @@
 			<el-input v-model="form.version" :maxlength="50" placeholder="请输入版本"/>
 			</el-form-item>
 
-			<el-form-item label="类型" prop="type">
+			<el-form-item label="平台" prop="type">
 			<el-select v-model="form.type"
-						placeholder="请选择类型"
+						placeholder="请选择平台"
 						@change="selectedType()"
 						style="width: 100%">
 				<el-option
@@ -141,7 +141,7 @@
                 :limit="1"
                 :fileType="['apk']"
                 :packageName="packageNameList"
-				:fileSize="50"
+				        :fileSize="200"
                 @input="fileListChanged"
               />
             </el-form-item>
@@ -223,7 +223,7 @@
         {validator: validatorVersion, trigger: "blur"}
         ],
         type: [
-        {required: true, message: "请选择机构类型", trigger: "blur"}
+        {required: true, message: "请选择平台", trigger: "blur"}
         ],
         isUse: [
         {required: true, message: "请输入使用", trigger: "blur"}