diff --git a/public/index.html b/public/index.html index a4234806f..9658d8771 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,5 @@ - + @@ -9,15 +9,65 @@ 标准法规管理系统 - - + + + +
+ + diff --git a/public/static/images/BG.png b/public/static/images/BG.png new file mode 100644 index 000000000..bcdbfd0dc Binary files /dev/null and b/public/static/images/BG.png differ diff --git a/public/static/images/logo2.png b/public/static/images/logo2.png new file mode 100644 index 000000000..d6819be30 Binary files /dev/null and b/public/static/images/logo2.png differ diff --git a/public/static/polyfill/proxy.min.js b/public/static/polyfill/proxy.min.js new file mode 100644 index 000000000..55b602cf5 --- /dev/null +++ b/public/static/polyfill/proxy.min.js @@ -0,0 +1,4 @@ +(function(){function l(){function n(a){return a?"object"===typeof a||"function"===typeof a:!1}var p=null;var g=function(a,b){function f(){}if(!n(a)||!n(b))throw new TypeError("Cannot create proxy with a non-object as target or handler");p=function(){f=function(a){throw new TypeError("Cannot perform '"+a+"' on a proxy that has been revoked");}};var e=b;b={get:null,set:null,apply:null,construct:null};for(var k in e){if(!(k in b))throw new TypeError("Proxy polyfill does not support trap '"+k+"'");b[k]=e[k]}"function"=== +typeof e&&(b.apply=e.apply.bind(e));var c=this,g=!1,q=!1;"function"===typeof a?(c=function(){var h=this&&this.constructor===c,d=Array.prototype.slice.call(arguments);f(h?"construct":"apply");return h&&b.construct?b.construct.call(this,a,d):!h&&b.apply?b.apply(a,this,d):h?(d.unshift(a),new (a.bind.apply(a,d))):a.apply(this,d)},g=!0):a instanceof Array&&(c=[],q=!0);var r=b.get?function(a){f("get");return b.get(this,a,c)}:function(a){f("get");return this[a]},v=b.set?function(a,d){f("set");b.set(this, +a,d,c)}:function(a,b){f("set");this[a]=b},t={};Object.getOwnPropertyNames(a).forEach(function(b){if(!((g||q)&&b in c)){var d={enumerable:!!Object.getOwnPropertyDescriptor(a,b).enumerable,get:r.bind(a,b),set:v.bind(a,b)};Object.defineProperty(c,b,d);t[b]=!0}});e=!0;Object.setPrototypeOf?Object.setPrototypeOf(c,Object.getPrototypeOf(a)):c.__proto__?c.__proto__=a.__proto__:e=!1;if(b.get||!e)for(var m in a)t[m]||Object.defineProperty(c,m,{get:r.bind(a,m)});Object.seal(a);Object.seal(c);return c};g.revocable= +function(a,b){return{proxy:new g(a,b),revoke:p}};return g};var u="undefined"!==typeof process&&"[object process]"==={}.toString.call(process)||"undefined"!==typeof navigator&&"ReactNative"===navigator.product?global:self;u.Proxy||(u.Proxy=l(),u.Proxy.revocable=u.Proxy.revocable);})() diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index 0f2f85177..299f05416 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -315,6 +315,8 @@ tr.el-table__row{ padding: 13px 10px; height: 49px; border: none; + font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; + font-weight: lighter; } } .el-input-number{ diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index e6509d179..ce4b62ae6 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -3,7 +3,7 @@
- {{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + {{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName}}》 企标详情 {{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }} diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index cefcccc97..70e45f5a8 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -5,7 +5,7 @@
{{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber - }} 《{{ sarStandardsInfoEO.standName }}》 + }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》 {{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index a6abfb1d9..441f7146a 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -19,7 +19,7 @@ 清空 - 提问 + 提问
@@ -1321,6 +1321,7 @@ export default { answerList: [], standList: [], questionsList: [], + standMap: new Map() } }, mounted(){ @@ -1352,6 +1353,12 @@ export default { } }, methods:{ + refreshStandMap(){ + this.standMap = new Map() + this.standList.forEach(item=>{ + this.standMap.set(item.standardId,item) + }) + }, checkedRole(data){ if(data[0].id){ let asdId = sessionStorage.getItem('queId') @@ -1666,15 +1673,16 @@ export default { queBtn(){ this.fileList = [] // 清空提问 - this.standType = "INLAND" + const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification this.questionForm = { - pubQue : '',//公共问题 - classification: 'INLAND', //标准类型 + pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 + classification: selectedStand.classification, //标准类型 problemDescription: '', //问题 questioner: this.$store.getters.userInfo.userId, //提问人 - standardEncdoing: '', //标准编号 - standardName: '', //标准名称 - standardId:'', //标准id + standardEncdoing: selectedStand.standardEncdoing, //标准编号 + standardName: selectedStand.standardName, //标准名称 + standardId: selectedStand.standardId, //标准id fileList: '', } this.dialogVisible = true @@ -1720,6 +1728,7 @@ export default { _this: this }, res => { this.standList = res.data + this.refreshStandMap() }) }, //问题查询 @@ -1742,6 +1751,7 @@ export default { _this: this, }, res => { this.standList = res.data + this.refreshStandMap() this.questionClick() }) }, @@ -1754,6 +1764,7 @@ export default { _this: this }, res => { this.standList = res.data + this.refreshStandMap() this.questionClick() }, e =>{ @@ -1765,6 +1776,7 @@ export default { _this: this }, res =>{ this.standList = res.data + this.refreshStandMap() this.questionClick() }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 02e7df1b0..b7dbeeff7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -22,7 +22,7 @@ -
+
@@ -413,7 +413,7 @@
-
+
无内容
@@ -426,7 +426,7 @@
-
+
无内容
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index b52f9cbeb..b2f0db364 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -231,6 +231,41 @@
+ + + + + + + + + + + + + + + + + + { + res.data.managementHostList.forEach(item => { + if (item) { + this.managementHostName.push(item); //管理主体 + } + }); + res.data.developmentHostList.forEach(item => { + if (item) { + this.developmentHostName.push(item); //开发主体 + } + }); + res.data.categoryList.forEach(item => { + if (item) { + this.categoryName.push(item); //项目细分类 + } + }); + }); + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index 0d91bc05a..39ed192d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -138,7 +138,7 @@