merge

src/page/STB/appversion/index.vue

@@ -22,7 +22,7 @@
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
         <span class="page-tips"
-          >可查看系统使用过的所有app版本信息，可设置其中一个版本为当前使用版本。可产看安装包详情信息。可上传新的安装包，“*”为必填项。</span
+          >可查看系统使用过的所有app版本信息，可设置其中一个版本为当前使用版本。可查看安装包详情信息。可上传新的安装包，“*”为必填项。</span
         >
       </div>
     </div>

src/page/STB/base/index.vue

@@ -14,6 +14,7 @@
         </el-form-item>
         <el-form-item>
           <el-cascader
+            placeholder="请选择区域"
             v-model="form.areaId"
             :options="areaOptions"
             :props="defaultProps"

src/page/STB/operation/index.vue

@@ -24,6 +24,7 @@
         </el-form-item>
         <el-form-item>
           <el-cascader
+            placeholder="请选择区域"
             v-model="form.areaId"
             :options="areaOptions"
             :props="defaultProps"

src/page/accounts/checkDialog/reject.vue

@@ -38,12 +38,13 @@ export default {
       form: {
         status: "REFUSED",
         remarks: "",
-        type:"ACCOUNT",
+        type: "ACCOUNT",
       },
-      activeRow:{},
+      activeRow: {},
       rules: {
         remarks: [
           { required: true, message: "请填写驳回原因", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到100个字" },
         ],
       },
     };

src/page/accounts/dbUnitDialog/edit.vue

 <template>
   <el-dialog
     custom-class="party-dialog"
-    :title="`管理员${isEdit?'修改':'查看'}`"
+    :title="`管理员${isEdit ? '修改' : '查看'}`"
     :visible.sync="dialogVisible"
     width="468px"
     :before-close="handleClose"
@@ -19,6 +19,7 @@
           <el-input
             v-model="form.userName"
             placeholder="请填写管理员姓名"
+            oninput="value = value.trim()"
             :readonly="!isEdit"
           ></el-input>
         </el-form-item>
@@ -58,7 +59,9 @@
         <el-button type="primary" @click="handleSubmit()">确 定</el-button>
       </div>
       <div v-else>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
       </div>
     </div>
   </el-dialog>
@@ -90,12 +93,13 @@ export default {
         phone: "",
         weChat: "",
         email: "",
-        roleList:[],
+        roleList: [],
         type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
       },
       rules: {
         userName: [
           { required: true, message: "请选择系统用户名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         phone: [
           { required: true, validator: validateMobilePhone, trigger: "change" },
@@ -156,9 +160,9 @@ export default {
         phone: "",
         weChat: "",
         email: "",
-        roleList:[],
+        roleList: [],
         type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
-      }
+      };
     },
     // 提交
     handleSubmit() {
@@ -174,7 +178,7 @@ export default {
           user.email = _this.form.email;
           user.id = _this.id;
           user.type = this.form.type;
-          user.roleList = this.form.roleList
+          user.roleList = this.form.roleList;
           this.$https(
             {
               method: "put",
@@ -210,7 +214,7 @@ export default {
         }
       });
     },
-  }
+  },
 };
 </script>
 <style lang="less" scoped>

src/page/accounts/statisticalDialog/add.vue

@@ -19,6 +19,7 @@
           <el-input
             v-model="form.userName"
             placeholder="请输入用户名"
+            oninput="value = value.trim()"
           ></el-input>
         </el-form-item>
         <el-form-item label="所在机构" prop="orgId">
