xiala

src/config/route.js

@@ -471,6 +471,7 @@ const routes = [
       "type": "menu"
     },
     "children": [
+     
       {
         "name": "employee",
         "path": "/hrm/employee",

src/layout/components/userselect.vue

@@ -0,0 +1,358 @@
+<template>
+  <div style="display:flex;row nowrap">
+   
+   <!-- <el-tag
+      v-for="user in userData"
+      :key="user.id"
+    >
+      {{ user.name }}
+    </el-tag>-->
+     <el-button
+      v-if="selectable"
+      type="primary"
+      circle
+      size="mini"
+      icon="el-icon-plus"
+      @click="showDialog()"
+    />
+  </div>
+
+  <el-dialog
+    title="选择人员"
+    width="90%"
+    v-model="dialoguser"
+    :before-close="handleClose"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+  >
+    <el-card>
+      <el-row>
+        <el-col :md="8" :sm="24">
+          <el-main class="nopadding">
+            <el-tabs type="border-card" stretch="true">
+              <el-tab-pane label="按部门分类">
+                <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+                </el-input>
+
+                <el-tree
+                  class="filter-tree"
+                  style="padding-top: 15px"
+                  :data="deptdata"
+                  default-expand-all
+                  :filter-node-method="filterNode"
+                  ref="tree"
+                  @node-click="handleNodeClick"
+                >
+                </el-tree>
+              </el-tab-pane>
+              <el-tab-pane label="按岗位分类">
+                <el-input
+                  placeholder="输入关键字进行过滤"
+                  v-model="filterTexts"
+                >
+                </el-input>
+
+                <el-tree
+                  class="filter-tree"
+                  style="padding-top: 15px"
+                  :data="postdata"
+                  default-expand-all
+                  :filter-node-method="filterNodes"
+                  ref="tree"
+                  @node-click="handleNodeClicks"
+                >
+                </el-tree>
+              </el-tab-pane>
+            </el-tabs>
+          </el-main>
+        </el-col>
+        <el-col :md="16" :sm="24">
+          <el-header style="border-bottom: none">
+            <div class="left-panel">
+              <el-input
+                v-model="search.keyword"
+                placeholder="姓名"
+                clearable
+                @click="upsearch"
+              ></el-input>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="upsearch"
+              ></el-button>
+            </div>
+            <div class="right-panel">
+              <el-button type="primary" icon="el-icon-plus" @click="addUser"
+                >添加选择</el-button
+              >
+            </div>
+          </el-header>
+          <el-main class="nopadding">
+            <scTable
+              ref="table"
+              :data="apiObj"
+              row-key="id"
+              @selection-change="selectionChange"
+              stripe
+              :hidePagination="true"
+              hideDo
+              @resetQuery="resetQuery"
+            >
+              <el-table-column type="selection" width="50"></el-table-column>
+              <el-table-column
+                label="#"
+                type="index"
+                width="50"
+              ></el-table-column>
+              <el-table-column label="姓名" prop="name"></el-table-column>
+
+              <el-table-column label="手机号" prop="phone"></el-table-column>
+              <el-table-column label="部门" prop="belong_dept">
+                <template #default="scope">
+                  <span v-if="scope.row.belong_dept_">{{
+                    scope.row.belong_dept_.name
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="创建时间"
+                prop="create_time"
+              ></el-table-column>
+              <!--
+            <el-table-column
+              label="操作"
+              fixed="right"
+              align="left"
+              width="100"
+            >
+              <template #default="scope">
+                <el-button-group>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="handleForm('add', scope.row)"
+                  ></el-button>
+                </el-button-group>
+              </template>
+            </el-table-column>-->
+            </scTable>
+          </el-main>
+          <div style="padding-top: 15px">
+            <el-input
+              style="width: 80%"
+              v-model="username"
+              placeholder="选择人员的姓名"
+              clearable
+            ></el-input>
+            <el-button @click="visible = false" style="float: right"
+              >取 消</el-button
+            >
+            <el-button
+              v-if="mode != 'show'"
+              style="float: right"
+              type="primary"
+              :loading="isSaveing"
+              @click="submitfrom()"
+              >提 交</el-button
+            >
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+    <script>
+import { genTree } from "@/utils/verificate";
+export default {
+  name: "employee",
+  components: {},
+  props: {
+    value: {
+      // 接受外部v-model传入的值
+      type: [String],
+      default: "",
+    },
+    user: {
+      // 接受外部v-model传入的值
+      type: [String],
+      default: "",
+    },
+    closable: {
+      // 是否可以关闭标签
+      type: Boolean,
+      default: () => {
+        return true;
+      },
+    },
+    selectable: {
+      // 是否可选人员
+      type: Boolean,
+      default: () => {
+        return true;
+      },
+    },
+    multiple: {
+      // 是否多选,默认可以多选
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      apiObj: [],
+      query: {},
+      selection: [],
+      search: {
+        keyword: null,
+      },
+      filterText: "",
+      filterTexts: "",
+      deptdata: [],
+      postdata: [],
+      username: [],
+      userData: [],
+      dialoguser: false,
+      dataValue: this.value,
+    };
+  },
+  mounted() {
+    this.getUser();
+    this.getDept();
+    this.getPost();
+   
+    
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    },
+    filterTexts(val) {
+      this.$refs.tree.filter(val);
+    },
+     dataValue(val) {
+      this.$emit("input", val);
+      console.log(val)
+    },
+    userData(val) {
+      if (val) {
+        this.change();
+      }
+    },
+   
+  },
+  methods: {
+    showDialog() {
+      this.dialoguser = true;
+      this.$nextTick(function () {
+         this.apiObj.map(item => {
+            if (item.id === this.user) {
+              this.$refs.table.toggleRowSelection(item, true)
+            }
+          })
+      })
+     
+    },
+    //加载人员
+    getUser() {
+      this.$API.system.user.list.req({ page: 0 }).then((res) => {
+        this.apiObj = res;
+      });
+    },
+    upsearch() {
+      this.$API.system.user.list
+        .req({ name: this.search.keyword, page: 0 })
+        .then((res) => {
+          this.apiObj = res;
+        });
+    },
+    //加载部门树数据
+    async getDept() {
+      let res = await this.$API.system.dept.list.req({ page: 0 });
+      this.deptdata = genTree(res);
+    },
+    //加载部门树数据
+    async getPost() {
+      let res = await this.$API.system.post.list.req({ page: 0 });
+      this.postdata = genTree(res);
+    },
+    filterNode(value, data) {
+      console.log(value);
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    filterNodes(value, data) {
+      console.log(value);
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    //部门点击显示对应的人员
+    handleNodeClick(data) {
+      this.$API.system.user.list
+        .req({ belong_dept: data.id, page: 0 })
+        .then((res) => {
+          this.apiObj = res;
+        });
+    },
+    //岗位点击显示对应的人员
+    handleNodeClicks(data) {
+      this.$API.system.user.list.req({ post: data.id, page: 0 }).then((res) => {
+        this.apiObj = res;
+      });
+    },
+    //表格选择后回调事件
+    selectionChange(selection) {
+      this.selection = selection;
+    },
+    //删除Tag
+    closeTag(name) {
+      this.userData.splice(this.userData.indexOf(name), 1);
+    },
+
+    addUser() {
+      this.username = [];
+ this.userData = [];
+      if (!this.multiple && this.selection.length > 1) {
+        this.$message.error("对应的人员只允许选择一人！");
+       
+        return;
+      }
+      if (!this.selection || this.selection.length === 0) {
+        this.msgError("请选择至少一个人员！");
+        return;
+      }
+      this.selection.forEach((item) => {
+        this.username.push(item.name);
+
+        this.userData.push({ id: item.id, name: item.name });
+      });
+      console.log(this.userData);
+    },
+
+    change() {
+      if (this.tags) {
+        alert(1);
+        this.dataValue = this.userData.map((e) => e.id).join(",");
+        console.log(this.dataValue);
+        this.$emit("change", this.dataValue);
+      }
+    },
+    submitfrom() {
+      this.dialoguser = false;
+      this.change(); // 触发值变化
+      this.dataValue = this.userData.map((e) => e.id).join(",");
+      this.$emit("submit", this.dataValue);
+    },
+    //权限设置
+    permission() {
+      this.dialog.permission = true;
+      this.$nextTick(() => {
+        this.$refs.permissionDialog.open();
+      });
+    },
+
+    resetQuery() {
+      this.query = {};
+    },
+  },
+};
+</script>

src/views/ecm/algo.vue

@@ -4,7 +4,6 @@
       <el-container>
         <el-header>
           <div class="left-panel">
-            
             <!-- <el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button> -->
           </div>
         </el-header>
@@ -26,7 +25,7 @@
             <el-table-column
               label="名称"
               prop="name"
-              width="120"
+              width="100"
             ></el-table-column>
             <el-table-column
               label="标识"
@@ -47,15 +46,22 @@
                 ></el-switch>
               </template>
             </el-table-column>
+            <el-table-column label="喇叭开启区域" prop="name" width="120">
+              <template #default="scope">
+                <el-space v-if="scope.row.filter_area_level">{{
+                  filter_area_[scope.row.filter_area_level]
+                }}</el-space></template
+              >
+            </el-table-column>
             <el-table-column label="操作" fixed="right" align="right">
               <template #default="scope">
-				  <el-button
+                <el-button
                   type="primary"
                   link
                   size="small"
                   @click="adds_edit(scope.row)"
-                  >批量布设</el-button>
+                  >批量布设</el-button
-               
+                >
               </template>
             </el-table-column>
           </scTable>
@@ -82,18 +88,34 @@
           :hidePagination="true"
         >
           <el-table-column label="#" type="index" width="50"></el-table-column>
-          <el-table-column label="算法名称" prop="algo_.name" width="150"></el-table-column>
+          <el-table-column
-		   <el-table-column label="视频名称" prop="vchannel_.name" width="150"></el-table-column>
+            label="算法名称"
-          <el-table-column label="始终开启" prop="always_on" width="150"></el-table-column>
+            prop="algo_.name"
+            width="150"
+          ></el-table-column>
+          <el-table-column
+            label="视频名称"
+            prop="vchannel_.name"
+            width="150"
+          ></el-table-column>
+          <el-table-column label="始终开启" prop="always_on" width="150">
+            <template #default="scope">
+              <el-switch
+                v-model="scope.row.always_on"
+                :disabled="true"
+              ></el-switch>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" fixed="right" align="right">
             <template #default="scope">
-              <el-button
+              <el-popconfirm
-                type="danger"
+                title="确定删除吗？"
-                link
+                @confirm="table_del(scope.row, scope.$index)"
-                size="small"
-                @click="table_del(scope.row, scope.$index)"
-                >删除</el-button
               >
+                <template #reference>
+                  <el-button text type="danger" size="small">删除</el-button>
+                </template>
+              </el-popconfirm>
             </template>
           </el-table-column>
         </scTable>
@@ -106,7 +128,7 @@
     @success="handleSaveSuccess"
     @closed="dialog.save = false"
   ></save-dialog>
-   <algo-dialog
+  <algo-dialog
     v-if="dialog.algos"
     ref="algoDialog"
     @success="handleSaveSuccessss"
@@ -122,7 +144,7 @@ export default {
   name: "algo",
   components: {
     saveDialog,
-	algoDialog,
+    algoDialog,
     CircleCheckFilled,
     CircleCloseFilled,
   },
@@ -130,42 +152,51 @@ export default {
     return {
       dialog: {
         save: false,
-		algos: false,
+        algos: false,
+      },
+      filter_area_: {
+        10: "办公生活区以上",
+        20: "生产一般区以上",
+        30: "生产重点区以上",
       },
-     
       selection: [],
-      chosen_cate: null,
+      chosen_cate: "",
-	  eventcateList:[],
+      eventcateList: [],
-	  vchannelList:[]
+      vchannelList: [],
     };
   },
   mounted() {
     this.getEventCate();
-	this.getVchannel();
+    this.getVchannel();
   },
   methods: {
-	 //事件总类列表
+    //事件总类列表
     getEventCate() {
-      this.$API.ecm.event_cate.list.req({ self_algo:true,page: 0 }).then((res) => {
+      this.$API.ecm.event_cate.list
-        this.eventcateList = res;
+        .req({ self_algo: true, page: 0 })
-      });
+        .then((res) => {
+          this.eventcateList = res;
+        });
     },
-	//左边列表点击，右边显示
+    //左边列表点击，右边显示
     rowClick(row) {
+      this.$API.ecm.vchannel.list.req({ algo: row.id, page: 0 }).then((res) => {
+        this.vchannelList = res;
+      });
+      
      
-      this.$API.ecm.vchannel.list.req({algo:row.id,page: 0 }).then((res) => {
+      this.chosen_cate = row.id;
+    
+    },
+
+    //算法列表
+    getVchannel() {
+      this.$API.ecm.vchannel.list.req({ page: 0 }).then((res) => {
         this.vchannelList = res;
       });
     },
 
-	//算法列表
+    //批量布设添加
-	 getVchannel() {
-      this.$API.ecm.vchannel.list.req({page: 0 }).then((res) => {
-        this.vchannelList = res;
-      });
-    },
-	
-	 //批量布设添加
     adds_edit() {
       this.dialog.algos = true;
       this.$nextTick(() => {
@@ -180,7 +211,7 @@ export default {
         this.$refs.saveDialog.open();
       });
     },
-   
+
     //窗口编辑
     table_edit(row) {
       this.dialog.save = true;
@@ -189,19 +220,25 @@ export default {
       });
     },
     table_del(row) {
-	
+      this.$API.ecm.vchannel.delete
-      this.$API.ecm.vchannel.delete.req(row.id).then((res) => {
+        .req(row.id)
-        this.$refs.tablevchannel.refresh();
+        .then((res) => {
-        this.$message.success("删除成功");
+          this.$message.success("删除成功");
-       
+          this.getVchannel();
-      });
+          return res;
+        })
+        .catch((err) => {
+          return err;
+        });
     },
     //本地更新数据
     handleSaveSuccess() {
-     
       this.$refs.tablevchannel.refresh();
     },
-    
+    //本地更新数据
+    handleSaveSuccessss() {
+      this.$refs.tablevchannel.refresh();
+    },
   },
 };
 </script>

src/views/ecm/algo_form.vue

@@ -88,6 +88,7 @@ export default {
     //显示
     open(mode = "add") {
       this.mode = mode;
+        this.form.algo = this.$parent.chosen_cate;
       this.visible = true;
       return this;
     },

src/views/ecm/algos_form.vue

@@ -25,7 +25,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="视频" prop="vchannel">
+      <el-form-item label="视频" prop="vchannels">
         <el-select v-model="form.vchannels" multiple="true">
           <el-option
             v-for="item in vchanneloptions"
@@ -68,13 +68,13 @@ export default {
       //表单数据
       form: {
         algo: "",
-        vchannel: "",
+        vchannels: [],
         always_on: false,
       },
       //验证规则
       rules: {
         algo: [{ required: true, message: "请选择算法" }],
-        vchannel: [{ required: true, message: "请选择视频" }],
+        vchannels: [{ required: true, message: "请选择视频" }],
       },
       algooptions: [],
       vchanneloptions: [],
@@ -89,6 +89,7 @@ export default {
     open(mode = "add") {
       this.mode = mode;
       this.visible = true;
+      this.form.algo = this.$parent.chosen_cate;
       return this;
     },
      //事件列表
@@ -105,32 +106,15 @@ export default {
     },
 
     //表单提交方法
-    async submit() {
+     submit() {
-      var valid = await this.$refs.dialogForm.validate().catch(() => {});
+      
-      if (!valid) {
+     this.$API.ecm.vchannel.creates.req(this.form).then((res) => {
-        return false;
+                this.$message.success("操作成功");
-      }
+                this.visible=false;
-      this.isSaveing = true;
+               
-      try {
+                return res;
-        var res;
+              })
-        if (this.mode == "add") {
+          
-          res = await this.$API.ecm.vchannel.creates.req(this.form);
-        } else if (this.mode == "edit") {
-          res = await this.$API.ecm.vchannel.update.req(
-            this.form.id,
-            this.form
-          );
-        }
-        this.isSaveing = false;
-        this.$emit("success", this.form, this.mode);
-        this.visible = false;
-        this.$message.success("操作成功");
-        return res;
-      } catch (err) {
-        //可以处理校验错误
-        this.isSaveing = false;
-        return err;
-      }
     },
     //表单注入数据
     setData(data) {

src/views/ecm/event_cate_form.vue

@@ -43,7 +43,7 @@
         ></el-input-number>
       </el-form-item>
       <sc-title title="音响配置"></sc-title>
-       <el-form-item label="喇叭" prop="speakers">
+      <el-form-item label="喇叭" prop="speakers">
         <el-select v-model="form.speakers" multiple="true">
           <el-option
             v-for="item in speakersptions"
@@ -53,6 +53,18 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="喇叭声音" prop="voice_person">
+        <el-select v-model="form.voice_person">
+          <el-option
+            v-for="item in voiceoptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="喇叭开启" prop="speaker_on">
         <el-switch v-model="form.speaker_on"></el-switch>
       </el-form-item>
@@ -97,7 +109,7 @@ export default {
       form: {
         speaker_on: true,
         self_algo: false,
-        speakers:[]
+        speakers: [],
       },
       //验证规则
       rules: {
@@ -127,7 +139,17 @@ export default {
           label: "定位",
         },
       ],
-      speakersptions:[],
+      voiceoptions:[
+        {
+          value: 3,
+          label: "男生",
+        },
+        {
+          value: 0,
+          label: "女生",
+        },
+      ],
+      speakersptions: [],
       //所需数据选项
       groups: [],
       groupsProps: {
@@ -149,11 +171,11 @@ export default {
     },
     //固定喇叭列表
     getSpeakers() {
-      this.$API.third.tdevice.list.req({type:50, page: 0 }).then((res) => {
+      this.$API.third.tdevice.list.req({ type: 50, page: 0 }).then((res) => {
         this.speakersptions = res;
       });
     },
-    
+
     //表单提交方法
     async submit() {
       var valid = await this.$refs.dialogForm.validate().catch(() => {});
@@ -186,7 +208,7 @@ export default {
     setData(data) {
       Object.assign(this.form, data);
       debugger;
-      console.log(this.form)
+      console.log(this.form);
     },
   },
 };

src/views/ecm/event_handlefrom.vue

@@ -199,9 +199,8 @@ export default {
      
        this.$API.ecm.event.handle.req(this.form.id, this.form)
               .then((res) => {
-                this.isSaveing = false;
+               
-                this.visible = false;
+               this.$router.go(-1)
-                this.$emit("success", this.form, this.mode);
                 this.$message.success("操作成功");
                 return res;
               })

src/views/ecm/notify_setting.vue

@@ -27,11 +27,13 @@
               label="#"
               type="index"
               width="50"
+              fixed="left"
             ></el-table-column>
             <el-table-column
               label="名称"
               prop="name"
               width="120"
+               fixed="left"
             ></el-table-column>
             <el-table-column
               label="标识"
@@ -44,13 +46,31 @@
                 <span v-if="scope.row.trigger == 20">定位</span>
               </template>
             </el-table-column>
-            <el-table-column label="音响" prop="speaker_on" width="50">
+              <el-table-column
+              label="处理时间"
+              prop="hanle_minute"
+              width="80"
+            ></el-table-column>
+            <el-table-column label="喇叭开启" prop="speaker_on" width="80">
               <template #default="scope">
                 <el-switch
                   v-model="scope.row.speaker_on"
                   :disabled="true"
                 ></el-switch>
               </template>
+            </el-table-column>
+             <el-table-column
+              label="喇叭开启区域"
+              prop="name"
+              width="120"
+            >
+            
+            <template #default="scope">
+              <el-space v-if="scope.row.filter_area_level">{{
+                filter_area_[scope.row.filter_area_level]
+              }}</el-space></template
+            >
+            
             </el-table-column>
             <el-table-column label="操作" fixed="right" align="right">
               <template #default="scope">
@@ -224,6 +244,11 @@ export default {
         30: "较大风险",
         40: "重大风险",
       },
+       filter_area_: 
+        { 10: "办公生活区以上",
+         20: "生产一般区以上",
+        30: "生产重点区以上",
+        },
     };
   },
    mounted() {

src/views/vm/visit_form.vue

@@ -64,7 +64,7 @@
             </el-col>
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="接待人">
-                <el-select v-model="form.receptionist" placeholder="选择接待人">
+                <el-select v-model="form.receptionist" disabled placeholder="选择接待人">
                   <el-option
                     v-for="item in receptionistoptions"
                     :key="item.id"
@@ -72,6 +72,11 @@
                     :value="item.id"
                   />
                 </el-select>
+
+
+                  <select-user ref="form.receptionist" :user="form.receptionist" :closable="true" :multiple="false" @submit="refresh"  >
+           </select-user>
+
               </el-form-item>
             </el-col>
             <el-col :md="24" :sm="12" :xs="24">
@@ -99,6 +104,10 @@
                   :max="32767"
                   controls-position="right"
                 ></el-input-number>
+
+         
+
+           
               </el-form-item>
             </el-col>
           </el-row>
@@ -116,8 +125,12 @@
 
 <script>
 import { genTree } from "@/utils/verificate";
+import selectUser from '@/layout/components/userselect'
 export default {
   emits: ["success", "closed"],
+   components: {
+    selectUser,
+  },
   data() {
     return {
       loading: false,
@@ -170,6 +183,16 @@ export default {
       this.visible = true;
       return this;
     },
+
+
+    
+    refresh(data) {
+      // 子组件调用父组件的方法并传参
+      console.log(data);
+     this.form.receptionist=data;
+    },
+
+
     //表单提交方法
     submit() {
       this.$refs.dialogForm.validate(async (valid) => {