Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

FeatureSuggester.xml

@@ -0,0 +1,9 @@
+<application>
+  <component name="FeatureSuggesterSettings">
+    <option name="workingDays">
+      <list>
+        <option value="1650436929708" />
+      </list>
+    </option>
+  </component>
+</application>

colors.scheme.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="EditorColorsManagerImpl">
+    <global_color_scheme name="Moonlight (Material)" />
+  </component>
+</application>

colors/_@user_Atom One Dark _Material_.icls

@@ -4,7 +4,7 @@
     <property name="created">2022-04-15T17:31:44</property>
     <property name="ide">Python</property>
     <property name="ideVersion">2022.1.0.0</property>
-    <property name="modified">2022-04-15T17:39:31</property>
+    <property name="modified">2022-04-20T14:42:36</property>
     <property name="originalScheme">Atom One Dark (Material)</property>
   </metaInfo>
   <option name="LINE_SPACING" value="1.4" />
@@ -75,7 +75,7 @@
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="ff6347" />
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="ff6347" />
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="ff6347" />
-    <option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="8f9d6a" />
+    <option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="72a038" />
     <option name="FILESTATUS_IDEA_SVN_FILESTATUS_OBSTRUCTED" value="727238" />
     <option name="FILESTATUS_IDEA_SVN_REPLACED" value="7af8ca" />
     <option name="FILESTATUS_MERGED" value="61aeef" />

colors/_@user_Darcula.icls

@@ -3,7 +3,7 @@
     <property name="created">2022-04-06T16:28:18</property>
     <property name="ide">Python</property>
     <property name="ideVersion">2021.3.3.0.0</property>
-    <property name="modified">2022-04-15T09:21:44</property>
+    <property name="modified">2022-04-20T14:42:36</property>
     <property name="originalScheme">Darcula</property>
   </metaInfo>
   <colors>

colors/_@user_Moonlight _Material_.icls

@@ -4,7 +4,7 @@
     <property name="created">2022-03-28T15:22:11</property>
     <property name="ide">Python</property>
     <property name="ideVersion">2021.3.3.0.0</property>
-    <property name="modified">2022-04-15T18:16:02</property>
+    <property name="modified">2022-04-20T14:42:36</property>
     <property name="originalScheme">Moonlight (Material)</property>
   </metaInfo>
   <option name="LINE_SPACING" value="1.4" />
@@ -76,7 +76,7 @@
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="ffdb8e" />
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="ffdb8e" />
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="ffdb8e" />
-    <option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="8f9d6a" />
+    <option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="72a038" />
     <option name="FILESTATUS_IDEA_SVN_FILESTATUS_OBSTRUCTED" value="727238" />
     <option name="FILESTATUS_IDEA_SVN_REPLACED" value="7af8ca" />
     <option name="FILESTATUS_MERGED" value="70b0ff" />

colors/_@user_Night Owl _Material_.icls

@@ -4,7 +4,7 @@
     <property name="created">2022-04-06T16:28:18</property>
     <property name="ide">Python</property>
     <property name="ideVersion">2021.3.3.0.0</property>
-    <property name="modified">2022-04-15T17:39:31</property>
+    <property name="modified">2022-04-20T14:42:36</property>
     <property name="originalScheme">Night Owl (Material)</property>
   </metaInfo>
   <option name="LINE_SPACING" value="1.4" />
@@ -76,7 +76,7 @@
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="f78c6c" />
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="f78c6c" />
     <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="f78c6c" />
-    <option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="8f9d6a" />
+    <option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="72a038" />
     <option name="FILESTATUS_IDEA_SVN_FILESTATUS_OBSTRUCTED" value="727238" />
     <option name="FILESTATUS_IDEA_SVN_REPLACED" value="7af8ca" />
     <option name="FILESTATUS_MERGED" value="82aaff" />

databaseDrivers.xml

@@ -0,0 +1,3 @@
+<application>
+  <component name="LocalDatabaseDriverManager" version="201" />
+</application>

debugger.xml

@@ -0,0 +1,13 @@
+<application>
+  <component name="XDebuggerSettings">
+    <data-views />
+    <general />
+    <debuggers>
+      <debugger id="javascript">
+        <configuration>
+          <custom-object-presentation />
+        </configuration>
+      </debugger>
+    </debuggers>
+  </component>
+</application>

editor-font.xml

@@ -0,0 +1,7 @@
+<application>
+  <component name="DefaultFont">
+    <option name="VERSION" value="1" />
+    <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
+    <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
+  </component>
+</application>

editor.xml

@@ -0,0 +1,6 @@
+<application>
+  <component name="TodoConfiguration">
+    <pattern pattern="\btodo\b.*" />
+    <pattern pattern="\bfixme\b.*" />
+  </component>
+</application>

filetypes.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="FileTypeManager" version="18">
+    <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
+  </component>
+</application>

find.xml

@@ -0,0 +1,9 @@
+<application>
+  <component name="FindSettings">
+    <mask>*.css</mask>
+    <mask>*.html</mask>
+    <mask>*.xml</mask>
+    <mask>*.pyw</mask>
+    <mask>*.py</mask>
+  </component>
+</application>

gitee.xml

@@ -0,0 +1,7 @@
+<application>
+  <component name="GiteeAccounts">
+    <account name="gxlove_max@163.com" id="4a9f814c-1ea6-4c45-9d45-23db22b57623">
+      <Server host="gitee.com" clientid="fc439d90cb2ffc20cffeb70a6a4039e69847485e0fa56cfa0d1bf006098e24dd" clientsecret="386f187646ee361049f69cd213424bdba5af03e820d10a68a68e5fb520902596" />
+    </account>
+  </component>
+</application>

