diff --git a/package.json b/package.json index 9ecdd713d..52c1b5237 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,8 @@ "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.7", "vuex": "^3.1.1", - "xlsx": "^0.17.1" + "xlsx": "^0.17.1", + "dayjs": "^1.11.7" }, "devDependencies": { "@antv/f2": "^3.8.10-beta.1", diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index f4a97f58d..72fd63f78 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -159,8 +159,17 @@ margin-left: 20px; } } +.flex{ + display: flex; + flex-flow: wrap; + width: 100%; + .item{ + margin-right: 10px; + } +} + .cell-width-1{ - width: 250px + width: 210px } .cell-width-long{ width: 450px @@ -176,6 +185,9 @@ margin-left: 10px; width: 150px; } +.item_width_4 { + width: 140px; +} .process-form{ margin-top:20px; diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js index 2fb8f7966..26a482aa8 100644 --- a/src/js/columns/constants/index.js +++ b/src/js/columns/constants/index.js @@ -33,6 +33,16 @@ export const binaryOptionList = [ value: 0 } ] +export const binaryOptionListReverse = [ + { + label: '是', + value: 0 + }, + { + label: '否', + value: 1 + } +] export const politicsStatusList = [ { label: '中国共产党党员', @@ -115,4 +125,61 @@ export const completeList = [ label: '已完成并取消风险标记', value: 2 } -] \ No newline at end of file +] +export const nonComplianceType = [ + { + label: '已进入信访程序', + value: 0 + }, + { + label: '已进入诉讼、仲裁、纪检监察、行政、复议政府信息公开等程序', + value: 1 + }, + { + label: '不符合法律、法规、规章及政策规定', + value: 2 + }, + { + label: '涉及国家秘密、工作秘密、商业秘密、个人隐私', + value: 3 + }, + { + label: '违反社会工序良俗等其他情况', + value: 4 + } +] +export const satisfactionType = [ + { + label: '满意', + value: 0 + }, + { + label: '基本满意', + value: 1 + }, + { + label: '不满意', + value: 2 + } +] +export const noSatisfactionType = [ + { + label: '未回复', + value: 0 + }, { + label: '服务态度差', + value: 1 + }, + { + label: '推诿扯皮', + value: 2 + }, + { + label: '处理不及时', + value: 3 + }, + { + label: '其他', + value: 4 + } +] \ No newline at end of file diff --git a/src/main.js b/src/main.js index 06b3688d0..d6aa150ef 100644 --- a/src/main.js +++ b/src/main.js @@ -48,6 +48,7 @@ import PopTips from "@/components/PopTips/index.vue"; import PopHomeTip from "@/components/PopHomeTip/index.vue"; import NameSplit from "@/components/NameSplit/index.vue"; import RelationGraph from "relation-graph"; +import dayjs from 'dayjs' // import AddNodeJw from "@/components/JwTree/addNode.vue"; //按钮 @@ -103,7 +104,7 @@ Vue.directive("fixed", { // 挂载全局 Vue.prototype.$http = http; Vue.prototype.$sensitive = desensitization; - +Vue.prototype.$dayjs = dayjs // el-uploader的header配置 Vue.prototype.$getElUploadHeaders = () => ({ Authorization: localStorage.getItem("token") || "", diff --git a/src/views/dataBoardMain/main-content.vue b/src/views/dataBoardMain/main-content.vue index bfd60db95..b82eb2390 100644 --- a/src/views/dataBoardMain/main-content.vue +++ b/src/views/dataBoardMain/main-content.vue @@ -1,7 +1,7 @@