修改限制

src/views/jobgroup/jobinfo/index.vue

@@ -379,10 +379,11 @@
           <el-checkbox-group
             v-model="addFrom.executorParam.params"
             :min="1"
-            :max="100"
+            :max="6"
           >
             <el-checkbox
               v-for="city in itemOptions"
+              :disabled="city=='轮询标识'"
               :label="city"
               :key="city"
               >{{ city }}</el-checkbox
@@ -515,6 +516,7 @@ export default {
       },
       visible: false,
       itemOptions: [
+        "轮询标识",
         "测量周期",
         "漏缆一般告警门限",
         "漏缆重要告警门限",
@@ -678,7 +680,7 @@ export default {
         executorFailRetryCount: "0",
         executorParam: {
           equipId: "",
-          params: [],
+          params: ['轮询标识'],
         },
       },
       params: {

src/views/setting/statistics/comp/monitorTable.vue

@@ -271,11 +271,11 @@ export default {
       this.paramsJson = JSON.parse(res.paramsJson);
       console.log("--------paramsJson------------");
       console.log(this.paramsJson);
+      this.openSetting = true;
     },
     async handleSetting(row) {
       this.rowData = row;
       this.handleSelectParam(row);
-      this.openSetting = true;
     },
     handleAutomatic() {
       this.open = true;

src/views/system/user/const.js

@@ -24,5 +24,4 @@ export function formInitPwd(data = {}) {
 
 export const rules = {
   userName: { required: true, message: '请输入用户名', trigger: 'blur' },
-  deptId: { required: true, message: '请选择所在部门', trigger: 'blur' }
 }

src/views/system/user/updateUser/components/baseInfo.vue

@@ -2,18 +2,8 @@
   <div>
     <div class="title">修改基本信息</div>
     <el-form ref="form" :model="form" label-width="130px" :rules="rules">
-      <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
-      </el-form-item>
-      <el-form-item label="所在部门:" prop="deptId">
-        <el-select v-model="form.deptId" style="width:100%" placeholder="请选择">
-          <el-option
-            v-for="item in departList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
+      <el-form-item label="用户名:" prop="userName" >
+        <el-input v-model="form.userName" disabled />
       </el-form-item>
       <el-form-item label="电话号码:">
         <el-input v-model="form.phone" />

src/views/system/user/updateUser/components/password.vue

@@ -3,7 +3,7 @@
     <div class="title">修改密码</div>
     <el-form ref="form" :model="form" label-width="100px" :rules="rules">
       <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
+        <el-input v-model="form.userName" disabled />
       </el-form-item>
       <el-form-item label="原密码:" prop="originPwd">
         <el-input type="password" v-model="form.originPwd" />

src/views/system/user/userList/components/editInfo.vue

@@ -8,26 +8,11 @@
   >
     <el-form ref="form" :model="form" label-width="100px" :rules="rules">
       <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
+        <el-input v-model="form.userName" :disabled="flag != 1" />
       </el-form-item>
       <el-form-item label="真实姓名:" prop="realName">
         <el-input v-model="form.realName" />
       </el-form-item>
-      <el-form-item label="所在部门:" prop="deptId">
-        <el-select
-          v-model="form.deptId"
-          style="width: 100%"
-          placeholder="请选择"
-        >
-          <el-option
-            v-for="item in departList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="电话号码:">
         <el-input v-model="form.phone" />
       </el-form-item>
@@ -44,7 +29,7 @@
         >
         </el-switch>
       </el-form-item>
-      <el-form-item v-if="flag==1">注：新用户初始密码为123456</el-form-item>
+      <el-form-item v-if="flag == 1">注：新用户初始密码为123456</el-form-item>
     </el-form>
     <span slot="footer">
       <el-button @click="cancel">取消</el-button>
@@ -54,28 +39,28 @@
 </template>
 
 <script>
-import { formInit, rules } from '../../const';
-import { updateInfo, create } from '../../api';
-import { mapGetters } from 'vuex';
+import { formInit, rules } from "../../const";
+import { updateInfo, create } from "../../api";
+import { mapGetters } from "vuex";
 
 export default {
-  name: 'edit',
+  name: "edit",
   data() {
     return {
       rules,
       form: formInit(),
-      visible: false
-    }
+      visible: false,
+    };
   },
   props: {
     flag: {
       type: Number,
-      default: 1
+      default: 1,
     },
     curInfo: {
       type: Object,
-      default: () => { }
-    }
+      default: () => {},
+    },
   },
   watch: {
     flag: {
@@ -87,34 +72,34 @@ export default {
     },
   },
   computed: {
-    ...mapGetters('depart', ['departList']),
+    ...mapGetters("depart", ["departList"]),
     editText() {
-      return `${this.flag === 1 ? '新增' : '编辑'}基本信息`;
-    }
+      return `${this.flag === 1 ? "新增" : "编辑"}基本信息`;
+    },
   },
   methods: {
     cancel() {
       this.form = formInit();
-      this.$emit('reset');
+      this.$emit("reset");
     },
     confrim() {
       let apiMap = {
         1: create,
         2: updateInfo,
-      }
+      };
       let api = apiMap[this.flag];
-      this.$refs['form'].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         let params = {
-          ...this.form
-        }
+          ...this.form,
+        };
         if (valid) {
           api(params).then(() => {
-            this.$message.success('操作成功');
-            this.$emit('reset', true);
-          })
-        }
-      })
+            this.$message.success("操作成功");
+            this.$emit("reset", true);
+          });
         }
