修改上传x-token

src/api/subPlatform/tenant.js

@@ -32,6 +32,20 @@ export function tenantDelete(data) {
 		data,
 	})
 }
+// 租户筛选
+export function tenantSelect() {
+	return request({
+		url: '/admin/v1/tenant/select',
+	})
+}
+// 租户人员
+export function tenantMember(data) {
+	return request({
+		url: '/admin/v1/tenant/member',
+		method: 'post',
+		data,
+	})
+}
 // 租户人员绑定 - 账号绑定
 export function tenantMemberBind(data) {
 	return request({

src/api/website/solution.js

@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+
+// 服务列表
+export function serviceList(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/kind',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-添加
+export function serviceAdd(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/kind/add',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-修改
+export function serviceEdit(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/kind/edit',
+		method: 'post',
+		data,
+	})
+}
+// 服务列表-删除
+export function serviceDelete(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/kind/delete',
+		method: 'post',
+		data,
+	})
+}
+// 服务类型-select
+export function serviceCaseKindSelect() {
+	return request({
+		url: '/admin/v1/service/solution_case/kind/select',
+	})
+}
+
+// 服务案例列表
+export function serviceCaseList(data) {
+	return request({
+		url: '/admin/v1/service/solution_case',
+		method: 'post',
+		data,
+	})
+}
+// 服务案例-添加
+export function serviceCaseAdd(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/add',
+		method: 'post',
+		data,
+	})
+}
+// 服务案例-详情
+export function serviceCaseDetail(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/detail',
+		method: 'post',
+		data,
+	})
+}
+// 服务案例-修改
+export function serviceCaseEdit(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/edit',
+		method: 'post',
+		data,
+	})
+}
+// 服务案例-删除
+export function serviceCaseDelete(data) {
+	return request({
+		url: '/admin/v1/service/solution_case/delete',
+		method: 'post',
+		data,
+	})
+}

src/components/Editor/index.vue

@@ -56,13 +56,13 @@ export default {
     type: {
       type: String,
       default: "url",
-    }
+    },
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadUrl: process.env.VUE_APP_BASE_API + "/admin/v1/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken()
+        "x-token": getToken(),
       },
       Quill: null,
       currentValue: "",
@@ -82,7 +82,7 @@ export default {
             [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
             [{ align: [] }], // 对齐方式
             ["clean"], // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["link", "image", "video"], // 链接、图片、视频
           ],
         },
         placeholder: "请输入内容",