@@ -74,6 +75,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请填写管理员姓名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         orgId: [
           { required: true, message: "请输入所在机构", trigger: "change" },
@@ -129,7 +131,7 @@ export default {
           user.permanent = this.form.permanent;
           user.userName = this.form.userName;
           user.orgId = this.form.orgId;
-           let requetsparams = this.$qs.stringify(user)
+          let requetsparams = this.$qs.stringify(user);
           this.$https(
             {
               method: "post",
@@ -167,5 +169,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-
 </style>
\ No newline at end of file

src/page/accounts/statisticalDialog/edit.vue

@@ -19,6 +19,7 @@
           <el-input
             v-model="form.userName"
             placeholder="请输入用户名"
+            oninput="value = value.trim()"
           ></el-input>
         </el-form-item>
         <el-form-item label="所在机构" prop="orgId">
@@ -76,6 +77,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请填写管理员姓名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字符" },
         ],
         orgId: [
           { required: true, message: "请输入所在机构", trigger: "change" },

src/page/accounts/stbDialog/add.vue

@@ -16,7 +16,11 @@
         class="party-form"
       >
         <el-form-item label="运维人员姓名" prop="userName">
-            <el-input v-model="form.userName" placeholder="请填写"></el-input>
+          <el-input
+            v-model="form.userName"
+            placeholder="请填写"
+            oninput="value = value.trim()"
+          ></el-input>
         </el-form-item>
         <el-form-item label="运维区域" prop="areaId">
           <el-cascader
@@ -79,6 +83,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请运维人员姓名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" }
         ],
         areaId: [
           {
@@ -129,12 +134,12 @@ export default {
         permanent: true,
         date: "",
         type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
-      }
+      };
     },
     // 提交
     handleSubmit() {
       // 校验用户输入值
-      let _this = this
+      let _this = this;
       this.$refs.form.validate((valid) => {
         if (valid) {
           let user = {};
@@ -150,7 +155,7 @@ export default {
           user.areaId = [...this.form.areaId].pop();
           user.permanent = this.form.permanent;
           user.type = this.form.type;
-          let requetsparams = this.$qs.stringify(user)
+          let requetsparams = this.$qs.stringify(user);
           this.$https(
             {
               method: "post",
@@ -188,5 +193,4 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-
 </style>
\ No newline at end of file

src/page/accounts/stbDialog/edit.vue

@@ -16,7 +16,7 @@
         class="party-form"
       >
         <el-form-item label="运维人员姓名" prop="userName">
-          <el-input v-model="form.userName" placeholder="请填写"></el-input>
+          <el-input v-model="form.userName" placeholder="请填写"  oninput="value = value.trim()"></el-input>
         </el-form-item>
         <el-form-item label="运维区域" prop="areaId">
           <el-cascader
@@ -81,6 +81,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请运维人员姓名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" }
         ],
         areaId: [
           {

src/page/accounts/unitAdminDialog/add.vue

@@ -21,6 +21,7 @@
               <el-input
                 v-model="form.userName"
                 placeholder="请填写管理员姓名"
+                oninput="value = value.trim()" 
               ></el-input>
             </el-form-item>
             <el-form-item label="固定电话" prop="telephone">
@@ -123,6 +124,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请填写管理员姓名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" }
         ],
         orgId: [
           { required: true, message: "请输入所在机构", trigger: "change" },

src/page/accounts/unitAdminDialog/edit.vue

@@ -21,6 +21,7 @@
               <el-input
                 v-model="form.userName"
                 placeholder="请填写管理员姓名"
+                oninput="value = value.trim()"
               ></el-input>
             </el-form-item>
             <el-form-item label="固定电话" prop="telephone">
@@ -126,6 +127,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请选择系统用户名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
         ],
         orgId: [
           { required: true, message: "请输入所在机构", trigger: "change" },

src/page/accounts/userDialog/add.vue

@@ -17,7 +17,11 @@
       >
         <div class="form-row">
           <el-form-item label="系统用户名" prop="userName">
-            <el-input v-model="form.userName" placeholder="请填写"></el-input>
+            <el-input
+              v-model.trim="form.userName"
+              placeholder="请填写"
+              oninput="value = value.trim()"
+            ></el-input>
           </el-form-item>
           <el-form-item label="所在机构" prop="orgId">
             <el-select v-model="form.orgId" filterable placeholder="请选择">
@@ -84,6 +88,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "请选择系统用户名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字符" },
         ],
         orgId: [
           { required: true, message: "请输入所在机构", trigger: "change" },

src/page/accounts/userDialog/edit.vue

@@ -17,7 +17,11 @@
       >
         <div class="form-row">
           <el-form-item label="系统用户名" prop="userName">
-            <el-input v-model="form.userName" placeholder="请填写"></el-input>
+            <el-input
+              v-model="form.userName"
+              placeholder="请填写"
+              oninput="value = value.trim()"
+            ></el-input>
           </el-form-item>
           <el-form-item label="所在机构" prop="orgId">
             <el-select v-model="form.orgId" filterable placeholder="请选择">
@@ -44,14 +48,15 @@
               value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
-              end-placeholder="结束日期">
+              end-placeholder="结束日期"
+            >
             </el-date-picker>
           </div>
         </el-form-item>
         <el-form-item label="账号类型" prop="roleList">
           <el-checkbox-group v-model="form.roleList" :min="1">
             <el-checkbox
-              v-for="(item,index) in rolesList"
+              v-for="(item, index) in rolesList"
               :key="index"
               :label="item.id"
             >
@@ -72,19 +77,20 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      id:'',
+      id: "",
       form: {
-        id:'',  
+        id: "",
         userName: "",
         orgId: "",
         permanent: true,
         date: "",
         roleList: [],
-        type: 1  //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
+        type: 1, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
       },
       rules: {
         userName: [
           { required: true, message: "请选择系统用户名", trigger: "change" },
+          { min: 1, max: 20, message: "请输入1到20个字符" },
         ],
         orgId: [
           { required: true, message: "请输入所在机构", trigger: "change" },
@@ -93,8 +99,13 @@ export default {
           { required: true, message: "请选择账号有效期", trigger: "change" },
         ],
         roleList: [
-          { type: 'array',required: true, message: "请选择账号类型", trigger: "change" },
-        ]
+          {
+            type: "array",
+            required: true,
+            message: "请选择账号类型",
+            trigger: "change",
+          },
+        ],
       },
     };
   },
@@ -112,33 +123,28 @@ export default {
       },
     },
   },
-  mounted() {
-      
-  },
+  mounted() {},
   methods: {
     // 根据id获取获取详情内容
-    getDetailById(){
-        let _this = this
+    getDetailById() {
+      let _this = this;
       this.$https(
         {
           method: "get",
           url: "tUser/getById",
           authType: this.backToken,
         },
-            {id:_this.id}
+        { id: _this.id }
       )
         .then((res) => {
-              if(res.status == 200 ){
-                if (res.data.resultCode == 200  ) {
-                    let resData = res.data.data
-                    for(let key in _this.form){
-                        this.form[key] = resData[key]
+          if (res.status == 200) {
+            if (res.data.resultCode == 200) {
+              let resData = res.data.data;
+              for (let key in _this.form) {
+                this.form[key] = resData[key];
               }
-                    if(!this.form.permanent){
-                        this.form.date = [
-                          resData.effectiveDate,
-                          resData.exiredDate
-                        ]
+              if (!this.form.permanent) {
+                this.form.date = [resData.effectiveDate, resData.exiredDate];
               }
             } else {
               _this.$message.error(res.data.message);
@@ -155,43 +161,43 @@ export default {
     handleClose() {
       this.$confirm("确认关闭？")
         .then((_) => {
-          this.handleReset()  
+          this.handleReset();
         })
         .catch((_) => {});
     },
-     handleReset(){
-        this.dialogVisible = false
-        this.$refs.form.resetFields()
+    handleReset() {
+      this.dialogVisible = false;
+      this.$refs.form.resetFields();
       this.form = {
         userName: "",
         orgId: "",
         permanent: true,
         date: "",
         roleList: [],
-            type:1
-        }
+        type: 1,
+      };
     },
     // 提交
     handleSubmit() {
       // 校验用户输入值
-      let _this = this
+      let _this = this;
       _this.$refs.form.validate((valid) => {
         if (valid) {
           let user = {};
-           if(!_this.form.permanent && !_this.form.date){
-               _this.$message.error('请选择有效期')
-               return false
+          if (!_this.form.permanent && !_this.form.date) {
+            _this.$message.error("请选择有效期");
+            return false;
           }
-          if(!_this.form.permanent){
+          if (!_this.form.permanent) {
             user.effectiveDate = _this.form.date[0];
             user.exiredDate = _this.form.date[1];
           }
           user.userName = _this.form.userName;
           user.orgId = _this.form.orgId;
-          user.roleList = _this.form.roleList
+          user.roleList = _this.form.roleList;
           user.permanent = _this.form.permanent;
-          user.id = _this.id
-          user.type = this.form.type
+          user.id = _this.id;
+          user.type = this.form.type;
           this.$https(
             {
               method: "put",
@@ -201,21 +207,21 @@ export default {
             user
           )
             .then((res) => {
-              if(res.status == 200 ){
-                if (res.data.resultCode == 200  ) {
+              if (res.status == 200) {
+                if (res.data.resultCode == 200) {
                   this.$message({
                     type: "success",
                     message: res.data.message,
                   });
-                    _this.dialogVisible = false
-                    this.$emit('success',true)
+                  _this.dialogVisible = false;
+                  this.$emit("success", true);
                 } else {
                   this.$message.error(res.data.message);
-                     this.$emit('success',false)
+                  this.$emit("success", false);
                 }
               } else {
                 this.$message.error(res.data);
-                   this.$emit('success',false)
+                this.$emit("success", false);
               }
             })
             .catch((err) => {

src/page/statistics/interaction.vue

@@ -17,7 +17,7 @@
           <div class="tip">
             <span class="tip-title">页面说明:</span>
             <span>
-              可查看当前系统各项数据统计情况。互动频次及点播趋势图展示部分数据，可进入互动统计及趋势分析详情页查看全部数据。</span
+              展示所有单位的互动频次统计图及统计表格。</span
             >
           </div>
         </div>

src/page/statistics/tend.vue

@@ -26,7 +26,7 @@
           <div class="tip">
             <span class="tip-title">页面说明:</span>
             <span
-              >默认展示当月点播总量趋势图及详情表格，可按照时间段进行检索，图表可以联动变化。</span
+              >默认展示当月点播总量趋势图及详情表格，可按照时间段进行检索，图表可以联动变化。。</span
             >
           </div>
         </div>

src/page/system/log/devops.vue

@@ -80,11 +80,11 @@ export default {
   },
   methods: {
     handleSubmit() {
-      this.getPageList();
+       this.getFirstPageList();
     },
     getFirstPageList() {
       this.page._index = 1;
-      this.getFirstPageList();
+      this.getPageList();
     },
     handleReset() {
       for (let key in this.form) {