Merge remote-tracking branch 'origin/master'

jero-web/src/common/lang/en-us.js

@@ -708,6 +708,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  resetPassword: 'reset Password',
   departmentAllocation: 'department Allocation',
   ListTitle: 'List Title',
   CopyProjectCollectionparameters: 'Copy Project Collection parameters',

jero-web/src/common/lang/zh-cn.js

@@ -718,6 +718,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  resetPassword: '重置密码',
   departmentAllocation: '部门配置',
   ListTitle: '清单标题',
   CopyProjectCollectionparameters: '复制项目收集参数',

jero-web/src/components/layouts/TabLayout.vue

@@ -95,7 +95,6 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
-          this.$route.path == '/customContentList' ||
           this.$route.path == '/processDetails') {
           return false
         } else {

jero-web/src/views/dashboard/Analysis.vue

@@ -57,7 +57,14 @@
     },
     methods: {
       onSearch(value) {
-        console.log(value)
+        if (value) {
+          this.$router.push({
+            path: '/docTools/searchCenter',
+            query: {
+              selectValue:value
+            }
+          })
+        }
       }
     }
   }
@@ -66,7 +73,7 @@
   .box {
     width: 100%;
     height: 100%;
-    padding: 32px;
+    padding: 10px 20px 8px 20px;
     box-sizing: border-box;
 
     .header-search {
@@ -85,9 +92,9 @@
 
     .content-header {
       width: 100%;
-      height: 120px;
+      height: 112px;
-      margin-top: 24px;
+      margin-top: 10px;
-      padding: 24px;
+      padding: 20px;
       box-sizing: border-box;
       border: 1px solid #CED0D8;
       border-radius: 4px;
@@ -95,11 +102,11 @@
 
     .content-content {
       width: 100%;
-      height: 306px;
+      height: 280px;
-      padding: 30px 25px 25px 25px;
+      padding: 20px 24px;
       box-sizing: border-box;
       border: 1px solid #CED0D8;
-      margin-top: 20px;
+      margin-top: 10px;
     }
 
     .content-footer {
@@ -108,12 +115,12 @@
       width: 100%;
 
       .content-footer-box {
-        width: calc(33.3% - 14px);
+        width: calc(33.3% - 7px);
-        height: 412px;
+        height: 400px;
         border: 1px solid #CED0D8;
-        padding: 30px 24px 24px 24px;
+        padding: 20px 24px;
         box-sizing: border-box;
-        margin-top: 20px;
+        margin-top: 10px;
       }
     }
   }

jero-web/src/views/dashboard/components/customContent.vue

@@ -143,7 +143,6 @@
 
       .text {
         font-size: 16px;
-        font-family: Blue Sky Noto;
         font-weight: 400;
         color: #040B29;
         margin-top: 8px;
@@ -176,7 +175,6 @@
 
       .text {
         font-size: 16px;
-        font-family: Blue Sky Noto;
         font-weight: 400;
         color: #040B29;
         margin-top: 8px;

jero-web/src/views/dashboard/components/documentDynamics.vue

@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('documentDynamics')}}</div>
       <div class="header-text-right" @click="moreClick">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
@@ -13,13 +13,13 @@
            @click="magClick(item)">
         <div class="yuan"></div>
         <div class="text">{{item.msgContent}}</div>
-<!--        <img src="../../../assets/new.png" alt="">-->
+        <!--        <img src="../../../assets/new.png" alt="">-->
         <div class="time">{{item.createTime}}</div>
       </div>
       <div class="solid"></div>
     </div>
     <div v-else style="height: 240px;position: relative">
-          <JNoData />
+      <JNoData/>
     </div>
     <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
@@ -27,24 +27,25 @@
 
 <script>
   import { getAction, putAction, deleteAction } from '@/api/manage'
+
   export default {
     name: 'documentDynamics',
-    data(){
+    data() {
-       return{
+      return {
-         pageSize: 8,
+        pageSize: 8,
-         pageNo: 1,
+        pageNo: 1,
-         dataSource: [],
+        dataSource: [],
-         loading:false,
+        loading: false,
-         url: {
+        url: {
-           list: '/home/homeDocumentDynamicEO/page',
+          list: '/home/homeDocumentDynamicEO/page',
-           readAllMsg: 'sys/sysAnnouncementSend/read'
+          readAllMsg: 'sys/sysAnnouncementSend/read'
-         },
+        }
-       }
+      }
     },
     mounted() {
       this.getList()
     },
-    methods:{
+    methods: {
       getList() {
         let query = {
           pageNo: this.pageNo,
@@ -61,8 +62,7 @@
         })
       },
       magClick(row) {
-        getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
+        row.isCustomContentList = true
-        })
         this.$router.push({
           path: '/system/MessageDetails',
           query: row
@@ -73,13 +73,14 @@
           path: '/customContentList'
         })
       }
-    },
+    }
   }
 </script>
 
 <style scoped lang="less">
   .documentDynamics-box {
     width: 100%;
+    position: relative;
 
     .header-text {
       width: 100%;
@@ -110,16 +111,16 @@
 
       .solid {
         width: 1px;
-        height: 210px;
+        height: 200px;
         background: #EFF1F3;
         position: absolute;
         left: 50%;
-        top: 120px;
+        top: 100px;
         transform: translate(-50%, -50%);
       }
 
       .documentDynamics-text {
-        height: 51px;
+        height: 49px;
         width: calc(50% - 20px);
         line-height: 51px;
         border-bottom: 1px solid #EFF1F3;

jero-web/src/views/dashboard/components/monthlyReportRegulations.vue

@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
       <div class="header-text-right">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>

jero-web/src/views/dashboard/components/myList.vue

@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('myList')}}</div>
       <div class="header-text-right" @click="moreClick">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>

jero-web/src/views/dashboard/components/myNews.vue

@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('myNews')}}</div>
       <div class="header-text-right" @click="moreClick">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>

