diff --git a/src/api/bigScreen/userDictionary/type.js b/src/api/bigScreen/userDictionary/type.js
new file mode 100644
index 0000000..de1c48c
--- /dev/null
+++ b/src/api/bigScreen/userDictionary/type.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/hx/dict/list',
+    params: query
+  })
+}
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/hx/dict?hxDictId=' + dictId,
+    method: 'delete'
+  })
+}
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/hx/dict',
+    method: 'post',
+    data: data
+  })
+}
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/hx/dict',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 4369c8d..c139f52 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,6 +64,11 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/bigScreen/information/index'], resolve),
         name: 'information',
       },
+      {
+        path: 'userDictionary',
+        component: (resolve) => require(['@/views/bigScreen/userDictionary/index'], resolve),
+        name: 'userDictionary',
+      },
     ]
   },
   {
diff --git a/src/views/bigScreen/userDictionary/data.vue b/src/views/bigScreen/userDictionary/data.vue
new file mode 100644
index 0000000..85c6805
--- /dev/null
+++ b/src/views/bigScreen/userDictionary/data.vue
@@ -0,0 +1,360 @@
+<template>
+  <div class="">
+    <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="['system:dict: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="['system:dict: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="['system:dict:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="50" align="center" /> -->
+      <el-table-column label="序号" width="80" align="center" prop="id" />
+      <!-- <el-table-column label="字典标签" width="80" align="center" prop="dictLabel">
+        <template slot-scope="scope">
+          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="字典内容" :show-overflow-tooltip="true" align="center" prop="name" />
+      <!-- <el-table-column label="字典键值" width="80" align="center" prop="dictValue" />
+      <el-table-column label="字典排序" width="80" align="center" prop="dictSort" />
+      <el-table-column label="状态" width="70" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column label="备注" width="90" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <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="['system:dict:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dict: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="字典名称">
+          <el-input v-model="dictName" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="字典内容" prop="name">
+          <el-input v-model="form.name" placeholder="请输入字典内容" />
+        </el-form-item>
+        <!-- <el-form-item label="数据标签" prop="dictLabel">
+          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+        </el-form-item>
+        <el-form-item label="数据键值" prop="dictValue">
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+        </el-form-item>
+        <el-form-item label="样式属性" prop="cssClass">
+          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+        </el-form-item>
+        <el-form-item label="显示排序" prop="dictSort">
+          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="回显样式" prop="listClass">
+          <el-select v-model="form.listClass">
+            <el-option
+              v-for="item in listClassOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <!-- <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </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 { listData, getData, delData, addData, updateData, exportData } from "@/api/system/dict/data";
+import { listType, getType, delType, addType, updateType, exportType, refreshCache } from '@/api/bigScreen/userDictionary/type'
+// import { listType, getType,optionselect } from "@/api/system/dict/type";
+
+export default {
+  name: "Data",
+  dicts: ['sys_normal_disable'],
+  props: {
+		dictId: {
+			type: Number,
+			require: true,
+		},
+    dictName:{
+			type: String,
+			require: true,
+		},
+	},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      dataList: [],
+      // 默认字典类型
+      defaultDictType: "",
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据标签回显样式
+      listClassOptions: [
+        {
+          value: "default",
+          label: "默认"
+        },
+        {
+          value: "primary",
+          label: "主要"
+        },
+        {
+          value: "success",
+          label: "成功"
+        },
+        {
+          value: "info",
+          label: "信息"
+        },
+        {
+          value: "warning",
+          label: "警告"
+        },
+        {
+          value: "danger",
+          label: "危险"
+        }
+      ],
+      // 类型数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        parentId: undefined,
+        dictName: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictLabel: [
+          { required: true, message: "数据标签不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "字典内容不能为空", trigger: "blur" }
+        ],
+        dictSort: [
+          { required: true, message: "数据顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  watch: {
+		dictId(newVal, oldVal) {
+			// this.getType(newVal)
+      this.queryParams.parentId = newVal
+      this.getList();
+		},
+	},
+  created() {
+    this.queryParams.parentId = this.dictId
+		// this.getType(this.dictId)
+		// this.getTypeList()
+    this.getList();
+  },
+  methods: {
+    /** 查询字典类型详细 */
+    // getType(dictId) {
+    //   getType(dictId).then(response => {
+    //     this.queryParams.parentId = response.data.parentId;
+    //     this.defaultDictType = response.data.parentId;
+    //     this.getList();
+    //   });
+    // },
+    /** 查询字典类型列表 */
+    // getTypeList() {
+    //   optionselect().then(response => {
+    //     this.typeOptions = response.data;
+    //   });
+    // },
+    /** 查询字典数据列表 */
+    getList() {
+      this.loading = true;
+      listType(this.queryParams).then(response => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        dictLabel: undefined,
+        name: undefined,
+        cssClass: undefined,
+        listClass: 'default',
+        dictSort: 0,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.parentId = this.defaultDictType;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典数据";
+      this.form.parentId = this.queryParams.parentId;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form = Object.assign({},row);
+      this.open = true;
+      this.title = "修改字典数据";
+      // const id = row.id || this.ids
+      // getData(id).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改字典数据";
+      // });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addType(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictCodes = row.id || this.ids;
+      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
+        return delType(dictCodes);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/bigScreen/userDictionary/index.vue b/src/views/bigScreen/userDictionary/index.vue
new file mode 100644
index 0000000..e7aeb43
--- /dev/null
+++ b/src/views/bigScreen/userDictionary/index.vue
@@ -0,0 +1,367 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" @submit.native.prevent label-width="68px">
+			<el-form-item label="字典名称" prop="name">
+				<el-input
+					v-model="queryParams.name"
+					placeholder="请输入字典名称"
+					clearable
+					size="small"
+					style="width: 240px"
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<!-- <el-form-item label="字典类型" prop="dictType">
+				<el-input
+					v-model="queryParams.dictType"
+					placeholder="请输入字典类型"
+					clearable
+					size="small"
+					style="width: 240px"
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="状态" prop="status">
+				<el-select v-model="queryParams.status" placeholder="字典状态" clearable size="small" style="width: 240px">
+					<el-option
+						v-for="dict in dict.type.sys_normal_disable"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value"
+					/>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="创建时间">
+				<el-date-picker
+					v-model="dateRange"
+					size="small"
+					style="width: 240px"
+					value-format="yyyy-MM-dd"
+					type="daterange"
+					range-separator="-"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期"
+				></el-date-picker>
+			</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="20">
+			<el-col :span="12">
+				<el-card>
+          <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="['system:dict: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="['system:dict: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="['system:dict:remove']"
+							>删除</el-button
+						>
+					</el-col>
+					<el-col :span="1.5">
+						<el-button
+							type="danger"
+							plain
+							icon="el-icon-refresh"
+							size="mini"
+							@click="handleRefreshCache"
+							v-hasPermi="['system:dict:remove']"
+							>刷新缓存</el-button
+						>
+					</el-col> -->
+					<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+				</el-row>
+
+				<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange" @row-click="handleRow">
+					<!-- <el-table-column type="selection" width="50" align="center" /> -->
+					<el-table-column label="序号" width="80" align="center" prop="id" />
+					<el-table-column label="字典名称" align="center" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+							<el-link type="primary" :underline="false" @click="handleShowDic(scope.row)">{{
+								scope.row.name
+							}}</el-link>
+						</template>
+          </el-table-column>
+					<!-- <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+						<template slot-scope="scope">
+							<el-link type="primary" :underline="false" @click="handleShowDic(scope.row.id)">{{
+								scope.row.dictType
+							}}</el-link>
+						</template>
+					</el-table-column>
+					<el-table-column label="状态" width="70" align="center" prop="status">
+						<template slot-scope="scope">
+							<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+						</template>
+					</el-table-column>
+					<el-table-column label="备注" width="90" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
+					<el-table-column label="创建时间" align="center" prop="createTime">
+						<template slot-scope="scope">
+							<span>{{ parseTime(scope.row.createTime) }}</span>
+						</template>
+					</el-table-column>
+					<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.stop="handleUpdate(scope.row)"
+								v-hasPermi="['system:dict:edit']"
+								>修改</el-button
+							>
+							<el-button
+								size="mini"
+								type="text"
+								icon="el-icon-delete"
+								@click.stop="handleDelete(scope.row)"
+								v-hasPermi="['system:dict: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-card>
+			</el-col>
+			<el-col :span="12">
+				<el-card>
+          <dict-data :dictId="rowData.id" :dictName="rowData.name" v-if="rowData.id" />
+				  <el-empty description="" v-else></el-empty>
+        </el-card>
+			</el-col>
+		</el-row>
+
+		<!-- 添加或修改参数配置对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px" @submit.native.prevent>
+				<el-form-item label="字典名称" prop="name">
+					<el-input v-model="form.name" placeholder="请输入字典名称" />
+				</el-form-item>
+				<!-- <el-form-item label="字典类型" prop="dictType">
+					<el-input v-model="form.dictType" placeholder="请输入字典类型" />
+				</el-form-item> -->
+				<!-- <el-form-item label="状态" prop="status">
+					<el-radio-group v-model="form.status">
+						<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+							dict.label
+						}}</el-radio>
+					</el-radio-group>
+				</el-form-item> -->
+				<!-- <el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+				</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 { listType, getType, delType, addType, updateType, exportType, refreshCache } from '@/api/bigScreen/userDictionary/type'
+import DictData from './data'
+export default {
+	name: 'Dict',
+	dicts: ['sys_normal_disable'],
+	components: { DictData },
+	data() {
+		return {
+      value:undefined,
+      option:{
+        1:'第一个',
+        2:'第二个',
+      },
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 字典表格数据
+			typeList: [],
+			// 弹出层标题
+			title: '',
+			// 是否显示弹出层
+			open: false,
+			// 日期范围
+			dateRange: [],
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+        parentId: 0,
+				name: undefined,
+				dictType: undefined,
+				status: undefined,
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				name: [{ required: true, message: '字典名称不能为空', trigger: 'blur' }],
+				dictType: [{ required: true, message: '字典类型不能为空', trigger: 'blur' }],
+			},
+			rowData: {},
+		}
+	},
+	created() {
+		this.getList()
+	},
+	methods: {
+		/** 查询字典类型列表 */
+		getList() {
+			this.loading = true
+			listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+				this.typeList = response.rows
+				this.total = response.total
+				this.loading = false
+			})
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false
+			this.reset()
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				id: undefined,
+				name: undefined,
+				dictType: undefined,
+        parentId: 0,
+				status: '0',
+				remark: undefined,
+			}
+			this.resetForm('form')
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.dateRange = []
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset()
+			this.open = true
+			this.title = '添加字典类型'
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.id)
+			this.single = selection.length != 1
+			this.multiple = !selection.length
+		},
+    handleRow(row, column, event){
+      this.handleShowDic(row)
+    },
+		handleShowDic(row) {
+      this.rowData = row
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset()
+      this.form = Object.assign({},row)
+      this.open = true
+			this.title = '修改字典类型'
+			// const id = row.id || this.ids
+			// getType(id).then(response => {
+			// 	this.form = response.data
+			// 	this.open = true
+			// 	this.title = '修改字典类型'
+			// })
+		},
+		/** 提交按钮 */
+		submitForm: function () {
+			this.$refs['form'].validate(valid => {
+				if (valid) {
+					if (this.form.id != undefined) {
+						updateType(this.form).then(response => {
+							this.$modal.msgSuccess('修改成功')
+							this.open = false
+							this.getList()
+						})
+					} else {
+						addType(this.form).then(response => {
+							this.$modal.msgSuccess('新增成功')
+							this.open = false
+							this.getList()
+						})
+					}
+				}
+			})
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const dictIds = row.id || this.ids
+			this.$modal
+				.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？')
+				.then(function () {
+					return delType(dictIds)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+				.catch(() => {})
+		},
+		/** 刷新缓存按钮操作 */
+		handleRefreshCache() {
+			refreshCache().then(() => {
+				this.$modal.msgSuccess('刷新成功')
+			})
+		},
+	},
+}
+</script>