-  }
-}
+      });
+    },
+  },
+};
 </script>

src/views/system/user/userList/components/editPwd.vue

@@ -7,8 +7,8 @@
     :close-on-click-modal="false"
   >
     <el-form ref="form" :model="form" label-width="100px" :rules="rules">
-      <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
+      <el-form-item label="用户名:" prop="userName" >
+        <el-input v-model="form.userName" disabled />
       </el-form-item>
       <el-form-item label="原密码:" prop="originPwd">
         <el-input type="password" v-model="form.originPwd" />

src/views/system/user/userList/index.vue

@@ -27,7 +27,6 @@
       />
       <el-table-column prop="userName" label="用户名" align="center" />
       <el-table-column prop="realName" label="真实姓名" align="center" />
-      <el-table-column prop="deptName" label="用户部门" align="center" />
       <el-table-column prop="phone" label="电话号码" align="center" />
       <el-table-column prop="email" label="邮箱" align="center" />
       <el-table-column label="操作" align="center">

src/views/user/const.js

@@ -24,5 +24,4 @@ export function formInitPwd(data = {}) {
 
 export const rules = {
   userName: { required: true, message: '请输入用户名', trigger: 'blur' },
-  deptId: { required: true, message: '请选择所在部门', trigger: 'blur' }
 }

src/views/user/updateUser/components/baseInfo.vue

@@ -3,17 +3,7 @@
     <div class="title">修改基本信息</div>
     <el-form ref="form" :model="form" label-width="130px" :rules="rules">
       <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
-      </el-form-item>
-      <el-form-item label="所在部门:" prop="deptId">
-        <el-select v-model="form.deptId" style="width:100%" placeholder="请选择">
-          <el-option
-            v-for="item in departList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
+        <el-input v-model="form.userName" disabled />
       </el-form-item>
       <el-form-item label="电话号码:">
         <el-input v-model="form.phone" />

src/views/user/updateUser/components/password.vue

@@ -3,7 +3,7 @@
     <div class="title">修改密码</div>
     <el-form ref="form" :model="form" label-width="100px" :rules="rules">
       <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
+        <el-input v-model="form.userName" disabled />
       </el-form-item>
       <el-form-item label="原密码:" prop="originPwd">
         <el-input type="password" v-model="form.originPwd" />

src/views/user/userList/components/editInfo.vue

@@ -13,21 +13,6 @@
       <el-form-item label="真实姓名:" prop="realName">
         <el-input v-model="form.realName" />
       </el-form-item>
-      <el-form-item label="所在部门:" prop="deptId">
-        <el-select
-          v-model="form.deptId"
-          style="width: 100%"
-          placeholder="请选择"
-        >
-          <el-option
-            v-for="item in departList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="电话号码:">
         <el-input v-model="form.phone" />
       </el-form-item>

src/views/user/userList/components/editPwd.vue

@@ -8,7 +8,7 @@
   >
     <el-form ref="form" :model="form" label-width="100px" :rules="rules">
       <el-form-item label="用户名:" prop="userName">
-        <el-input v-model="form.userName" />
+        <el-input v-model="form.userName" disabled />
       </el-form-item>
       <el-form-item label="原密码:" prop="originPwd">
         <el-input type="password" v-model="form.originPwd" />

src/views/user/userList/index.vue

@@ -27,7 +27,6 @@
       />
       <el-table-column prop="userName" label="用户名" align="center" />
       <el-table-column prop="realName" label="真实姓名" align="center" />
-      <el-table-column prop="deptName" label="用户部门" align="center" />
       <el-table-column prop="phone" label="电话号码" align="center" />
       <el-table-column prop="email" label="邮箱" align="center" />
       <el-table-column label="操作" align="center">

vue.config.js

@@ -9,8 +9,8 @@ function resolve(dir) {
 const name = defaultSettings.title || '漏缆故障定位监测系统' // page title
 const port = process.env.port || process.env.npm_config_port || 8890 // dev port
 // const href = 'http://101.126.159.207'
-const href = 'http://127.0.0.1'
-// const href = 'http://192.168.0.104'
+// const href = 'http://127.0.0.1'
+const href = 'http://192.168.0.115'
 
 const rewriteDefaultConfig = {
   changeOrigin: true,