jero-web/src/views/dashboard/customContentList.vue

@@ -75,7 +75,7 @@
             title: this.$t('NotificationTime'),
             align: 'center',
             width: 200,
-            dataIndex: 'sendTime'
+            dataIndex: 'createTime'
           }
         ],
         url: {
@@ -92,8 +92,7 @@
         this.selectedRowKeys = value
       },
       msgContentClick(row) {
-        getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
+        row.isCustomContentList = true
-        })
         this.$router.push({
           path: '/system/MessageDetails',
           query: row
@@ -106,13 +105,13 @@
             content: that.$t('ConfirmBatchDeletion'),
             onOk: function() {
               let selectedRowKeys = JSON.parse(JSON.stringify(that.selectedRowKeys))
-              deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
+              getAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
                 if (res.success) {
                   that.selectedRowKeys = []
                   that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
                 } else {
-                  that.$message.success(that.$t('operationFailed'))
+                  that.$message.warning(that.$t('operationFailed'))
                 }
               })
             }

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -92,6 +92,14 @@
     },
     mounted() {
       this.getCondition()
+      if (this.$route.query.selectValue) {
+        this.selectValueTwo = this.$route.query.selectValue
+        this.$nextTick(() => {
+          if (this.$refs.wholeRef) {
+            this.$refs.wholeRef.searchData(this.selectValueTwo)
+          }
+        })
+      }
     },
     methods: {
       callback(key) {

jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue

@@ -154,7 +154,7 @@
       },
       handleSubmit() {
         if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile &&
-          !this.formInline.experimentFile && !this.detectionReportLocation.lot && !this.formInline.explainInfo) {
+          !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) {
           this.$message.warning(this.$t('dataCannotEmpty'))
         } else {
           let Action

jero-web/src/views/system/MessageDetails.vue

@@ -6,11 +6,11 @@
         {{this.$route.query.msgContent}}
       </span>
       <span class="box-header-right-text">
-        {{$t('NotificationTime')}}: {{this.$route.query.sendTime}}
+        {{$t('NotificationTime')}}: {{this.$route.query.sendTime || this.$route.query.createTime}}
       </span>
     </div>
-    <div class="box-content"  v-html="this.$route.query.msgContentInfo">
+    <div class="box-content" v-html="this.$route.query.msgContentInfo">
-<!--      {{this.$route.query.msgContentInfo}}-->
+      <!--      {{this.$route.query.msgContentInfo}}-->
     </div>
   </div>
 </template>
@@ -20,9 +20,15 @@
     name: 'MessageDetails',
     methods: {
       iconClick() {
-        this.$router.push({
+        if (this.$route.query.isCustomContentList) {
-          path: '/isps/userAnnouncement'
+          this.$router.push({
-        })
+            path: '/customContentList'
+          })
+        } else {
+          this.$router.push({
+            path: '/isps/userAnnouncement'
+          })
+        }
       }
     }
   }

jero-web/src/views/system/UserAnnouncementList.vue

@@ -201,7 +201,7 @@
                   that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
                 } else {
-                  that.$message.success(that.$t('operationFailed'))
+                  that.$message.warning(that.$t('operationFailed'))
                 }
               })
             }

jero-web/src/views/system/UserList.vue

@@ -85,7 +85,7 @@
       <!--      </a-upload>-->
       <!--      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('recycleBin')}}</a-button>-->
       <a-button type="primary" icon="hdd" @click="RoleAssignment" v-has="'sys:user:role'">{{$t('RoleAssignment')}}</a-button>
-      <a-button type="primary" icon="hdd" @click="departmentAllocation" v-has="'sys:user:depart'">{{$t('departmentAllocation')}}</a-button>
+      <a-button type="primary" icon="hdd" @click="departmentAllocation" v-has="'sys:user:depart'">{{$t('DepartmentAllocation')}}</a-button>
 <!--      <div @click="handleExportXls($t('userInformation'))" class="operator-text">-->
 <!--        <a-icon type="export" :rotate="-90"/>-->
 <!--        {{$t('export')}}-->
@@ -110,7 +110,8 @@
           </div>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)" >{{$t('edit')}}</a>
