Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

src/plugins/axios.js

@@ -47,10 +47,10 @@ function nowTime () {//获取当前时间
 }
 let reqParam = {   // 用户操作日志
   logUserIp: localStorage.getItem("userIP"), // 操作人ip地址
-  // logUserName: JSON.parse(localStorage.getItem("userInfo")).name || "", // 操作人姓名
-  // logUserId: JSON.parse(localStorage.getItem("userInfo")).id || "", // 操作人id
-  // logDwCode: JSON.parse(localStorage.getItem("userInfo")).unitCode || "", // 日志单位代码
-  // logDwName: JSON.parse(localStorage.getItem("userInfo")).unitName || "", // 日志单位名称
+  logUserName: JSON.parse(localStorage.getItem("userInfo")) ? JSON.parse(localStorage.getItem("userInfo")).name : "", // 操作人姓名
+  logUserId: JSON.parse(localStorage.getItem("userInfo")) ? JSON.parse(localStorage.getItem("userInfo")).id : "", // 操作人id
+  logDwCode: JSON.parse(localStorage.getItem("userInfo")) ? JSON.parse(localStorage.getItem("userInfo")).unitCode : "", // 日志单位代码
+  logDwName: JSON.parse(localStorage.getItem("userInfo")) ? JSON.parse(localStorage.getItem("userInfo")).unitName : "", // 日志单位名称
   logTime: nowTime()
 }
 let userInfo = Base64.encode(JSON.stringify(reqParam))

src/views/SystemManage/systemLog.vue

 <template>
   <div class='systemLog'>
     <div class="head">
-      <!-- <el-form
-        :model="queryParams"
+      <el-form
+        :model="systemLogParam"
         ref="queryForm"
         :inline="true"
-        label-width="100px"
+        class="queryForm"
       >
-        <el-form-item label="查询模板：">
-          <el-select
-            v-model="queryParams.code"
-            placeholder="请选择参数2"
-            clearable
-            size="small"
-          >
-            <el-option
-              v-for="dict in codeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            />
-          </el-select>
+        <div class="headLeft">
+          <el-form-item label="查询单位：">
+            <Cascader
+              :form="systemLogParam"
+              id="logDwCode"
+            ></Cascader>
           </el-form-item>
-
-        <el-form-item label="采集时间：">
+          <el-form-item label="查询日期：">
             <el-date-picker
-            v-model="queryParams.value1"
+              v-model="cxsj"
               type="date"
               placeholder="选择日期"
             >
             </el-date-picker>
           </el-form-item>
-        <el-form-item
-          label="采集单位："
-          prop="orgLevel"
-        >
-          <el-select
-            v-model="queryParams.code"
-            placeholder="请选择参数2"
-            clearable
-            size="small"
-          >
-            <el-option
-              v-for="dict in codeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label='采集方式：'>
-          <el-checkbox-group
-            v-model="queryParams.checkboxGroup1"
-            size="small"
-          >
-            <el-checkbox
-              label="1"
-              border
-            >捺印指掌纹</el-checkbox>
-            <el-checkbox
-              label="2"
-              border
-            >现场指掌纹</el-checkbox>
-          </el-checkbox-group>
-
-        </el-form-item>
-        <el-form-item>
-          <el-checkbox v-model="queryParams.checked">上报全国指掌纹</el-checkbox>
-        </el-form-item>
+        </div>
+        <div class='headRight'>
           <el-form-item>
             <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
+              type="text"
+              class="qk"
             >清空</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-          >查询</el-button>
+            <el-button class="cx">查询</el-button>
           </el-form-item>
-      </el-form> -->
+        </div>
+      </el-form>
     </div>
   </div>
 </template>
 <script>
+import Cascader from "@/components/Cascader.vue";
 export default {
-  name: "systemLog"
+  name: "systemLog",
+  components: {
+    Cascader,
+  },
+  data () {
+    return {
+      systemLogParam: {
+        logDwCode: '', // 查询单位代码
+        logTimeStart: '', // 开始时间
+        logTimeEnd: '',// 结束时间
+        pageSize: "",// 显示条数
+        currPage: '',// 当前页码
+      },
+      cxsj: '', // 查询时间
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -102,6 +68,11 @@ export default {
     border-radius: 10px;
     padding: 24px;
     box-sizing: border-box;
+    .queryForm {
+      display: flex;
+      justify-content: space-between;
+    }
   }
 }
+@import "@/assets/css/globalBase.scss";
 </style>
\ No newline at end of file