ide.general.xml

@@ -0,0 +1,6 @@
+<application>
+  <component name="Registry">
+    <entry key="ide.balloon.shadow.size" value="0" />
+    <entry key="ide.experimental.ui" value="false" />
+  </component>
+</application>

laf.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="LafManager" autodetect="false">
+    <laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" themeId="MOONLIGHT" />
+  </component>
+</application>

material_theme.xml

@@ -0,0 +1,9 @@
+<application>
+  <component name="MaterialThemeConfig">
+    <option name="pristineConfig" value="false" />
+    <option name="accentColor" value="74a0f1" />
+    <option name="selectedTheme" value="MOONLIGHT" />
+    <option name="userId" value="1365161:1804546eb6b:-7fbc" />
+    <option name="version" value="7.3.2" />
+  </component>
+</application>

nodejs.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="NodeJsLocalInterpreterManager">
+    <local-interpreter path="D:/Development/node/node.exe" />
+  </component>
+</application>

shared-indexes.xml

@@ -0,0 +1,7 @@
+<application>
+  <component name="download-consent">
+    <option name="consentItems">
+      <item download="ALLOWED" kind="python" url="https://index-cdn.jetbrains.com/v2" />
+    </option>
+  </component>
+</application>

src/api/phone/cabinet.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询手机柜列表
+export function listCabinet(query) {
+  return request({
+    url: '/phone/cabinet/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询手机柜详细
+export function getCabinet(id) {
+  return request({
+    url: '/phone/cabinet/' + id,
+    method: 'get'
+  })
+}
+
+// 新增手机柜
+export function addCabinet(data) {
+  return request({
+    url: '/phone/cabinet',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改手机柜
+export function updateCabinet(data) {
+  return request({
+    url: '/phone/cabinet',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除手机柜
+export function delCabinet(id) {
+  return request({
+    url: '/phone/cabinet/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出手机柜
+export function exportCabinet(query) {
+  return request({
+    url: '/phone/cabinet/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/phone/grid.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询手机柜格子列表
+export function listGrid(query) {
+  return request({
+    url: '/phone/grid/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询手机柜格子详细
+export function getGrid(id) {
+  return request({
+    url: '/phone/grid/' + id,
+    method: 'get'
+  })
+}
+
+// 新增手机柜格子
+export function addGrid(data) {
+  return request({
+    url: '/phone/grid',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改手机柜格子
+export function updateGrid(data) {
+  return request({
+    url: '/phone/grid',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除手机柜格子
+export function delGrid(id) {
+  return request({
+    url: '/phone/grid/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出手机柜格子
+export function exportGrid(query) {
+  return request({
+    url: '/phone/grid/export',
+    method: 'get',
+    params: query
+  })
+}

src/assets/styles/global.css

@@ -1117,6 +1117,7 @@ input:-moz-placeholder {
 .el-dialog__body .userAgree {
   height: 600px;
   overflow: auto;
+  overflow-x: hidden;
 }
 
 /*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
@@ -1224,6 +1225,6 @@ input:-moz-placeholder {
 }
 
 /* 教案库上传文件弹框样式 */
-#uploadfile .el-dialog__body{
+#uploadfile .el-dialog__body {
   padding: 30px 0px !important;
 }

src/components/ImageUpload/index.vue

@@ -14,16 +14,20 @@
       :headers="headers"
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
+      :class="{ hide: this.fileList.length >= this.limit }"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="fileSize">
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+      </template>
       的文件
     </div>
 
@@ -54,7 +58,7 @@ export default {
     },
     // 大小限制(MB)
     fileSize: {
-       type: Number,
+      type: Number,
       default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
@@ -65,8 +69,8 @@ export default {
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -78,7 +82,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: []
+      fileList: [],
     };
   },
   watch: {
@@ -86,14 +90,14 @@ export default {
       handler(val) {
         if (val) {
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(",");
           // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
+          this.fileList = list.map((item) => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
-                  item = { name: item, url: item };
+                item = { name: item, url: item };
               }
             }
             return item;
@@ -104,8 +108,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   computed: {
     // 是否显示提示
@@ -116,8 +120,8 @@ export default {
   methods: {
     // 删除图片
     handleRemove(file, fileList) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if(findex > -1) {
+      const findex = this.fileList.map((f) => f.name).indexOf(file.name);
+      if (findex > -1) {
         this.fileList.splice(findex, 1);
         this.$emit("input", this.listToString(this.fileList));
       }
@@ -136,7 +140,7 @@ export default {
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
         }
-        isImg = this.fileType.some(type => {
+        isImg = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -188,25 +192,26 @@ export default {
       for (let i in list) {
         strs += list[i].url.replace(this.baseUrl, "") + separator;
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
-::v-deep .el-list-enter, .el-list-leave-active {
-    opacity: 0;
-    transform: translateY(0);
+::v-deep .el-list-enter,
+.el-list-leave-active {
+  opacity: 0;
+  transform: translateY(0);
 }
 </style>
 

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -38,9 +38,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -2247,7 +2245,6 @@ export default {
       const id = row.id || this.ids;
       getBdglcookbook(id).then((response) => {
         this.wordInfo = response.data;
-        console.log(this.wordInfo);
         this.title = "查看一周食谱";
         this.menuRoleVisible = true;
       });
@@ -2639,7 +2636,6 @@ export default {
             this.Thursday.wanFu1 = this.Thursday.wanFu1.map((i) =>
               parseInt(i, 0)
             );
-            console.log(this.Thursday.wanFu1);
             this.Thursday.wanFu1Ren = this.wanFu4.peopleIds.split(",");
             this.Thursday.wanFu1Ren = this.Thursday.wanFu1Ren.map((i) =>
               parseInt(i, 0)
@@ -2919,7 +2915,6 @@ export default {
           }
         });
       });
-      console.log(this.arr);
     },
     /** 提交按钮 */
     submitForm(style) {
@@ -3837,7 +3832,6 @@ export default {
             // 中主;
             if (this.Sunday.zhongZu1 != "") {
               var str21 = this.Sunday.zhongZu1.join(",");
-              console.log(str21, 11);
               var pstr21 = this.Sunday.zhongZu1Ren.join(",");
             }
 

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1175,7 +1175,6 @@ export default {
       s = s < 10 ? "0" + s : s;
       let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
       getXunLian(id, dateTime).then((res) => {
-        console.log(res.data);
         this.xunlian = res.data;
         // for (var i = 0; i < res.data.length; i++) {
         //   res.data[i].centertext =
@@ -1348,7 +1347,6 @@ export default {
     // 字典查询
     getdict() {
       getDicts(this.dictType.dictType).then((res) => {
-        // console.log(res);
         this.ziDian = res.data;
       });
     },

src/views/grassrootsregistration/bdglequip/index.vue

@@ -37,9 +37,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -537,7 +535,6 @@ export default {
     getTreeselect2() {
       getDept2().then((response) => {
         this.deptOption = response.data;
-        console.log(response, 2);
       });
     },
     /** 查询训练器材/教材登记薄列表 */

src/views/grassrootsregistration/bdgleven/index.vue

@@ -44,9 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery" 
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -502,7 +500,6 @@ export default {
       this.loading = true;
       listBdgleven(this.queryParams).then((response) => {
         this.bdglevenList = response.rows;
-        console.log(this.bdglevenList);
         this.total = response.total;
         this.loading = false;
       });

src/views/grassrootsregistration/bdglfood/index.vue

@@ -42,9 +42,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -1652,7 +1650,6 @@ export default {
       this.getShu();
       const id = row.id || this.ids;
       getBdglfood(id).then((response) => {
-        console.log(response);
         this.form = response.data;
         this.getdict();
         this.getRen(this.form.unitId);
@@ -1672,7 +1669,6 @@ export default {
         // 实物检查验收
         this.acceptance = response.data.bdglFoodKinds;
         // 采购食材
-        console.log(response.data.bdglFoodProcurements, "点");
         this.caiGou = response.data.bdglFoodProcurements;
         // 交/退伙食费
         this.expenses = response.data.bdglFoodBoardWagess;
@@ -1694,7 +1690,6 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglfood(id).then((response) => {
-        console.log(response);
         this.wordInfo = response.data;
         this.title = "查看伙食管理登记薄";
         this.menuRoleVisible = true;
@@ -1713,7 +1708,6 @@ export default {
             this.Arr.push(this.zhongCan);
             this.Arr.push(this.wanCan);
             this.form.bdglFoodMeal = this.Arr;
-            console.log(this.form.bdglFoodMeal);
             // 赋值字段
             this.form.bdglFoodKinds = this.acceptance;
             // 采购食物
@@ -1729,7 +1723,6 @@ export default {
             });
           } else {
             // 转换字符串
-            console.log(11);
             if (this.form.peopleIds !== null) {
               this.form.peopleIds = this.form.peopleIds.join(",");
             }
@@ -1744,7 +1737,6 @@ export default {
             this.form.bdglFoodBoardWagess = this.expenses;
             // 在食堂购物
             this.form.bdglFoodShoppings = this.canteen;
-            console.log(this.form);
             addBdglfood(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -509,7 +509,6 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      console.log(str);
       return str;
     },
     // 获取搜索下拉部门
@@ -693,7 +692,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            console.log(this.form);
             if (this.form.joinId !== undefined) {
               this.form.joinId = this.form.joinId.join(",");
             }

src/views/grassrootsregistration/bdglparty/index.vue

@@ -493,7 +493,6 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      // console.log(str);
       return str;
     },
     // 重置表单人员
@@ -661,8 +660,6 @@ export default {
               this.form.absentIds = this.form.absentIds.join(",");
             }
             updateBdglparty(this.form).then((response) => {
-              console.log(11);
-              console.log(this.form);
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -34,9 +34,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -502,7 +500,6 @@ export default {
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {
-        // console.log(response);
         this.deptOptions = response.data;
       });
     },
@@ -514,15 +511,12 @@ export default {
     },
     // 选中添加部门单位触发
     department() {
-      console.log(this.form);
       getZhuChiRen(this.form.unitId).then((res) => {
-        console.log(res);
         this.renYuan = res.data;
       });
     },
     // 选中责任人触发
     zheRenRe(name) {
-      // // console.log(val);
       // this.form.peopleId = val.id;
       this.form.peopleName = name;
     },
@@ -532,7 +526,6 @@ export default {
     },
     // 选中批准人触发
     piZhuiRen(name) {
-      // console.log(val);
       // this.form.peopleId2 = val.id;
       this.form.people2Name = name;
     },
@@ -625,7 +618,6 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglsecrecy(id).then((response) => {
-        console.log(response);
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -483,7 +483,6 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      console.log(str);
       return str;
     },
     // 搜索主持人选中触发
@@ -530,7 +529,6 @@ export default {
     //  记录人点击触发
     jiLu(name) {
       this.form.peopleJiLu = name;
-      console.log(this.form);
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -660,7 +658,6 @@ export default {
             if (this.form.absentIds !== undefined) {
               this.form.absentIds = this.form.absentIds.join(",");
             }
-            console.log(this.form);
             updateBdglsoldier(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -670,12 +667,11 @@ export default {
             (this.form.joinId = this.form.joinId.join(",")),
               (this.form.peopleIds = this.form.peopleIds.join(",")),
               (this.form.absentIds = this.form.absentIds.join(",")),
-              console.log(this.form);
-            addBdglsoldier(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              addBdglsoldier(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
           }
         }
       });

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -661,7 +661,6 @@ export default {
       }
       if (date) {
         this.tomList[i].week = this.getNowWeek(date);
-        console.log(this.getNowWeek(date));
       } else {
         this.tomList[i].week = "";
       }
@@ -876,7 +875,6 @@ export default {
       const id = row.id || this.ids;
       getBdglweekwork(id).then((response) => {
         this.wordInfo = response.data;
-        console.log(this.wordInfo);
         this.title = "查看一周工作安排";
         this.menuRoleVisible = true;
       });
@@ -889,13 +887,20 @@ export default {
     submitForm() {
       this.$refs["refform"].validate((valid) => {
         if (valid) {
-          this.form.bdglWeekworkRegisterList = this.tomList;
-          if (this.form.id != null) {
-            updateBdglweekwork(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+          if (
+            new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
+            new Date(this.gongZuoTiem) <= new Date(this.form.endTime)
+          ) {
+            this.form.bdglWeekworkRegisterList = this.tomList;
+            if (this.form.id != null) {
+              updateBdglweekwork(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
+            }
           } else {
             if (
               new Date(this.gongZuoTiem) >= new Date(this.form.startTime) &&
@@ -911,6 +916,8 @@ export default {
                   });
                 }
               }
+            } else {
+              this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
             }
           }
         }
@@ -947,7 +954,6 @@ export default {
         .catch(() => {});
     },
     datelinefun(val) {
-      console.log(val);
       if (val == "早晨") {
         this.option.start = "06:00";
         this.option.end = "08:00";

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -8,8 +8,8 @@
         </div>
         <div class="tree">
           <el-tree
-        class="userAgrees"
-         style = "height:700px;overflow:auto;"
+            class="userAgrees"
+            style="height: 700px; overflow: auto"
             :data="deptOptions"
             :props="defaultProps"
             @node-click="handleNodeClick"
@@ -972,7 +972,6 @@ export default {
       }
     });
     treeselect().then((res) => {
-      console.log(res);
       if (res.code == 200) {
         this.deptOptions = res.data;
       }
@@ -1100,7 +1099,6 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getPeople(id).then((response) => {
-        console.log(response);
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
         this.bdglPeopleList = response.data.bdglPeopleList;
@@ -1140,7 +1138,7 @@ export default {
       const deptId = row.deptId;
       getRenYuanXiangQing(deptId).then((response) => {
         this.renshu = response.data[0];
-          this.wordInfo =  response.data[1];
+        this.wordInfo = response.data[1];
         this.title = "查看人员名册";
         this.menuRoleVisible = true;
       });

src/views/materialManagement/distribution/index.vue

@@ -698,12 +698,12 @@ export default {
     // 点击选择接收人触发
     rens(data) {
       this.form.recipientId = data.id;
-      console.log(data);
+      // console.log(data);
       this.$set(this.form, "recipient", data.name);
     },
     // 点击发放对象
     dianJi(value) {
-      console.log(value);
+      // console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;

src/views/materialManagement/equipmentReceiving/index.vue

@@ -644,7 +644,7 @@ export default {
     },
     // 点击发放对象
     dianJi(value) {
-      console.log(value);
+      // console.log(value);
       if (value == "0") {
         this.danWei = false;
         this.ren = true;
@@ -671,7 +671,7 @@ export default {
     },
     // 点击物品名称触发
     wuPing(data) {
-      console.log(data);
+      // console.log(data);
       this.form.responsibilityUnit = data.responsibilityUnit;
       this.form.price = data.price;
       this.form.archivesId = data.archivesId;

src/views/materialManagement/propertyChange/index.vue

@@ -508,7 +508,7 @@ export default {
   methods: {
     // 物品名称触发
     wuPing(data) {
-      console.log(data);
+      // console.log(data);
       this.form.beforeUnitName = data.responsibilityUnit;
       this.form.beforeUnitId = data.unitId;
       this.form.beforePeopleName = data.personLiable;

src/views/medicalhealth/antiepidemicguoqi/index.vue

@@ -415,7 +415,7 @@ export default {
           cancelButtonText: "取消",
         })
         .then(() => {
-          console.log(this.form);
+          // console.log(this.form);
           this.form.state = "1";
           updateAntiepidemicputin(this.form).then((response) => {
             this.$modal.msgSuccess("销毁成功");

src/views/medicalhealth/antiepidemiclingyong/index.vue

@@ -554,7 +554,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     // 选择防疫品

src/views/medicalhealth/antiepidemicruin/index.vue

@@ -342,7 +342,7 @@ export default {
     // 获取防疫品列表
     getFang() {
       listAntiepidemicarchives().then((response) => {
-        console.log(response);
+        // console.log(response);
         this.fangList = response.rows;
       });
     },

src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -427,7 +427,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     /** 查询药品库存档案列表 */

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -369,7 +369,7 @@ export default {
     getList() {
       this.loading = true;
       exportYaoPing(this.queryParams).then((response) => {
-        console.log(response);
+        // console.log(response);
         this.bdgldurgputinList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/medicalhealth/bdgldurglingyong/index.vue

@@ -566,14 +566,14 @@ export default {
     getYaoPing() {
       exportYao().then((response) => {
         this.yaoList = response.data;
-        console.log(response.data);
+        // console.log(response.data);
       });
     },
     /** 查询药品出库登记列表 */
     getList() {
       this.loading = true;
       listBdgldurgputout(this.queryParams).then((response) => {
-        console.log(response);
+        // console.log(response);
         this.bdgldurgputoutList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -420,7 +420,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      console.log(id);
+      // console.log(id);
       getBdgldurgputin(id).then((response) => {
         this.form = response.data;
         this.getYaoPing();

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -536,7 +536,7 @@ export default {
     },
     // 新增选择单位触发
     selectPeo(val) {
-      console.log(val);
+      // console.log(val);
       this.form.unitId1 = val.id;
       this.form.unitName1 = val.label;
       // 选中单位触发获取人员

src/views/medicalhealth/bdgldurgruin/index.vue

@@ -347,7 +347,7 @@ export default {
     // 获取药品名称
     getYaoPingMingCheng() {
       listBdgldurgarchives().then((response) => {
-        console.log(response);
+        // console.log(response);
         this.yaoList = response.rows;
       });
     },

src/views/medicalhealth/consumelingyong/index.vue

@@ -630,7 +630,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     /** 查询耗材出库登记列表 */

src/views/medicalhealth/consumeputout/index.vue

@@ -643,7 +643,7 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.deptOptions = response.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     /** 查询耗材出库登记列表 */

src/views/medicalhealth/consumeruin/index.vue

@@ -346,7 +346,7 @@ export default {
     // 获取耗材名称列表
     getHaoList() {
       listArchives().then((response) => {
-        console.log(response);
+        // console.log(response);
         this.haoList = response.rows;
       });
     },

src/views/medicalhealth/examine/index.vue

@@ -494,7 +494,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            console.log(this.form);
+            // console.log(this.form);
             updateExamine(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -130,9 +130,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -174,7 +172,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -457,7 +455,6 @@ export default {
     // 获取车牌号列表
     getCarPai() {
       listPrivateCar().then((response) => {
-        console.log(response);
         this.carList = response.rows;
       });
     },
@@ -621,7 +618,6 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -739,9 +735,9 @@ export default {
   color: #bdbdbd4f !important;
 }
 ::v-deep .el-input__inner {
-    border: 1px solid white !important;
+  border: 1px solid white !important;
 }
-.box{
+.box {
   background-color: #ffba00 !important;
 }
 </style>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -376,13 +376,11 @@ export default {
     },
     // 车牌号触发
     carPaiHao(data) {
-      console.log(data);
       // this.form.vehiclenumber = name;
     },
     // 查询车牌号列表
     getCarPaiList() {
       listThebus().then((response) => {
-        console.log(response);
         this.carList = response.rows;
       });
     },

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -1087,7 +1087,7 @@ export default {
     // 审批通过
     submitFormShenPi() {
       if (this.form.shenpijiedian == "1") {
-        console.log("营级");
+        // console.log("营级");
         this.form.isTongguo = "0";
         if (this.form.id != null) {
           exportThebusYin(this.form).then((response) => {
@@ -1098,7 +1098,7 @@ export default {
           return;
         }
       } else if (this.form.shenpijiedian == "2") {
-        console.log("初级");
+        // console.log("初级");
         this.form.isTongguo = "0";
         exportThebusChu(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
@@ -1108,7 +1108,7 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "3") {
         this.form.isTongguo = "0";
-        console.log("一级");
+        // console.log("一级");
         exportThebusOne(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1117,7 +1117,7 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "4") {
         this.form.isTongguo = "0";
-        console.log("二级");
+        // console.log("二级");
         exportThebusTwo(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1126,7 +1126,7 @@ export default {
         return;
       } else if (this.form.shenpijiedian == "5") {
         this.form.isTongguo = "0";
-        console.log("三级");
+        // console.log("三级");
         exportThebusThree(this.form).then((response) => {
           this.$modal.msgSuccess("审批成功");
           this.getList();
@@ -1183,7 +1183,7 @@ export default {
     },
     // 审批按钮
     handleShenPi(row) {
-      console.log(row);
+      // console.log(row);
       this.reset();
       this.getTreeList();
       this.getYingJi();
@@ -1212,7 +1212,7 @@ export default {
     // 获取审批模板列表
     getShenPi() {
       listThebusConfig().then((response) => {
-        console.log();
+        // console.log();
         this.shenPi = response.rows;
       });
     },
@@ -1253,11 +1253,11 @@ export default {
     getList() {
       this.loading = true;
       listThebusApply(this.queryParams).then((response) => {
-        console.log(
-          (response.rows.unitPeopleState == "1" ||
-            response.rows.status == "1") &&
-            response.rows.isCaoZuo != null
-        );
+        // console.log(
+        //   (response.rows.unitPeopleState == "1" ||
+        //     response.rows.status == "1") &&
+        //     response.rows.isCaoZuo != null
+        // );
         this.thebusApplyList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -631,7 +631,7 @@ export default {
       });
     },
     chuche(data) {
-      console.log(data);
+      // console.log(data);
     },
     // 获取搜索所有人
     getSuo() {

src/views/peopleChuRu/bdglLeave/index.vue

@@ -880,7 +880,6 @@ export default {
         .then(() => {
           if (this.form.id != null) {
             this.form.rejoin = "1";
-            console.log(this.form, 1);
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("归队成功");
               this.getList();
@@ -991,7 +990,6 @@ export default {
     getList() {
       this.loading = true;
       listBdglLeave(this.queryParams).then((response) => {
-        console.log(response);
         this.bdglLeaveList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/peopleChuRu/leaveOne/index.vue

@@ -851,7 +851,6 @@ export default {
       this.form.unitId = data.id;
       this.getYong(this.form.unitId);
       this.getRen(this.form.unitId, 0);
-      console.log(1);
     },
     // 重置表单人员
     ChongZhiRen() {

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -355,7 +355,6 @@ export default {
     },
     // 请假人选中
     jieRen(name, rankId, jobTitle, data) {
-      console.log(data);
       // console.log(name, rankId, jobTitle);
       this.form.transferPeople = name;
       this.form.rankId = rankId;
@@ -501,7 +500,6 @@ export default {
     },
     // 点击归队弹出询问框
     handle(row) {
-      console.log(row);
       this.form.id = row.id;
       this.$confirm("是否确认归队？", {
         confirmButtonText: "确定",

src/views/phone/cabinet/index.vue

@@ -0,0 +1,344 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="手机柜编号" prop="number">
+        <el-input
+          v-model="queryParams.number"
+          placeholder="请输入手机柜编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机柜位置" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入手机柜位置"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="格子数量" prop="gridNumber">
+        <el-input
+          v-model="queryParams.gridNumber"
+          placeholder="请输入格子数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="存放数量" prop="storageQuantity">
+        <el-input
+          v-model="queryParams.storageQuantity"
+          placeholder="请输入存放数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="异常数量" prop="exceptionsNumber">
+        <el-input
+          v-model="queryParams.exceptionsNumber"
+          placeholder="请输入异常数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属单位id" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入所属单位id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属单位名称" prop="unitName">
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请输入所属单位名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['phone:cabinet:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['phone:cabinet:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['phone:cabinet:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['phone:cabinet:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="cabinetList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="手机柜编号" align="center" prop="number" />
+      <el-table-column label="手机柜位置" align="center" prop="address" />
+      <el-table-column label="格子数量" align="center" prop="gridNumber" />
+      <el-table-column label="存放数量" align="center" prop="storageQuantity" />
+      <el-table-column label="异常数量" align="center" prop="exceptionsNumber" />
+      <el-table-column label="所属单位id" align="center" prop="unitId" />
+      <el-table-column label="所属单位名称" align="center" prop="unitName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['phone:cabinet:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['phone:cabinet:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改手机柜对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="手机柜编号" prop="number">
+          <el-input v-model="form.number" placeholder="请输入手机柜编号" />
+        </el-form-item>
+        <el-form-item label="手机柜位置" prop="address">
+          <el-input v-model="form.address" placeholder="请输入手机柜位置" />
+        </el-form-item>
+        <el-form-item label="格子数量" prop="gridNumber">
+          <el-input v-model="form.gridNumber" placeholder="请输入格子数量" />
+        </el-form-item>
+        <el-form-item label="存放数量" prop="storageQuantity">
+          <el-input v-model="form.storageQuantity" placeholder="请输入存放数量" />
+        </el-form-item>
+        <el-form-item label="异常数量" prop="exceptionsNumber">
+          <el-input v-model="form.exceptionsNumber" placeholder="请输入异常数量" />
+        </el-form-item>
+        <el-form-item label="所属单位id" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入所属单位id" />
+        </el-form-item>
+        <el-form-item label="所属单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入所属单位名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCabinet, getCabinet, delCabinet, addCabinet, updateCabinet, exportCabinet } from "@/api/phone/cabinet";
+
+export default {
+  name: "Cabinet",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 手机柜表格数据
+      cabinetList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        number: null,
+        address: null,
+        gridNumber: null,
+        storageQuantity: null,
+        exceptionsNumber: null,
+        unitId: null,
+        unitName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询手机柜列表 */
+    getList() {
+      this.loading = true;
+      listCabinet(this.queryParams).then(response => {
+        this.cabinetList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        number: null,
+        address: null,
+        gridNumber: null,
+        storageQuantity: null,
+        exceptionsNumber: null,
+        unitId: null,
+        unitName: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加手机柜";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCabinet(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改手机柜";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCabinet(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCabinet(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除手机柜编号为"' + ids + '"的数据项？').then(function() {
+        return delCabinet(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有手机柜数据项？').then(() => {
+        this.exportLoading = true;
+        return exportCabinet(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/phone/grid/index.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="手机柜id" prop="phoneCabinetId">
+        <el-input
+          v-model="queryParams.phoneCabinetId"
+          placeholder="请输入手机柜id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属人姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入所属人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="格子编号" prop="gridNumber">
+        <el-input
+          v-model="queryParams.gridNumber"
+          placeholder="请输入格子编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="格子状态" prop="latticeState">
+        <el-input
+          v-model="queryParams.latticeState"
+          placeholder="请输入格子状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['phone:grid:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['phone:grid:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['phone:grid:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['phone:grid:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="gridList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="手机柜id" align="center" prop="phoneCabinetId" />
+      <el-table-column label="所属人姓名" align="center" prop="name" />
+      <el-table-column label="格子编号" align="center" prop="gridNumber" />
+      <el-table-column label="格子状态" align="center" prop="latticeState" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['phone:grid:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['phone:grid:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改手机柜格子对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="手机柜id" prop="phoneCabinetId">
+          <el-input v-model="form.phoneCabinetId" placeholder="请输入手机柜id" />
+        </el-form-item>
+        <el-form-item label="所属人姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入所属人姓名" />
+        </el-form-item>
+        <el-form-item label="格子编号" prop="gridNumber">
+          <el-input v-model="form.gridNumber" placeholder="请输入格子编号" />
+        </el-form-item>
+        <el-form-item label="格子状态" prop="latticeState">
+          <el-input v-model="form.latticeState" placeholder="请输入格子状态" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listGrid, getGrid, delGrid, addGrid, updateGrid, exportGrid } from "@/api/phone/grid";
+
+export default {
+  name: "Grid",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 手机柜格子表格数据
+      gridList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        phoneCabinetId: null,
+        name: null,
+        gridNumber: null,
+        latticeState: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询手机柜格子列表 */
+    getList() {
+      this.loading = true;
+      listGrid(this.queryParams).then(response => {
+        this.gridList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        phoneCabinetId: null,
+        name: null,
+        gridNumber: null,
+        latticeState: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加手机柜格子";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGrid(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改手机柜格子";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGrid(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGrid(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除手机柜格子编号为"' + ids + '"的数据项？').then(function() {
+        return delGrid(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有手机柜格子数据项？').then(() => {
+        this.exportLoading = true;
+        return exportGrid(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/pt.vue

@@ -243,6 +243,20 @@
                 <a href="#" class="a">系统工具</a>
               </div>
             </li>
+            <li>
+              <div class="demo-box">
+                <div
+                  class="demo active"
+                  v-on:click="zhinengfun"
+                  data-url="/diary?ref=addtabs"
+                >
+                  <img src="../images/sx.png" alt />
+                </div>
+              </div>
+              <div class="demo-a">
+                <a href="#" class="a">智能手机柜</a>
+              </div>
+            </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
           <hr />
@@ -828,6 +842,11 @@ export default {
         .push({ path: "/index", query: { name: "/thought" } })
         .catch(() => {});
     },
+    zhinengfun() {
+      this.$router
+        .push({ path: "/index", query: { name: "/phone" } })
+        .catch(() => {});
+    },
     showfun() {
       this.open = false;
       printTriggerClear().then((res) => {

src/views/thought/responses/index.vue

@@ -266,7 +266,7 @@
             fixed="right"
             width="200"
             label="操作"
-            align="center"
+            align="left"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -397,89 +397,111 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form2"
-        :model="form"
-        :rules="rules2"
-        :inline="true"
-        label-width="100px"
-      >
-        <div class="jiben">文档信息</div>
-        <el-form-item label="计划名称" prop="planName">
-          <el-input
-            v-model="form.planName"
-            placeholder="请输入计划名称"
-            readonly
-          />
-        </el-form-item>
-        <el-form-item label="计划开始时间" prop="planStartTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划开始时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划结束时间" prop="planEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划结束时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <div class="jiben">计划简介</div>
-        <el-form-item label="" prop="planIntroduction">
-          <el-input
-            type="textarea"
-            v-model="form.planIntroduction"
-            placeholder="请输入计划简介"
-            readonly
-          />
-        </el-form-item>
-        <div class="jiben">计划条数</div>
-        <div class="jiHua">
-          <el-form v-for="(item, e) in checkShop" :key="e">
-            <el-form-item prop="remark">
+      <div class="userAgree">
+        <el-form
+          ref="form2"
+          :model="form"
+          :rules="rules2"
+          :inline="true"
+          label-width="100px"
+        >
+          <div class="jiben">文档信息</div>
+          <el-form-item label="计划名称" prop="planName">
+            <el-input
+              v-model="form.planName"
+              placeholder="请输入计划名称"
+              readonly
+            />
+          </el-form-item>
+          <el-form-item label="计划开始时间" prop="planStartTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planStartTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划开始时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划结束时间" prop="planEndTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planEndTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划结束时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <div class="jiben">计划简介</div>
+          <el-form-item label="" prop="planIntroduction">
+            <el-input
+              type="textarea"
+              v-model="form.planIntroduction"
+              placeholder="请输入计划简介"
+              readonly
+              autosize
+            />
+          </el-form-item>
+          <div class="jiben">计划条数</div>
+          <div class="jiHua">
+            <el-form v-for="(item, e) in checkShop" :key="e">
+              <span
+                style="
+                  color: #13ce66;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '1'"
+                >此条计划需各单位配合执行</span
+              >
+              <span
+                style="
+                  color: #ff4949;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '0'"
+                >此条计划非必要，各单位根据实际执行</span
+              >
+              <el-form-item prop="remark">
+                <el-input
+                  type="textarea"
+                  v-model="item.planContent"
+                  placeholder="请输入计划详情"
+                  readonly
+                  autosize
+                />
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
+          <el-form v-for="(item, i) in planResponsefus" :key="i">
+            <el-form-item prop="file">
               <el-input
-                type="textarea"
-                v-model="item.planContent"
-                placeholder="请输入计划详情"
+                label="附件名称"
+                v-model="item.fileName"
+                style="width: 260px"
                 readonly
               />
+              <a
+                :href="item.filePath"
+                download
+                title="下载"
+                style="color: white; margin-left: -58px"
+                class="downloadfile"
+                >下载附件</a
+              >
             </el-form-item>
           </el-form>
-        </div>
-        <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
-        <el-form v-for="(item, i) in planResponsefus" :key="i">
-          <el-form-item prop="file">
-            <el-input
-              label="附件名称"
-              v-model="item.fileName"
-              style="width: 260px"
-              readonly
-            />
-            <a
-              :href="item.filePath"
-              download
-              title="下载"
-              style="color: white; margin-left: -58px"
-              class="downloadfile"
-              >下载附件</a
-            >
+          <div class="jiben">审批驳回原因</div>
+          <el-form-item prop="reasons">
+            <el-input v-model="form.reasons" type="textarea" />
           </el-form-item>
         </el-form>
-        <div class="jiben">审批驳回原因</div>
-        <el-form-item prop="reasons">
-          <el-input v-model="form.reasons" type="textarea" />
-        </el-form-item>
-      </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">通过</el-button>
         <el-button @click="submitFormBoHui" size="btn">驳回</el-button>
@@ -494,91 +516,105 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form3"
-        :model="form"
-        :rules="rules3"
-        :inline="true"
-        label-width="100px"
-      >
-        <div class="jiben">文档信息</div>
-        <el-form-item label="计划名称" prop="planName">
-          <el-input
-            v-model="form.planName"
-            placeholder="请输入计划名称"
-            readonly
-          />
-        </el-form-item>
-        <el-form-item label="计划开始时间" prop="planStartTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planStartTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划开始时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划结束时间" prop="planEndTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.planEndTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择计划结束时间"
-            readonly
-          ></el-date-picker>
-        </el-form-item>
-        <div class="jiben">计划简介</div>
-        <el-form-item label="" prop="planIntroduction">
-          <el-input
-            type="textarea"
-            v-model="form.planIntroduction"
-            placeholder="请输入计划简介"
-            readonly
-          />
-        </el-form-item>
-        <div class="jiben">计划条数</div>
-        <div class="jiHua">
-          <el-form v-for="(item, e) in checkShop" :key="e">
-            <el-form-item prop="remark">
-              <el-input
-                type="textarea"
-                v-model="item.planContent"
-                placeholder="请输入计划详情"
-                readonly
-              />
-              <span style="color: #fff" v-if="item.isresponse == '1'"
+      <div class="userAgree">
+        <el-form
+          ref="form3"
+          :model="form"
+          :rules="rules3"
+          :inline="true"
+          label-width="100px"
+        >
+          <div class="jiben">文档信息</div>
+          <el-form-item label="计划名称" prop="planName">
+            <el-input
+              v-model="form.planName"
+              placeholder="请输入计划名称"
+              readonly
+            />
+          </el-form-item>
+          <el-form-item label="计划开始时间" prop="planStartTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planStartTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划开始时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划结束时间" prop="planEndTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.planEndTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择计划结束时间"
+              readonly
+            ></el-date-picker>
+          </el-form-item>
+          <div class="jiben">计划简介</div>
+          <el-form-item label="" prop="planIntroduction">
+            <el-input
+              type="textarea"
+              v-model="form.planIntroduction"
+              placeholder="请输入计划简介"
+              readonly
+            />
+          </el-form-item>
+          <div class="jiben">计划条数</div>
+          <div class="jiHua">
+            <el-form v-for="(item, e) in checkShop" :key="e">
+              <span
+                style="
+                  color: #13ce66;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '1'"
                 >此条计划需各单位配合执行</span
               >
-              <span style="color: #fff" v-if="item.isresponse == '0'"
+              <span
+                style="
+                  color: #ff4949;
+                  margin-bottom: 9px;
+                  display: inline-block;
+                "
+                v-if="item.isresponse == '0'"
                 >此条计划非必要，各单位根据实际执行</span
               >
+              <el-form-item prop="remark">
+                <el-input
+                  type="textarea"
+                  v-model="item.planContent"
+                  placeholder="请输入计划详情"
+                  readonly
+                />
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
+          <el-form v-for="(item, i) in planResponsefus" :key="i">
+            <el-form-item prop="file">
+              <el-input
+                label="附件名称"
+                v-model="item.fileName"
+                style="width: 260px"
+                readonly
+              />
+              <a
+                :href="item.filePath"
+                download
+                title="下载"
+                style="color: white; margin-left: -58px"
+                class="downloadfile"
+                >下载附件</a
+              >
             </el-form-item>
           </el-form>
-        </div>
-        <div class="jiben" v-if="planResponsefus.length != 0">文件</div>
-        <el-form v-for="(item, i) in planResponsefus" :key="i">
-          <el-form-item prop="file">
-            <el-input
-              label="附件名称"
-              v-model="item.fileName"
-              style="width: 260px"
-              readonly
-            />
-            <a
-              :href="item.filePath"
-              download
-              title="下载"
-              style="color: white; margin-left: -58px"
-              class="downloadfile"
-              >下载附件</a
-            >
-          </el-form-item>
         </el-form>
-      </el-form>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -1153,9 +1189,9 @@ export default {
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
-.app-container {
+/* .app-container {
   display: flex;
-}
+} */
 /* 左侧树状盒子 */
 .app-container .box-lfet {
   width: 15%;

web-types-npm-loader.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="WebTypesNpmLoader">
+    <enabled />
+  </component>
+</application>