+          <a @click="handleEdit(record)" style='margin-right: 10px' v-has="'sys:user:edit'">{{$t('edit')}}</a>
+          <a @click="resetPassword(record)" >{{$t('resetPassword')}}</a>
         </span>
 
       </a-table>
@@ -125,7 +126,7 @@
     <user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/>
     <!-- 角色配置 -->
     <a-modal v-model="rolevisible" :title="$t('RoleAssignment')" width='650px' :footer="null">
-      <role-assignment v-if='rolevisible' :selectedRowKeysArray='selectedRowKeys'></role-assignment>
+      <role-assignment v-if='rolevisible' :selectedRowKeysArray='selectedRowKeys' @rolevisible='rolevisibleMethods'></role-assignment>
     </a-modal>
     <!-- 部门配置 -->
     <a-modal v-model="departmentvisible" :title="$t('RoleAssignment')" width='650px' :footer="null">
@@ -257,6 +258,10 @@
       }
     },
     methods: {
+      // 重置密码
+      resetPassword(val) {
+        console.log(val,'valll')
+      },
       onSelectChange(val,value) {
         this.selectedRowKeys = val
         this.selectedRowKeysvalue = value
@@ -277,6 +282,10 @@
           this.rolevisible = true
         }
       },
+      rolevisibleMethods(val) {
+        this.rolevisible = val
+        this.selectedRowKeys = []
+      },
       getAvatarView: function(avatar) {
         return getFileAccessHttpUrl(avatar)
       },

jero-web/src/views/system/modules/RoleAssignment.vue

@@ -92,14 +92,14 @@ export default {
       })
     },
     handleCancel() {
-      this.$emit('areaVisibleTaskCutOffTimeflag', false)
+      this.$emit('rolevisible', false)
     },
     //保存
     handleSubmit() {
       let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}` }
       postAction('/sys/user/setRole', param).then((res) => {
         if (res.success) {
-          this.$emit('areaVisibleTaskCutOffTimeflag', false)
+          this.$emit('rolevisible', false)
           this.$message.success(res.message)
         } else {
           this.$message.warning(res.message)

jero-web/src/views/system/modules/UserModal.vue

@@ -23,7 +23,7 @@
       <a-form :form="form">
 <!--        v-if="!disabled"-->
         <a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" disabled=true
+          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" :disabled='isdisabled'
                    :readOnly="!!model.id"/>
         </a-form-item>
 <!--        v-if="!model.id && !disabled"-->
@@ -40,7 +40,7 @@
         </template>
 <!--        v-if="!disabled"-->
         <a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserName')" disabled=true v-decorator.trim="[ 'realname', validatorRules.realname]"/>
+          <a-input :placeholder="$t('enterUserName')" :disabled='isdisabled' v-decorator.trim="[ 'realname', validatorRules.realname]"/>
         </a-form-item>
 
         <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -196,6 +196,7 @@
     },
     data() {
       return {
+        isdisabled: true,
         departDisabled: false, //是否是我的部门调用该页面
         roleDisabled: false, //是否是角色维护调用该页面
         modalWidth: 800,

jero-web/src/views/system/modules/departmentAllocation.vue

@@ -11,14 +11,24 @@
       >
         <a-row :gutter='24'>
           <a-col :span='24'>
-            <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--            <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">
+<!--              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">-->
-                <a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">
+<!--                <a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">-->
-                    <span style="display: inline-block;width: 100%">
+<!--                    <span style="display: inline-block;width: 100%">-->
-                      {{ role.roleName }}
+<!--                      {{ role.roleName }}-->
-                    </span>
+<!--                    </span>-->
-                </a-select-option>
+<!--                </a-select-option>-->
-              </a-select>
+<!--              </a-select>-->
+<!--            </a-form-item>-->
+            <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
+            >
+              <a-input-search
+                :placeholder="$t('ClickSelectDepartment')"
+                v-model="checkedDepartNameString"
+                readOnly
+                @search="onSearch">
+                <a-button slot="enterButton" icon="search">{{$t('choice')}}</a-button>
+              </a-input-search>
             </a-form-item>
           </a-col>
         </a-row>
@@ -28,6 +38,7 @@
       <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
       <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('determine') }}</a-button>
     </div>
+    <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
   </div>
 </template>
 
@@ -38,11 +49,16 @@ import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import moment from 'moment'
 // import eventBUs from '../../common/event'
+// 引入搜索部门弹出框的组件
+import departWindow from './DepartWindow'
 export default {
   name: 'diolagArea',
-  components: {},
+  components: {
+    departWindow
+  },
   data() {
     return {
+      checkedDepartNameString: '',
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
       total: 0,
@@ -81,6 +97,14 @@ export default {
     this.loadData()
   },
   methods: {
+    modalFormOk(val,vauel) {
+      // console.log('pppppp')
+      console.log(val)
+      console.log(vauel,'vauelvauel')
+    },
+    onSearch() {
+      this.$refs.departWindow.add(this.checkedDepartKeys, this.userId)
+    },
     loadData() {
       this.loading = true
       getAction(`sys/role/queryall`, {}).then(res => {