合并分支 'fix_foton' 到 'develop_new'

Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!5

src/common/axios/index.js

@@ -32,7 +32,7 @@ let formData = (data) => {
   }
   return _formData
 }
-_axios.defaults.timeout = 60000
+_axios.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
 _axios.defaults.headers['Content-type'] = 'application/json'
 window._axiosPromiseArr = []
 /**

src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue

@@ -1632,9 +1632,9 @@ export default {
         issueTime: [
           { required: false, message: '请选择企标发布日期', trigger: 'change' }
         ],
-        putTime: [
+        // putTime: [
-          { required: true, message: '请选择企标实施日期', trigger: 'change' }
+        //   { required: true, message: '请选择企标实施日期', trigger: 'change' }
-        ],
+        // ],
         FBGBUSSName: [
           { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
         ],

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -193,8 +193,14 @@
       </div>
     </el-form>
     <!-- 选择企标计划抽屉-->
+<!--    <el-drawer v-if="!disabledXX"-->
+<!--      title="选择企业标准"-->
+<!--      :visible.sync="ListModel"-->
+<!--      size="900px"-->
+<!--      custom-class="demo-drawer"-->
+<!--    >-->
     <el-drawer v-if="!disabledXX"
-      title="选择企业标准"
+      title="选择企标计划"
       :visible.sync="ListModel"
       size="900px"
       custom-class="demo-drawer"
@@ -261,8 +267,9 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+<!--                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
-                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
+<!--                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
+                  <div>{{ getMap1(scope.row.planStatus) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -404,6 +411,17 @@ export default {
     })
   },
   methods: {
+    getMap1(item){
+      const map = new Map();
+      map.set('0','未开始')
+      map.set('1','制定中')
+      map.set('2','修订中')
+      map.set('3','已取消')
+      map.set('4','已完成')
+      map.set('5','立项已完成')
+      map.set('6','计划已确认')
+      return map.get(item)
+    },
     validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -209,8 +209,14 @@
      </div>
    </el-form>
    <!-- 选择企标计划抽屉-->
+<!--   <el-drawer v-if="!disabledXX"-->
+<!--     title="选择企业标准"-->
+<!--     :visible.sync="ListModel"-->
+<!--     size="900px"-->
+<!--     custom-class="demo-drawer"-->
+<!--   >-->
    <el-drawer v-if="!disabledXX"
-     title="选择企业标准"
+     title="选择企标计划"
      :visible.sync="ListModel"
      size="900px"
      custom-class="demo-drawer"
@@ -277,8 +283,9 @@
                label="计划状态"
                align="center">
                <template slot-scope="scope">
-                 <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+<!--                 <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
-                   (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
+<!--                   (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
+                 <div>{{ getMap1(scope.row.planStatus) }}</div>
                </template>
              </el-table-column>
              <el-table-column
@@ -426,6 +433,17 @@ export default {
     })
   },
   methods: {
+    getMap1(item){
+      const map = new Map();
+      map.set('0','未开始')
+      map.set('1','制定中')
+      map.set('2','修订中')
+      map.set('3','已取消')
+      map.set('4','已完成')
+      map.set('5','立项已完成')
+      map.set('6','计划已确认')
+      return map.get(item)
+    },
     validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -207,8 +207,14 @@
       </div>
     </el-form>
     <!-- 选择企标计划抽屉-->
+<!--    <el-drawer v-if="!disabledXX"-->
+<!--      title="选择企业标准"-->
+<!--      :visible.sync="ListModel"-->
+<!--      size="900px"-->
+<!--      custom-class="demo-drawer"-->
+<!--    >-->
       <el-drawer v-if="!disabledXX"
-      title="选择企业标准"
+      title="选择企标计划"
       :visible.sync="ListModel"
       size="900px"
       custom-class="demo-drawer"
@@ -276,8 +282,9 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+<!--                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
-                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
+<!--                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
+                  <div>{{ getMap1(scope.row.planStatus) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -751,6 +758,17 @@ export default {
     }
   },
   methods: {
+    getMap1(item){
+      const map = new Map();
+      map.set('0','未开始')
+      map.set('1','制定中')
+      map.set('2','修订中')
+      map.set('3','已取消')
+      map.set('4','已完成')
+      map.set('5','立项已完成')
+      map.set('6','计划已确认')
+      return map.get(item)
+    },
     choiceLeader(){
       this.workModel = true
     },

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -200,8 +200,14 @@
       </div>
     </el-form>
     <!-- 选择企标计划抽屉-->
+<!--    <el-drawer v-if="!disabledXX"-->
+<!--      title="选择企业标准"-->
+<!--      :visible.sync="ListModel"-->
+<!--      size="900px"-->
+<!--      custom-class="demo-drawer"-->
+<!--    >-->
       <el-drawer v-if="!disabledXX"
-      title="选择企业标准"
+      title="选择企标计划"
       :visible.sync="ListModel"
       size="900px"
       custom-class="demo-drawer"
@@ -268,8 +274,9 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+<!--                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
-                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
+<!--                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
+                  <div>{{ getMap1(scope.row.planStatus) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -413,6 +420,17 @@ export default {
     })
   },
   methods: {
+    getMap1(item){
+      const map = new Map();
+      map.set('0','未开始')
+      map.set('1','制定中')
+      map.set('2','修订中')
+      map.set('3','已取消')
+      map.set('4','已完成')
+      map.set('5','立项已完成')
+      map.set('6','计划已确认')
+      return map.get(item)
+    },
     validateForm (callback) {
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {

src/sysConfig/index.js

@@ -5,26 +5,26 @@
  */
 // 服务器地址
 // const devIp = '39.98.140.126'
-// const devInterfacePORT = '4202'
+// const devInterfacePORT = '10005'
-// const devIp = '192.168.1.42'
+// const devIp = '192.168.10.6'
-// const devInterfacePORT = '9999'
-// const devIp = '10.10.10.46'
-// const devInterfacePORT = '4202'
-// const devIp = '10.0.3.10'
-const devIp = 'localhost'
-const devInterfacePORT = '10086'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
+const devIp = '10.19.11.243'
+const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
+
+const ssoLogout = 'http://sso.foton.com.cn/logout?service='
 // 配置 前端服务
-const devWebUrl = 'http://62.234.136.153:8038/#/'
+const devWebUrl = 'https://srms.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
-const webLoginType = 'dev'
+const webLoginType = 'idm'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://127.0.0.1:8080'
+const onlyOfficeUrl = 'http://10.100.5.116:8088'
-// const onlyOfficeUrl = 'http://10.10.10.46:8103'
+
+// 配置 kkFileView 前端服务
+const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -48,12 +48,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-// const prodIp = '39.98.140.126'
+// const prodIp = '62.234.136.153'
-// const prodInterfacePORT = '4201'
+// const prodInterfacePORT = '8033'
-const prodIp = '10.10.10.46'
+const prodIp = 'srms.foton.com.cn'
-const prodInterfacePORT = '4202'
+const prodInterfacePORT = ''
-// const prodIp = 'slrs.foton.com.cn'
-// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -61,14 +59,16 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
 const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
 
 module.exports = {
-    baseUrl: 'http://' + serverIP + ':' + interfacePORT,
+    baseUrl: 'https://' + serverIP + ':' + interfacePORT,
     webLoginType: webLoginType,
     ssoLoginUrlDev: ssoLogin + devWebUrl,
+    ssoLogoutUrlDev: ssoLogout + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
+    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
-    serverUrl: 'http://' + serverIP, // 服务器IP地址
+    serverUrl: 'https://' + serverIP, // 服务器IP地址
-    interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
+    interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
     cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
     simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
     multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址