@@ -126,7 +126,7 @@ export default {
       const editor = this.$refs.editor;
       this.Quill = new Quill(editor, this.options);
       // 如果设置了上传地址则自定义图片上传事件
-      if (this.type == 'url') {
+      if (this.type == "url") {
         let toolbar = this.Quill.getModule("toolbar");
         toolbar.addHandler("image", (value) => {
           this.uploadType = "image";
@@ -176,7 +176,11 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(
+          length,
+          "image",
+          process.env.VUE_APP_BASE_API + res.fileName
+        );
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {
@@ -191,7 +195,8 @@ export default {
 </script>
 
 <style>
-.editor, .ql-toolbar {
+.editor,
+.ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
 }

src/components/FileUpload/index.vue

@@ -18,20 +18,38 @@
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
-        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+        <template v-if="fileSize">
-        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        </template>
+        <template v-if="fileType">
+          格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+        </template>
         的文件
       </div>
     </el-upload>
 
     <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+    <transition-group
-      <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
+      class="upload-file-list el-upload-list el-upload-list--text"
-        <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
+      name="el-fade-in-linear"
+      tag="ul"
+    >
+      <li
+        :key="file.uid"
+        class="el-upload-list__item ele-upload-list__item-content"
+        v-for="(file, index) in fileList"
+      >
+        <el-link
+          :href="`${baseUrl}${file.url}`"
+          :underline="false"
+          target="_blank"
+        >
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+          <el-link :underline="false" @click="handleDelete(index)" type="danger"
+            >删除</el-link
+          >
         </div>
       </li>
     </transition-group>
@@ -64,15 +82,15 @@ export default {
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
+      default: true,
-    }
+    },
   },
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin/v1/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
+        "x-token": getToken(),
       },
       fileList: [],
     };
@@ -83,9 +101,9 @@ export default {
         if (val) {
           let temp = 1;
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(",");
           // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
+          this.fileList = list.map((item) => {
             if (typeof item === "string") {
               item = { name: item, url: item };
             }
@@ -98,8 +116,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
+      immediate: true,
-    }
+    },
   },
   computed: {
     // 是否显示提示
@@ -122,7 +140,9 @@ export default {
           return false;
         });
         if (!isTypeOk) {
-          this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+          this.$message.error(
+            `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
+          );
           return false;
         }
       }
@@ -170,9 +190,9 @@ export default {
       for (let i in list) {
         strs += list[i].url + separator;
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
-    }
+    },
-  }
+  },
 };
 </script>
 

src/components/ImageUpload/index.vue

@@ -14,7 +14,7 @@
       :headers="headers"
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
+      :class="{ hide: this.fileList.length >= this.limit }"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
@@ -22,8 +22,12 @@
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+      <template v-if="fileSize">
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+      </template>
       的文件
     </div>
 
@@ -65,8 +69,8 @@ export default {
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
+      default: true,
-    }
+    },
   },
   data() {
     return {
@@ -74,11 +78,11 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/admin/v1/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
+        "x-token": getToken(),
       },
-      fileList: []
+      fileList: [],
     };
   },
   watch: {
@@ -86,9 +90,9 @@ export default {
       handler(val) {
         if (val) {
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(",");
           // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
+          this.fileList = list.map((item) => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
                 item = { name: this.baseUrl + item, url: this.baseUrl + item };
@@ -104,8 +108,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
+      immediate: true,
-    }
+    },
   },
   computed: {
     // 是否显示提示
@@ -116,15 +120,15 @@ export default {
   methods: {
     // 删除图片
     handleRemove(file, fileList) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
+      const findex = this.fileList.map((f) => f.name).indexOf(file.name);
-      if(findex > -1) {
+      if (findex > -1) {
         this.fileList.splice(findex, 1);
         this.$emit("input", this.listToString(this.fileList));
       }
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.fileList.push({ name: res.fileName, url: res.fileName });
+      this.fileList.push({ name: res.data.url, url: res.data.url });
       this.$emit("input", this.listToString(this.fileList));
       this.loading.close();
     },
@@ -136,7 +140,7 @@ export default {
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
         }
-        isImg = this.fileType.some(type => {
+        isImg = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -188,9 +192,9 @@ export default {
       for (let i in list) {
         strs += list[i].url.replace(this.baseUrl, "") + separator;
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
-    }
+    },
-  }
+  },
 };
 </script>
 <style scoped lang="scss">
@@ -204,7 +208,8 @@ export default {
   transition: all 0s;
 }
 
-::v-deep .el-list-enter, .el-list-leave-active {
+::v-deep .el-list-enter,
+.el-list-leave-active {
   opacity: 0;
   transform: translateY(0);
 }

src/plugins/download.js

@@ -3,42 +3,42 @@ import { Message } from 'element-ui'
 import { saveAs } from 'file-saver'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { blobValidate } from "@/utils/ruoyi";
+import { blobValidate } from '@/utils/ruoyi'
 
 const baseURL = process.env.VUE_APP_BASE_API
 
 export default {
 	name(name, isDelete = true) {
-    var url = baseURL + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete
+		var url = baseURL + '/common/download?fileName=' + encodeURI(name) + '&delete=' + isDelete
 		axios({
 			method: 'get',
 			url: url,
 			responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+			headers: { 'x-token': getToken() },
-    }).then(async (res) => {
+		}).then(async res => {
-      const isLogin = await blobValidate(res.data);
+			const isLogin = await blobValidate(res.data)
 			if (isLogin) {
 				const blob = new Blob([res.data])
 				this.saveAs(blob, decodeURI(res.headers['download-filename']))
 			} else {
-        this.printErrMsg(res.data);
+				this.printErrMsg(res.data)
 			}
 		})
 	},
 	resource(resource) {
-    var url = baseURL + "/common/download/resource?resource=" + encodeURI(resource);
+		var url = baseURL + '/common/download/resource?resource=' + encodeURI(resource)
 		axios({
 			method: 'get',
 			url: url,
 			responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+			headers: { 'x-token': getToken() },
-    }).then(async (res) => {
+		}).then(async res => {
-      const isLogin = await blobValidate(res.data);
+			const isLogin = await blobValidate(res.data)
 			if (isLogin) {
 				const blob = new Blob([res.data])
 				this.saveAs(blob, decodeURI(res.headers['download-filename']))
 			} else {
-        this.printErrMsg(res.data);
+				this.printErrMsg(res.data)
 			}
 		})
 	},
@@ -48,25 +48,24 @@ export default {
 			method: 'get',
 			url: url,
 			responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+			headers: { 'x-token': getToken() },
-    }).then(async (res) => {
+		}).then(async res => {
-      const isLogin = await blobValidate(res.data);
+			const isLogin = await blobValidate(res.data)
 			if (isLogin) {
 				const blob = new Blob([res.data], { type: 'application/zip' })
 				this.saveAs(blob, name)
 			} else {
-        this.printErrMsg(res.data);
+				this.printErrMsg(res.data)
 			}
 		})
 	},
 	saveAs(text, name, opts) {
-    saveAs(text, name, opts);
+		saveAs(text, name, opts)
 	},
 	async printErrMsg(data) {
-    const resText = await data.text();
+		const resText = await data.text()
-    const rspObj = JSON.parse(resText);
+		const rspObj = JSON.parse(resText)
 		const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
-    Message.error(errMsg);
+		Message.error(errMsg)
-  }
+	},
 }
-

src/store/getters.js

@@ -7,12 +7,13 @@ const getters = {
 	token: state => state.user.token,
 	avatar: state => state.user.avatar,
 	name: state => state.user.name,
+	is_super: state => state.user.is_super,
 	introduction: state => state.user.introduction,
 	roles: state => state.user.roles,
 	permissions: state => state.user.permissions,
 	permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
+	topbarRouters: state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
+	defaultRoutes: state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
+	sidebarRouters: state => state.permission.sidebarRouters,
 }
 export default getters

src/store/modules/permission.js

@@ -91,7 +91,8 @@ function handleStr(str, flag) {
 
 function handleComponent(src, flag) {
 	if (flag && src.kind == 1 && src.children.length > 0) {
-		return src.children[0].component
+		// return src.children[0].component
+		return 'ParentView'
 	}
 	return src.component
 }

src/store/modules/user.js

@@ -6,6 +6,7 @@ const user = {
 		token: getToken(),
 		name: '',
 		avatar: '',
+		is_super: false,
 		roles: [],
 		permissions: [],
 	},
@@ -20,6 +21,9 @@ const user = {
 		SET_AVATAR: (state, avatar) => {
 			state.avatar = avatar
 		},
+		SET_SUPER: (state, is_super) => {
+			state.is_super = is_super
+		},
 		SET_ROLES: (state, roles) => {
 			state.roles = roles
 		},
@@ -56,8 +60,7 @@ const user = {
 					.then(res => {
 						const user = res.data
 						// 头像
-						// const avatar = user.avatar == '' ? require('@/assets/images/profile.jpg') : user.avatar
+						const avatar = user.avatar == '' ? require('@/assets/images/profile.jpg') : user.avatar
-						const avatar = require('@/assets/images/profile.jpg')
 						if (res.roles && res.roles.length > 0) {
 							// 验证返回的roles是否是一个非空数组
 							commit('SET_ROLES', res.roles)
@@ -67,6 +70,7 @@ const user = {
 						}
 						commit('SET_NAME', user.name)
 						commit('SET_AVATAR', avatar)
+						commit('SET_SUPER', user.is_super)
 						resolve(res)
 					})
 					.catch(error => {

src/views/subPlatform/tenant/index.vue

@@ -94,6 +94,11 @@
               <el-dropdown-item command="handleAccountSet" icon="el-icon-user"
                 >账号设置</el-dropdown-item
               >
+              <el-dropdown-item
+                command="handleAccountSet"
+                icon="el-icon-circle-check"
+                >权限设置</el-dropdown-item
+              >
               <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                 >重置密码</el-dropdown-item
               >
@@ -199,6 +204,7 @@ import {
   tenantAdd,
   tenantEdit,
   tenantDelete,
+  tenantMember,
   tenantMemberBind,
 } from "@/api/subPlatform/tenant";
 import { areaList } from "@/api/config";
@@ -356,8 +362,14 @@ export default {
       }
     },
     handleAccountSet(row) {
+      tenantMember({ tenant_id: row.id }).then((res) => {
+        if (res.data.id) {
+          this.$modal.msgError("您已添加过账号信息，请勿重复添加");
+        } else {
           this.memberOpen = true;
           this.memberForm["tenant_id"] = row.id;
+        }
+      });
     },
     // 重置密码按钮操作
     handleResetPwd(row) {

src/views/system/user/index.vue

@@ -454,7 +454,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { "x-token": getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData",
       },

src/views/website/message/index.vue

@@ -1,3 +1,190 @@
 <template>
-  <div>客户留言</div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+    >
+      <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="name">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="用户状态"
+          clearable
+          size="small"
+          style="width: 240px"
+          @clear="delete queryParams.status"
+        >
+          <el-option label="已处理" :value="1" />
+          <el-option label="未处理" :value="2" />
+        </el-select>
+      </el-form-item>
+      <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>
+        <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="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tenantList">
+      <el-table-column label="需求内容" prop="name" width="120" />
+      <el-table-column label="姓名" prop="contact" align="center" />
+      <el-table-column label="单位" prop="contact_mobile" align="center" />
+      <el-table-column label="联系方式" prop="domain" align="center" />
+      <el-table-column label="邮箱" prop="area" align="center" />
+      <el-table-column label="提交网页地址" prop="area" align="center" />
+      <el-table-column label="处理状态" prop="area" align="center" />
+      <el-table-column label="处理结果" prop="area" align="center" />
+      <el-table-column label="创建时间" prop="created_at" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.created_at) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDelete(scope.row)"
+            >处理</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+  </div>
 </template>
+<script>
+export default {
+  data() {
+    return {
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        name: undefined,
+        page_num: 1,
+        page_size: 10,
+      },
+      total: 0,
+      tenantList: [1],
+    };
+  },
+  methods: {
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      tenant(this.queryParams).then((res) => {
+        this.tenantList = res.data.data;
+        this.total = res.data.count;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.memberOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        domain: undefined,
+        province: "",
+        city: "",
+        contact: undefined,
+        contact_mobile: undefined,
+      };
+      this.resetForm("form");
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加子系统";
+    },
+    handleUpdate(row) {
+      this.reset();
+      this.form = Object.assign({}, row);
+      this.open = true;
+      this.title = "修改子系统";
+    },
+  },
+};
+</script>

src/views/website/solution/service/index.vue

@@ -1,3 +1,328 @@
 <template>
-  <div>解决方案--服务列表</div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+      @submit.native.prevent
+    >
+      <el-form-item label="数据名称" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入关键字"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="归属导航" prop="tenant_id" v-if="is_super">
+        <el-cascader
+          v-model="queryParams.tenant_id"
+          clearable
+          separator="-"
+          placeholder="请选择，支持搜索"
+          :options="tenantOptions"
+          filterable
+          :props="{ emitPath: false, value: 'id', label: 'name' }"
+        ></el-cascader>
+      </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="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编号" prop="id" width="120" />
+      <el-table-column label="数据名称" prop="title" width="120" />
+      <el-table-column label="图片" prop="image" align="center" width="120">
+        <template slot-scope="scope">
+          <div>
+            <el-image
+              style="width: 100px; height: 100px"
+              :src="scope.row.image"
+              fit="cover"
+            ></el-image>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="归属导航" prop="area" align="center" />
+      <el-table-column label="模式" prop="mode" align="center">
+        <template slot-scope="scope">
+          {{ modeOptions.find((item) => item.value == scope.row.mode).label }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" prop="created_at" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.created_at) }}</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)"
+            >编辑</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="数据名称:" prop="title">
+          <el-input v-model="form.title" placeholder="请输入数据名称" />
+        </el-form-item>
+        <el-form-item label="归属导航:" prop="tenant_id" v-if="is_super">
+          <el-cascader
+            v-model="form.tenant_id"
+            clearable
+            separator="-"
+            placeholder="请选择，支持搜索"
+            :options="tenantOptions"
+            filterable
+            :props="{ emitPath: false, value: 'id', label: 'name' }"
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="图片:" prop="image">
+          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
+        </el-form-item>
+        <el-form-item label="模式:" prop="mode">
+          <el-select v-model="form.mode" placeholder="请选择">
+            <el-option
+              v-for="item in modeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="关联案例:" prop="name">
+          <el-cascader
+            v-model="form.tenant_id"
+            clearable
+            separator="-"
+            placeholder="请选择，支持搜索"
+            :options="caseOptions"
+            filterable
+            :props="{ emitPath: false, value: 'id', label: 'title' }"
+          ></el-cascader>
+        </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 {
+  serviceList,
+  serviceAdd,
+  serviceEdit,
+  serviceDelete,
+} from "@/api/website/solution";
+import { tenantSelect } from "@/api/subPlatform/tenant";
+export default {
+  data() {
+    return {
+      is_super: this.$store.getters.is_super,
+      loading: true,
+      showSearch: true,
+      tenantOptions: [],
+      modeOptions: [
+        {
+          value: 101,
+          label: "中小企业服务",
+        },
+        {
+          value: 102,
+          label: "大型企业服务",
+        },
+        {
+          value: 103,
+          label: "政府企业服务",
+        },
+        {
+          value: 104,
+          label: "科研院所服务",
+        },
+      ],
+      queryParams: {
+        title: undefined,
+        tenant_id: undefined,
+        page_num: 1,
+        page_size: 10,
+      },
+      total: 0,
+      dataList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      rules: {
+        title: [
+          { required: true, message: "数据名称不能为空", trigger: "blur" },
+        ],
+        tenant_id: [
+          { required: true, message: "归属导航不能为空", trigger: "change" },
+        ],
+        image: [
+          {
+            required: true,
+            message: "图片不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        mode: [
+          {
+            required: true,
+            message: "模式不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      serviceList(this.queryParams).then((res) => {
+        this.dataList = res.data.data;
+        this.total = res.data.count;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.memberOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        tenant_id: undefined,
+        title: undefined,
+        image: undefined,
+        mode: undefined,
+      };
+      this.resetForm("form");
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增";
+    },
+    handleUpdate(row) {
+      this.reset();
+      this.form = Object.assign({}, row);
+      this.open = true;
+      this.title = "修改";
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            serviceEdit(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            serviceAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确认删除名为"' + row.title + '"的数据项？')
+        .then(function () {
+          return serviceDelete({ id: row.id });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.getList();
+    tenantSelect().then((res) => {
+      for (const key in res.data) {
+        if (Object.hasOwnProperty.call(res.data, key)) {
+          const item = res.data[key];
+          this.tenantOptions.push(item);
+        }
+      }
+    });
+  },
+};
+</script>

src/views/website/solution/serviceCase/index.vue

@@ -1,3 +1,311 @@
 <template>
-  <div>解决方案--服务案例列表</div>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+      @submit.native.prevent
+    >
+      <el-form-item label="案例标题" prop="kind_title">
+        <el-input
+          v-model="queryParams.kind_title"
+          placeholder="请输入关键字"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </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="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编码" prop="id" width="120" />
+      <el-table-column label="案例标题" prop="kind_title" width="120" />
+      <el-table-column label="图片" prop="image" align="center" width="120">
+        <template slot-scope="scope">
+          <div>
+            <el-image
+              style="width: 100px; height: 100px"
+              :src="scope.row.image"
+              fit="cover"
+            ></el-image>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="描述"
+        prop="description"
+        show-overflow-tooltip
+        align="center"
+      />
+      <el-table-column label="创建时间" prop="created_at" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.created_at) }}</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)"
+            >编辑</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="40%">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="案例标题:" prop="kind_title">
+          <el-input v-model="form.kind_title" placeholder="请输入案例标题" />
+        </el-form-item>
+        <el-form-item label="描述:" prop="description">
+          <el-input
+            v-model="form.description"
+            placeholder="请输入描述"
+            maxlength="30"
+          />
+        </el-form-item>
+        <el-form-item label="图片:" prop="image">
+          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
+        </el-form-item>
+        <el-form-item label="案例类型:" prop="kind_id">
+          <el-cascader
+            v-model="form.kind_id"
+            clearable
+            separator="-"
+            placeholder="请选择，支持搜索"
+            :options="caseOptions"
+            filterable
+            :props="{ emitPath: false, value: 'id', label: 'title' }"
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="案例描述:" prop="tenant_id">
+          <Editor v-model="form.kind_id" :minHeight="150" />
+        </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 {
+  serviceCaseList,
+  serviceCaseAdd,
+  serviceCaseDetail,
+  serviceCaseEdit,
+  serviceCaseDelete,
+  serviceCaseKindSelect,
+} from "@/api/website/solution";
+import { tenantSelect } from "@/api/subPlatform/tenant";
+export default {
+  data() {
+    return {
+      is_super: this.$store.getters.is_super,
+      loading: true,
+      showSearch: true,
+      tenantOptions: [],
+      caseOptions: [],
+      modeOptions: [
+        {
+          value: 101,
+          label: "中小企业服务",
+        },
+        {
+          value: 102,
+          label: "大型企业服务",
+        },
+        {
+          value: 103,
+          label: "政府企业服务",
+        },
+        {
+          value: 104,
+          label: "科研院所服务",
+        },
+      ],
+      queryParams: {
+        kind_title: undefined,
+        tenant_id: undefined,
+        page_num: 1,
+        page_size: 10,
+      },
+      total: 0,
+      dataList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      rules: {
+        title: [
+          { required: true, message: "数据名称不能为空", trigger: "blur" },
+        ],
+        tenant_id: [
+          { required: true, message: "归属导航不能为空", trigger: "change" },
+        ],
+        image: [
+          {
+            required: true,
+            message: "图片不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+        mode: [
+          {
+            required: true,
+            message: "模式不能为空",
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      serviceCaseList(this.queryParams).then((res) => {
+        this.dataList = res.data.data;
+        this.total = res.data.count;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.memberOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        tenant_id: undefined,
+        title: undefined,
+        image: undefined,
+        mode: undefined,
+      };
+      this.resetForm("form");
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增";
+    },
+    handleUpdate(row) {
+      this.reset();
+      this.form = Object.assign({}, row);
+      this.open = true;
+      this.title = "修改";
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            serviceCaseEdit(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            serviceCaseAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal
+        .confirm('是否确认删除名为"' + row.title + '"的数据项？')
+        .then(function () {
+          return serviceCaseDelete({ id: row.id });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.getList();
+    tenantSelect().then((res) => {
+      for (const key in res.data) {
+        if (Object.hasOwnProperty.call(res.data, key)) {
+          const item = res.data[key];
+          this.tenantOptions.push(item);
+        }
+      }
+    });
+    serviceCaseKindSelect().then((res) => {
+      console.log(res);
+    });
+  },
+};
+</script>

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
 		proxy: {
 			// detail: https://cli.vuejs.org/config/#devserver-proxy
 			[process.env.VUE_APP_BASE_API]: {
-				target: `http://192.168.0.148:8000`,
+				target: `http://192.168.0.137:8000`,
 				changeOrigin: true,
 				pathRewrite: {
 					['^' + process.env.VUE_APP_BASE_API]: '',